From reid at x10sys.com Mon Sep 6 03:33:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:33:53 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/AutoRegen.sh configure.ac Message-ID: <200409060833.DAA12104@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: AutoRegen.sh updated: 1.1 -> 1.2 configure.ac updated: 1.2 -> 1.3 --- Log message: Include the External programs in the configuration. --- Diffs of the changes: (+12 -42) Index: llvm-test/autoconf/AutoRegen.sh diff -u llvm-test/autoconf/AutoRegen.sh:1.1 llvm-test/autoconf/AutoRegen.sh:1.2 --- llvm-test/autoconf/AutoRegen.sh:1.1 Sat Sep 4 15:38:06 2004 +++ llvm-test/autoconf/AutoRegen.sh Mon Sep 6 03:33:42 2004 @@ -6,7 +6,9 @@ test -d autoconf && test -f autoconf/configure.ac && cd autoconf [ -f configure.ac ] || die "Can't find 'autoconf' dir; please cd into it first" echo "Regenerating aclocal.m4 with aclocal" -aclocal || die "aclocal failed" +rm -f aclocal.m4 +cwd=`pwd` +aclocal -I $cwd/m4 || die "aclocal failed" autoconf --version | egrep '2\.5[0-9]' > /dev/null if test $? -ne 0 then Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.2 llvm-test/autoconf/configure.ac:1.3 --- llvm-test/autoconf/configure.ac:1.2 Sat Sep 4 15:38:06 2004 +++ llvm-test/autoconf/configure.ac Mon Sep 6 03:33:42 2004 @@ -16,6 +16,15 @@ AC_CONFIG_MAKEFILE(MultiSource/Makefile) AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc) AC_CONFIG_MAKEFILE(External/Makefile) +AC_CONFIG_MAKEFILE(External/Makefile.external) +AC_CONFIG_MAKEFILE(External/Povray/Makefile) +AC_CONFIG_MAKEFILE(External/SPEC/Makefile) +AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec) +AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec2000) +AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec95) +AC_CONFIG_MAKEFILE(External/SPEC/CFP2000/Makefile) +AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile) +AC_CONFIG_MAKEFILE(External/SPEC/CINT95/Makefile) dnl ************************************************************************** dnl * Set the location of various third-party software packages @@ -87,47 +96,6 @@ dnl Determine if the linker supports the -R option. AC_LINK_USE_R -AC_DEFUN(EXTERNAL_BENCHMARK, -[m4_define([allcapsname],translit($1,a-z,A-Z)) - AC_ARG_ENABLE($1, - AC_HELP_STRING([--enable-$1=ARG], - [Use $1 as a benchmark (srcs in DIR)]), - checkresult=$enableval, - checkresult=auto) -AC_MSG_CHECKING([for $1 benchmark sources]) -case "$checkresult" in -auto|yes) - defaultdir=$2 - if test -d "$defaultdir" - then - AC_SUBST(allcapsname()[_ROOT],[$defaultdir]) - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult=no - ;; -*) if test -d "$checkresult" - then - AC_SUBST(allcapsname()[_ROOT],"$checkresult") - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, in $checkresult" - else - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult="no, not found in $checkresult" - fi - ;; -esac -AC_MSG_RESULT($checkresult) -m4_undefine([allcapsname]) -]) - EXTERNAL_BENCHMARK(spec95,/home/vadve/shared/benchmarks/spec95/benchspec) EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec) EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31) From reid at x10sys.com Mon Sep 6 03:34:38 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:34:38 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Message-ID: <200409060834.DAA12119@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.2 -> 1.3 --- Log message: Include External programs in the configuration. --- Diffs of the changes: (+82 -30) Index: llvm-test/configure diff -u llvm-test/configure:1.2 llvm-test/configure:1.3 --- llvm-test/configure:1.2 Sat Sep 4 15:38:06 2004 +++ llvm-test/configure Mon Sep 6 03:34:28 2004 @@ -1564,6 +1564,33 @@ ac_config_commands="$ac_config_commands External/Makefile" + ac_config_commands="$ac_config_commands External/Makefile.external" + + + ac_config_commands="$ac_config_commands External/Povray/Makefile" + + + ac_config_commands="$ac_config_commands External/SPEC/Makefile" + + + ac_config_commands="$ac_config_commands External/SPEC/Makefile.spec" + + + ac_config_commands="$ac_config_commands External/SPEC/Makefile.spec2000" + + + ac_config_commands="$ac_config_commands External/SPEC/Makefile.spec95" + + + ac_config_commands="$ac_config_commands External/SPEC/CFP2000/Makefile" + + + ac_config_commands="$ac_config_commands External/SPEC/CINT2000/Makefile" + + + ac_config_commands="$ac_config_commands External/SPEC/CINT95/Makefile" + + @@ -3906,7 +3933,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3909 "configure"' > conftest.$ac_ext + echo '#line 3936 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4780,7 +4807,7 @@ # Provide some information about the compiler. -echo "$as_me:4783:" \ +echo "$as_me:4810:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5811,11 +5838,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5814: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5841: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5818: \$? = $ac_status" >&5 + echo "$as_me:5845: \$? = $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 @@ -6043,11 +6070,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6046: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6073: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6050: \$? = $ac_status" >&5 + echo "$as_me:6077: \$? = $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 @@ -6110,11 +6137,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6113: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6140: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6117: \$? = $ac_status" >&5 + echo "$as_me:6144: \$? = $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 @@ -8228,7 +8255,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10512: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10489: \$? = $ac_status" >&5 + echo "$as_me:10516: \$? = $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 @@ -10549,11 +10576,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10552: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10579: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10556: \$? = $ac_status" >&5 + echo "$as_me:10583: \$? = $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 @@ -11878,7 +11905,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12828: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12805: \$? = $ac_status" >&5 + echo "$as_me:12832: \$? = $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 @@ -12865,11 +12892,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12868: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12895: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12872: \$? = $ac_status" >&5 + echo "$as_me:12899: \$? = $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 @@ -14831,11 +14858,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14834: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14861: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14838: \$? = $ac_status" >&5 + echo "$as_me:14865: \$? = $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 @@ -15063,11 +15090,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15066: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15093: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15070: \$? = $ac_status" >&5 + echo "$as_me:15097: \$? = $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 @@ -15130,11 +15157,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15133: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15160: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15137: \$? = $ac_status" >&5 + echo "$as_me:15164: \$? = $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 @@ -17248,7 +17275,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: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -19972,6 +20015,15 @@ MultiSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile MultiSource/Makefile ;; MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile.multisrc MultiSource/Makefile.multisrc ;; External/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Makefile External/Makefile ;; + External/Makefile.external ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Makefile.external External/Makefile.external ;; + External/Povray/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Povray/Makefile External/Povray/Makefile ;; + External/SPEC/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/Makefile External/SPEC/Makefile ;; + External/SPEC/Makefile.spec ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/Makefile.spec External/SPEC/Makefile.spec ;; + External/SPEC/Makefile.spec2000 ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/Makefile.spec2000 External/SPEC/Makefile.spec2000 ;; + External/SPEC/Makefile.spec95 ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/Makefile.spec95 External/SPEC/Makefile.spec95 ;; + External/SPEC/CFP2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CFP2000/Makefile External/SPEC/CFP2000/Makefile ;; + External/SPEC/CINT2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CINT2000/Makefile External/SPEC/CINT2000/Makefile ;; + External/SPEC/CINT95/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CINT95/Makefile External/SPEC/CINT95/Makefile ;; esac done _ACEOF From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/Makefile Message-ID: <200409060836.DAA12185@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95: Makefile updated: 1.5 -> 1.6 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+1 -2) Index: llvm-test/External/SPEC/CINT95/Makefile diff -u llvm-test/External/SPEC/CINT95/Makefile:1.5 llvm-test/External/SPEC/CINT95/Makefile:1.6 --- llvm-test/External/SPEC/CINT95/Makefile:1.5 Sun Sep 5 02:56:52 2004 +++ llvm-test/External/SPEC/CINT95/Makefile Mon Sep 6 03:36:37 2004 @@ -10,5 +10,4 @@ 147.vortex # Get the $(ARCH) setting -include $(LEVEL)/Makefile.config -include ${LEVEL}/Makefile.programs +include ${LEVEL}/External/Makefile.external From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/Povray/Makefile Message-ID: <200409060836.DAA12197@zion.cs.uiuc.edu> Changes in directory llvm-test/External/Povray: Makefile updated: 1.9 -> 1.10 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+2 -2) Index: llvm-test/External/Povray/Makefile diff -u llvm-test/External/Povray/Makefile:1.9 llvm-test/External/Povray/Makefile:1.10 --- llvm-test/External/Povray/Makefile:1.9 Wed Sep 1 09:33:19 2004 +++ llvm-test/External/Povray/Makefile Mon Sep 6 03:36:37 2004 @@ -1,6 +1,6 @@ LEVEL = ../.. -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config PROG = povray @@ -11,4 +11,4 @@ LDFLAGS += -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) -lpng -lz -lm RUN_OPTIONS = -I$(POVRAY_ROOT)/scenes/advanced/chess2.pov -L$(POVRAY_ROOT)/include -GA$<.junk -O- -include ../../MultiSource/Makefile.multisrc +include $(LEVEL)/MultiSource/Makefile.multisrc From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/Makefile Message-ID: <200409060836.DAA12183@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000: Makefile updated: 1.15 -> 1.16 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+2 -2) Index: llvm-test/External/SPEC/CINT2000/Makefile diff -u llvm-test/External/SPEC/CINT2000/Makefile:1.15 llvm-test/External/SPEC/CINT2000/Makefile:1.16 --- llvm-test/External/SPEC/CINT2000/Makefile:1.15 Sun Sep 5 02:56:52 2004 +++ llvm-test/External/SPEC/CINT2000/Makefile Mon Sep 6 03:36:37 2004 @@ -14,11 +14,11 @@ 300.twolf # Get the $(ARCH) setting -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config # Disable crafty until it stops infinite-looping on Sparc ifeq ($(ARCH), Sparc) PARALLEL_DIRS := $(filter-out 186.crafty, $(PARALLEL_DIRS)) endif -include ${LEVEL}/Makefile.programs +include ${LEVEL}/External/Makefile.external From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/Makefile Message-ID: <200409060836.DAA12175@zion.cs.uiuc.edu> Changes in directory llvm-test/External: Makefile updated: 1.12 -> 1.13 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+1 -6) Index: llvm-test/External/Makefile diff -u llvm-test/External/Makefile:1.12 llvm-test/External/Makefile:1.13 --- llvm-test/External/Makefile:1.12 Sun Sep 5 14:41:32 2004 +++ llvm-test/External/Makefile Mon Sep 6 03:36:37 2004 @@ -1,11 +1,6 @@ LEVEL = .. # -# Include the configuration so that we know whether or not to include SPEC -# -include $(LEVEL)/Makefile.common - -# # Create the list of directories to compile # PARALLEL_DIRS := SPEC Povray @@ -14,4 +9,4 @@ PARALLEL_DIRS := $(filter-out Povray/, $(PARALLEL_DIRS)) endif -include $(LEVEL)/Makefile.programs +include Makefile.external From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec Makefile.spec2000 Makefile.spec95 Message-ID: <200409060836.DAA12182@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile updated: 1.13 -> 1.14 Makefile.spec updated: 1.36 -> 1.37 Makefile.spec2000 updated: 1.3 -> 1.4 Makefile.spec95 updated: 1.8 -> 1.9 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+6 -6) Index: llvm-test/External/SPEC/Makefile diff -u llvm-test/External/SPEC/Makefile:1.13 llvm-test/External/SPEC/Makefile:1.14 --- llvm-test/External/SPEC/Makefile:1.13 Sun Sep 5 14:54:37 2004 +++ llvm-test/External/SPEC/Makefile Mon Sep 6 03:36:37 2004 @@ -1,6 +1,6 @@ LEVEL = ../.. PARALLEL_DIRS := CFP2000 CINT2000 CINT95 -include $(LEVEL)/../../Makefile.config +#include $(LEVEL)/../../Makefile.config # # Remove SPEC95 and SPEC2000 per the user's configuration @@ -14,4 +14,4 @@ PARALLEL_DIRS := $(filter-out CINT95/, $(PARALLEL_DIRS)) endif -include $(LEVEL)/Makefile.programs +include $(LEVEL)/External/Makefile.external Index: llvm-test/External/SPEC/Makefile.spec diff -u llvm-test/External/SPEC/Makefile.spec:1.36 llvm-test/External/SPEC/Makefile.spec:1.37 --- llvm-test/External/SPEC/Makefile.spec:1.36 Sun Sep 5 02:56:51 2004 +++ llvm-test/External/SPEC/Makefile.spec Mon Sep 6 03:36:37 2004 @@ -5,7 +5,7 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config ## Information the test should have provided... ifndef STDOUT_FILENAME @@ -44,7 +44,7 @@ LCXXFLAGS := -O3 CPPFLAGS += -I $(SPEC_BENCH_DIR)/src/ -SPEC_SANDBOX := $(LLVM_SRC_ROOT)/External/SPEC/Sandbox.sh +SPEC_SANDBOX := $(LEVEL)/External/SPEC/Sandbox.sh # Information about testing the program... REF_IN_DIR := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/ Index: llvm-test/External/SPEC/Makefile.spec2000 diff -u llvm-test/External/SPEC/Makefile.spec2000:1.3 llvm-test/External/SPEC/Makefile.spec2000:1.4 --- llvm-test/External/SPEC/Makefile.spec2000:1.3 Wed Sep 1 09:33:19 2004 +++ llvm-test/External/SPEC/Makefile.spec2000 Mon Sep 6 03:36:37 2004 @@ -4,7 +4,7 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config SPEC_ROOT := $(SPEC2000_ROOT) CPPFLAGS += -DSPEC_CPU2000 Index: llvm-test/External/SPEC/Makefile.spec95 diff -u llvm-test/External/SPEC/Makefile.spec95:1.8 llvm-test/External/SPEC/Makefile.spec95:1.9 --- llvm-test/External/SPEC/Makefile.spec95:1.8 Wed Sep 1 09:33:19 2004 +++ llvm-test/External/SPEC/Makefile.spec95 Mon Sep 6 03:36:37 2004 @@ -4,7 +4,7 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config SPEC_ROOT := $(SPEC95_ROOT) CPPFLAGS += -DSPEC_CPU95 From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/Makefile Message-ID: <200409060836.DAA12184@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000: Makefile updated: 1.7 -> 1.8 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/Makefile diff -u llvm-test/External/SPEC/CFP2000/Makefile:1.7 llvm-test/External/SPEC/CFP2000/Makefile:1.8 --- llvm-test/External/SPEC/CFP2000/Makefile:1.7 Sun Sep 5 14:55:50 2004 +++ llvm-test/External/SPEC/CFP2000/Makefile Mon Sep 6 03:36:37 2004 @@ -5,4 +5,4 @@ 183.equake \ 188.ammp -include $(LEVEL)/Makefile.programs +include $(LEVEL)/External/Makefile.external From reid at x10sys.com Mon Sep 6 03:36:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 03:36:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/147.vortex/Makefile Message-ID: <200409060836.DAA12194@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/147.vortex: Makefile updated: 1.2 -> 1.3 --- Log message: Adjust the makefiles for their new home. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/147.vortex/Makefile diff -u llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.2 llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.3 --- llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.2 Fri Feb 13 16:45:44 2004 +++ llvm-test/External/SPEC/CINT95/147.vortex/Makefile Mon Sep 6 03:36:37 2004 @@ -1,6 +1,6 @@ LEVEL = ../../../../../.. -include $(LEVEL)/Makefile.config +#include $(LEVEL)/Makefile.config STDOUT_FILENAME := vortex.out LDFLAGS += -lm From natebegeman at mac.com Mon Sep 6 13:47:10 2004 From: natebegeman at mac.com (Nate Begeman) Date: Mon, 6 Sep 2004 13:47:10 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp PowerPCInstrInfo.td Message-ID: <200409061847.NAA15281@zion.cs.uiuc.edu> Changes in directory llvm/lib/Target/PowerPC: PPC64ISelSimple.cpp updated: 1.13 -> 1.14 PowerPCInstrInfo.td updated: 1.34 -> 1.35 --- Log message: Add 64 bit divide instructions, and use them --- Diffs of the changes: (+15 -34) Index: llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp diff -u llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.13 llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.14 --- llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.13 Wed Sep 1 17:55:36 2004 +++ llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp Mon Sep 6 13:46:59 2004 @@ -82,9 +82,8 @@ std::map RegMap; // Mapping between Values and SSA Regs // External functions used in the Module - Function *fmodfFn, *fmodFn, *__cmpdi2Fn, *__moddi3Fn, *__divdi3Fn, - *__umoddi3Fn, *__udivdi3Fn, *__fixsfdiFn, *__fixdfdiFn, *__fixunssfdiFn, - *__fixunsdfdiFn, *__floatdisfFn, *__floatdidfFn, *mallocFn, *freeFn; + Function *fmodfFn, *fmodFn, *__cmpdi2Fn, *__fixsfdiFn, *__fixdfdiFn, + *__fixunssfdiFn, *__fixunsdfdiFn, *mallocFn, *freeFn; // MBBMap - Mapping between LLVM BB -> Machine BB std::map MBBMap; @@ -113,14 +112,6 @@ fmodFn = M.getOrInsertFunction("fmod", d, d, d, 0); // int __cmpdi2(long, long); __cmpdi2Fn = M.getOrInsertFunction("__cmpdi2", i, l, l, 0); - // long __moddi3(long, long); - __moddi3Fn = M.getOrInsertFunction("__moddi3", l, l, l, 0); - // long __divdi3(long, long); - __divdi3Fn = M.getOrInsertFunction("__divdi3", l, l, l, 0); - // unsigned long __umoddi3(unsigned long, unsigned long); - __umoddi3Fn = M.getOrInsertFunction("__umoddi3", ul, ul, ul, 0); - // unsigned long __udivdi3(unsigned long, unsigned long); - __udivdi3Fn = M.getOrInsertFunction("__udivdi3", ul, ul, ul, 0); // long __fixsfdi(float) __fixsfdiFn = M.getOrInsertFunction("__fixsfdi", l, f, 0); // long __fixdfdi(double) @@ -129,10 +120,6 @@ __fixunssfdiFn = M.getOrInsertFunction("__fixunssfdi", ul, f, 0); // unsigned long __fixunsdfdi(double) __fixunsdfdiFn = M.getOrInsertFunction("__fixunsdfdi", ul, d, 0); - // float __floatdisf(long) - __floatdisfFn = M.getOrInsertFunction("__floatdisf", f, l, 0); - // double __floatdidf(long) - __floatdidfFn = M.getOrInsertFunction("__floatdidf", d, l, 0); // void* malloc(size_t) mallocFn = M.getOrInsertFunction("malloc", voidPtr, Type::UIntTy, 0); // void free(void*) @@ -1941,22 +1928,7 @@ doCall(ValueRecord(ResultReg, Type::DoubleTy), TheCall, Args, false); } return; - case cLong: { - static Function* const Funcs[] = - { __moddi3Fn, __divdi3Fn, __umoddi3Fn, __udivdi3Fn }; - unsigned Op0Reg = getReg(Op0, BB, IP); - unsigned Op1Reg = getReg(Op1, BB, IP); - unsigned NameIdx = Ty->isUnsigned()*2 + isDiv; - MachineInstr *TheCall = - BuildMI(PPC::CALLpcrel, 1).addGlobalAddress(Funcs[NameIdx], true); - - std::vector Args; - Args.push_back(ValueRecord(Op0Reg, Type::LongTy)); - Args.push_back(ValueRecord(Op1Reg, Type::LongTy)); - doCall(ValueRecord(ResultReg, Type::LongTy), TheCall, Args, false); - return; - } - case cByte: case cShort: case cInt: + case cLong: case cByte: case cShort: case cInt: break; // Small integrals, handled below... default: assert(0 && "Unknown class!"); } @@ -1983,25 +1955,30 @@ if (log2V != 0 && Ty->isSigned()) { unsigned Op0Reg = getReg(Op0, BB, IP); unsigned TmpReg = makeAnotherReg(Op0->getType()); + unsigned Opcode = Class == cLong ? PPC::SRADI : PPC::SRAWI; - BuildMI(*BB, IP, PPC::SRAWI, 2, TmpReg).addReg(Op0Reg).addImm(log2V); + BuildMI(*BB, IP, Opcode, 2, TmpReg).addReg(Op0Reg).addImm(log2V); BuildMI(*BB, IP, PPC::ADDZE, 1, ResultReg).addReg(TmpReg); return; } } + static const unsigned DivOpcodes[] = + { PPC::DIVWU, PPC::DIVW, PPC::DIVDU, PPC::DIVD }; + unsigned Op0Reg = getReg(Op0, BB, IP); unsigned Op1Reg = getReg(Op1, BB, IP); - unsigned Opcode = Ty->isSigned() ? PPC::DIVW : PPC::DIVWU; + unsigned Opcode = DivOpcodes[2*(Class == cLong) + Ty->isSigned()]; if (isDiv) { BuildMI(*BB, IP, Opcode, 2, ResultReg).addReg(Op0Reg).addReg(Op1Reg); } else { // Remainder unsigned TmpReg1 = makeAnotherReg(Op0->getType()); unsigned TmpReg2 = makeAnotherReg(Op0->getType()); + unsigned MulOpcode = Class == cLong ? PPC::MULLD : PPC::MULLW; BuildMI(*BB, IP, Opcode, 2, TmpReg1).addReg(Op0Reg).addReg(Op1Reg); - BuildMI(*BB, IP, PPC::MULLW, 2, TmpReg2).addReg(TmpReg1).addReg(Op1Reg); + BuildMI(*BB, IP, MulOpcode, 2, TmpReg2).addReg(TmpReg1).addReg(Op1Reg); BuildMI(*BB, IP, PPC::SUBF, 2, ResultReg).addReg(TmpReg2).addReg(Op0Reg); } } Index: llvm/lib/Target/PowerPC/PowerPCInstrInfo.td diff -u llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.34 llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.35 --- llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.34 Sat Sep 4 00:00:00 2004 +++ llvm/lib/Target/PowerPC/PowerPCInstrInfo.td Mon Sep 6 13:46:59 2004 @@ -321,6 +321,10 @@ "addc $rT, $rA, $rB">; def ADDE : XOForm_1<31, 138, 0, 0, 0, 0, (ops GPRC:$rT, GPRC:$rA, GPRC:$rB), "adde $rT, $rA, $rB">; +def DIVD : XOForm_1<31, 489, 0, 0, 1, 0, (ops GPRC:$rT, GPRC:$rA, GPRC:$rB), + "divd $rT, $rA, $rB">; +def DIVDU : XOForm_1<31, 457, 0, 0, 1, 0, (ops GPRC:$rT, GPRC:$rA, GPRC:$rB), + "divdu $rT, $rA, $rB">; def DIVW : XOForm_1<31, 491, 0, 0, 0, 0, (ops GPRC:$rT, GPRC:$rA, GPRC:$rB), "divw $rT, $rA, $rB">; def DIVWU : XOForm_1<31, 459, 0, 0, 0, 0, (ops GPRC:$rT, GPRC:$rA, GPRC:$rB), From reid at x10sys.com Mon Sep 6 14:06:37 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 14:06:37 -0500 Subject: [llvm-commits] CVS: llvm/utils/countloc.sh Message-ID: <200409061906.OAA15465@zion.cs.uiuc.edu> Changes in directory llvm/utils: countloc.sh added (r1.1) --- Log message: Added a tool to more accurately count the lines of code. The previous utility, getsrcs.sh suffered from two problems: (1) it generated command lines too long for some platforms and (2) it searched the projects diretory which now contains the llvm-test module (in nightly tester) but we don't want to include the test code in our LOC calculation. This script should be maintained as LLVM adds new top level directories that contain source code. --- Diffs of the changes: (+38 -0) Index: llvm/utils/countloc.sh diff -c /dev/null llvm/utils/countloc.sh:1.1 *** /dev/null Mon Sep 6 14:06:37 2004 --- llvm/utils/countloc.sh Mon Sep 6 14:06:27 2004 *************** *** 0 **** --- 1,38 ---- + #!/bin/sh + ##===- utils/countloc.sh - Counts Lines Of Code --------------*- Script -*-===## + # + # The LLVM Compiler Infrastructure + # + # This file was developed by Reid Spencer and is distributed under the + # University of Illinois Open Source License. See LICENSE.TXT for details. + # + ##===----------------------------------------------------------------------===## + # + # This script finds all the source code files in the source code directories + # (excluding certain things), runs "wc -l" on them to get the number of lines in + # each file and then sums up and prints the total with awk. + # + # The script takes no arguments but does expect to be run from the top llvm + # source directory. + # + TOPDIR=`pwd | sed -e 's#(.*/llvm).*#$1#'` + if test -d "$TOPDIR" ; then + cd $TOPDIR + find include lib tools utils examples -type f -name '*.[cdhyltp]*' \ + \! -name '*~' \ + \! -name '#*' \ + \! -name '*.ll' \ + \! -name '*.d' \ + \! -name '*.dir' \ + \! -name 'Sparc.burm.c' \ + \! -name 'llvmAsmParser.cpp' \ + \! -name 'llvmAsmParser.h' \ + \! -name 'FileParser.cpp' \ + \! -name 'FileParser.h' \ + -exec wc -l {} \; | awk '\ + BEGIN { loc=0; } \ + { loc += $1; } \ + END { print loc; }' + else + echo "Can't find LLVM top directory in $TOPDIR" + fi From reid at x10sys.com Mon Sep 6 14:33:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 6 Sep 2004 14:33:05 -0500 Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl Message-ID: <200409061933.OAA15695@zion.cs.uiuc.edu> Changes in directory llvm/utils: NightlyTest.pl updated: 1.65 -> 1.66 --- Log message: Modify the lines of code counting mechanism to use the new "countloc.sh" utility. This avoids some problems with long line lengths and counting the wrong things. --- Diffs of the changes: (+1 -1) Index: llvm/utils/NightlyTest.pl diff -u llvm/utils/NightlyTest.pl:1.65 llvm/utils/NightlyTest.pl:1.66 --- llvm/utils/NightlyTest.pl:1.65 Sun Sep 5 15:57:22 2004 +++ llvm/utils/NightlyTest.pl Mon Sep 6 14:32:55 2004 @@ -372,7 +372,7 @@ my $CVSCheckoutTime = GetRegex "([0-9.]+)", `grep '^real' $CVSLog`; my $NumFilesInCVS = `egrep '^U' $CVSLog | wc -l` + 0; my $NumDirsInCVS = `egrep '^cvs (checkout|server|update):' $CVSLog | wc -l` + 0; -$LOC = GetRegex "([0-9]+) +total", `wc -l \`utils/getsrcs.sh\` | grep total`; +$LOC = `utils/countloc.sh`; # # Build the entire tree, saving build messages to the build log From brukman at cs.uiuc.edu Mon Sep 6 15:58:54 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 15:58:54 -0500 Subject: [llvm-commits] CVS: llvm/docs/index.html Message-ID: <200409062058.PAA16973@zion.cs.uiuc.edu> Changes in directory llvm/docs: index.html updated: 1.27 -> 1.28 --- Log message: Reword to not use a link text `click here'. --- Diffs of the changes: (+3 -3) Index: llvm/docs/index.html diff -u llvm/docs/index.html:1.27 llvm/docs/index.html:1.28 --- llvm/docs/index.html:1.27 Tue Aug 17 04:38:50 2004 +++ llvm/docs/index.html Mon Sep 6 15:58:44 2004 @@ -72,8 +72,8 @@
  • You can probably find help on the unofficial LLVM IRC channel. We often are on irc.oftc.net in the #llvm channel. If you are -using the mozilla browser, and have chatzilla installed, you can join by clicking here.
  • +using the mozilla browser, and have chatzilla installed, you can join #llvm on irc.oftc.net directly. @@ -202,6 +202,6 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"> LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/08/17 09:38:50 $ + Last modified: $Date: 2004/09/06 20:58:44 $ From brukman at cs.uiuc.edu Mon Sep 6 17:36:33 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 17:36:33 -0500 Subject: [llvm-commits] CVS: llvm/docs/OpenProjects.html Message-ID: <200409062236.RAA17774@zion.cs.uiuc.edu> Changes in directory llvm/docs: OpenProjects.html updated: 1.33 -> 1.34 --- Log message: * Profile-guided needs a hyphen * Dead store elimination has been implemented --- Diffs of the changes: (+4 -5) Index: llvm/docs/OpenProjects.html diff -u llvm/docs/OpenProjects.html:1.33 llvm/docs/OpenProjects.html:1.34 --- llvm/docs/OpenProjects.html:1.33 Mon Jul 12 16:10:47 2004 +++ llvm/docs/OpenProjects.html Mon Sep 6 17:35:43 2004 @@ -26,7 +26,7 @@
    1. Implementing new feature PRs
    2. Pointer and Alias Analysis
    3. -
    4. Profile Guided Optimization
    5. +
    6. Profile-Guided Optimization
    7. New Transformations and Analyses
    8. X86 Back-end Improvements
    9. Miscellaneous Additions
    10. @@ -227,7 +227,6 @@
    11. Implement alias-analysis-based optimizations:
        -
      • Dead store elimination
      • ...
    @@ -236,7 +235,7 @@
    @@ -247,7 +246,7 @@ transformations as well as improvements to the current profiling system.

    -

    Ideas for profile guided transformations:

    +

    Ideas for profile-guided transformations:

    1. Superblock formation (with many optimizations)
    2. @@ -353,7 +352,7 @@ Chris Lattner
      LLVM Compiler Infrastructure
      - Last modified: $Date: 2004/07/12 21:10:47 $ + Last modified: $Date: 2004/09/06 22:35:43 $ From brukman at cs.uiuc.edu Mon Sep 6 17:58:23 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 17:58:23 -0500 Subject: [llvm-commits] CVS: llvm/docs/WritingAnLLVMBackend.html Message-ID: <200409062258.RAA18114@zion.cs.uiuc.edu> Changes in directory llvm/docs: WritingAnLLVMBackend.html added (r1.1) --- Log message: How to write an LLVM backend, first draft. --- Diffs of the changes: (+245 -0) Index: llvm/docs/WritingAnLLVMBackend.html diff -c /dev/null llvm/docs/WritingAnLLVMBackend.html:1.1 *** /dev/null Mon Sep 6 17:58:23 2004 --- llvm/docs/WritingAnLLVMBackend.html Mon Sep 6 17:58:13 2004 *************** *** 0 **** --- 1,245 ---- + + + + Writing an LLVM backend + + + + + +
      + Writing an LLVM backend +
      + +
        +
      1. Introduction +
      2. Writing a backend +
          +
        1. Machine backends
        2. +
            +
          1. Outline
          2. +
          3. Implementation details
          4. +
          +
        3. Machine backends
        4. +
        5. Language backends
        6. +
      3. +
      4. Related reading material +
      + +
      +

      Written by Misha Brukman

      +
      + + + + + +
      + +

      This document describes techniques for writing backends for LLVM which + convert the LLVM representation to machine assembly code or other languages.

      + +
      + + + + + + + + + +
      + Outline +
      + +
      + +

      In general, you want to follow the format of X86 or PowerPC (in + lib/Target).

      + +

      To create a static compiler (one that emits text assembly), you need to + implement the following:

      + +
        +
      • Describe the register set +
          +
        • Create a TableGen description of + the register set and register classes
        • +
        • Implement a subclass of MRegisterInfo
        • +
      • +
      • Describe the instruction set +
      • +
      • Describe the target machine +
          +
        • Create a TableGen description of + the target that describes the pointer size and references the instruction + set
        • +
        • Implement a subclass of TargetMachine, which + configures TargetData + correctly
        • +
      • +
      • Implement the assembly printer for the architecture. Usually, if you have + described the instruction set with the assembly printer generator in mind, that + step can be almost automated.
      • +
      + +

      Now, for static code generation you also need to write an instruction + selector for your platform: see lib/Target/*/*ISelSimple.cpp which + is no longer "simple" but it gives you the idea: you have to be able to create + MachineInstrs for any given LLVM instruction using the InstVisitor + pattern, and produce a MachineFunction with + MachineBasicBlocks full of MachineInstrs for a + corresponding LLVM Function. Creating an instruction selector is perhaps the + most time-consuming part of creating a back-end.

      + +

      To create a JIT for your platform:

      + +
        +
      • Create a subclass of TargetJITInfo
      • +
      • Create a machine code emitter that will be used to emit binary code + directly into memory, given MachineInstrs
      • +
      + +

      Note that lib/target/Skeleton is a clean skeleton for a new target, + so you might want to start with that and adapt it for your target, and if you + are wondering how things are done, peek in the X86 or PowerPC target.

      + +

      The Skeleton target is non-functional but provides the basic building blocks + you will need for your endeavor.

      + +
      + + + + +
      + +
        + +
      • TableGen register info description - describe a class which + will store the register's number in the binary encoding of the instruction + (e.g., for JIT purposes).

        + +

        You also need to define register classes to contain these registers, such as + the integer register class and floating-point register class, so that you can + allocate virtual registers to instructions from these sets, and let the + target-independent register allocator automatically choose the actual + architected registers.

        + +
        +
        + // class Register is defined in Target.td
        + class TargetReg : Register {
        +   let Namespace = "Target";
        + }
        + 
        + class IntReg<bits<5> num> : TargetReg {
        +   field bits<5> Num = num;
        + }
        + 
        + def R0 : IntReg<0>;
        + ...
        + 
        + // class RegisterClass is defined in Target.td
        + def IReg : RegisterClass<i64, 64, [R0, ... ]>;
        + 
        +
        +
      • + +
      • TableGen instruction info description - break up instructions into + classes, usually that's already done by the manufacturer (see instruction + manual). Define a class for each instruction category. Define each opcode as a + subclass of the category, with appropriate parameters such as the fixed binary + encoding of opcodes and extended opcodes, and map the register bits to the bits + of the instruction which they are encoded in (for the JIT). Also specify how + the instruction should be printed so it can use the automatic assembly printer, + e.g.:

        + +
        +
        + // class Instruction is defined in Target.td
        + class Form<bits<6> opcode, dag OL, string asmstr> : Instruction {
        +   field bits<42> Inst;
        + 
        +   let Namespace = "Target";
        +   let Inst{0-6} = opcode;
        +   let OperandList = OL;
        +   let AsmString = asmstr;
        + }
        + 
        + def ADD : Form<42, (ops IReg:$rD, IReg:$rA, IReg:$rB), "add $rD, $rA, $rB">;
        + 
        +
        +
      • + +
      + +
      + + + + +
      + +

      For now, just take a look at lib/Target/CBackend for an example of + how the C backend is written.

      + +
      + + + + + +
      + +
        +
      • Code generator - + describes some of the classes in code generation at a high level, but + it is not (yet) complete.
      • +
      • TableGen fundamentals - + describes how to use TableGen to describe your target information succinctly +
      • +
      + +
      + + + +
      +
      + Valid CSS! + Valid HTML 4.01! + + Misha Brukman
      + The LLVM Compiler Infrastructure +
      + Last modified: $Date: 2004/09/06 22:58:13 $ +
      + + + From brukman at cs.uiuc.edu Mon Sep 6 18:00:11 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:00:11 -0500 Subject: [llvm-commits] CVS: llvm/docs/index.html Message-ID: <200409062300.SAA18290@zion.cs.uiuc.edu> Changes in directory llvm/docs: index.html updated: 1.28 -> 1.29 --- Log message: Add link to new howto on writing backends. --- Diffs of the changes: (+4 -1) Index: llvm/docs/index.html diff -u llvm/docs/index.html:1.28 llvm/docs/index.html:1.29 --- llvm/docs/index.html:1.28 Mon Sep 6 15:58:44 2004 +++ llvm/docs/index.html Mon Sep 6 18:00:01 2004 @@ -131,6 +131,9 @@
    3. Writing an LLVM Pass - Information on how to write LLVM transformations and analyses.
    4. +
    5. Writing an LLVM Backend - Information +on how to write LLVM backends for machine targets.
    6. +
    7. The LLVM Target-Independent Code Generator - The design and implementation of the LLVM code generator. Useful if you are working on retargetting LLVM to a new architecture, designing @@ -202,6 +205,6 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"> LLVM Compiler Infrastructure
      - Last modified: $Date: 2004/09/06 20:58:44 $ + Last modified: $Date: 2004/09/06 23:00:01 $ From brukman at cs.uiuc.edu Mon Sep 6 18:00:41 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:00:41 -0500 Subject: [llvm-commits] CVS: llvm/docs/AliasAnalysis.html Message-ID: <200409062300.SAA18418@zion.cs.uiuc.edu> Changes in directory llvm/docs: AliasAnalysis.html updated: 1.24 -> 1.25 --- Log message: Remove extraneous blank lines. --- Diffs of the changes: (+1 -4) Index: llvm/docs/AliasAnalysis.html diff -u llvm/docs/AliasAnalysis.html:1.24 llvm/docs/AliasAnalysis.html:1.25 --- llvm/docs/AliasAnalysis.html:1.24 Wed Jul 28 17:18:33 2004 +++ llvm/docs/AliasAnalysis.html Mon Sep 6 18:00:30 2004 @@ -274,7 +274,6 @@
    - - -
    Writing a new AliasAnalysis Implementation @@ -949,7 +946,7 @@ Chris Lattner
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/07/28 22:18:33 $ + Last modified: $Date: 2004/09/06 23:00:30 $ From brukman at cs.uiuc.edu Mon Sep 6 18:21:50 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:21:50 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec Message-ID: <200409062321.SAA19312@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile updated: 1.14 -> 1.15 Makefile.spec updated: 1.37 -> 1.38 --- Log message: Fix paths now that test/Programs is a project --- Diffs of the changes: (+3 -2) Index: llvm-test/External/SPEC/Makefile diff -u llvm-test/External/SPEC/Makefile:1.14 llvm-test/External/SPEC/Makefile:1.15 --- llvm-test/External/SPEC/Makefile:1.14 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/Makefile Mon Sep 6 18:21:40 2004 @@ -1,6 +1,6 @@ LEVEL = ../.. PARALLEL_DIRS := CFP2000 CINT2000 CINT95 -#include $(LEVEL)/../../Makefile.config +include $(LLVM_OBJ_ROOT)/Makefile.config # # Remove SPEC95 and SPEC2000 per the user's configuration Index: llvm-test/External/SPEC/Makefile.spec diff -u llvm-test/External/SPEC/Makefile.spec:1.37 llvm-test/External/SPEC/Makefile.spec:1.38 --- llvm-test/External/SPEC/Makefile.spec:1.37 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/Makefile.spec Mon Sep 6 18:21:40 2004 @@ -5,7 +5,8 @@ # ##===----------------------------------------------------------------------===## -#include $(LEVEL)/Makefile.config +include $(LEVEL)/Makefile.common +include $(LLVM_SRC_ROOT)/Makefile.rules ## Information the test should have provided... ifndef STDOUT_FILENAME From brukman at cs.uiuc.edu Mon Sep 6 18:22:23 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:22:23 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile Message-ID: <200409062322.SAA19334@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/177.mesa: Makefile updated: 1.5 -> 1.6 --- Log message: Fix path to Makefile.spec2000, general clean up --- Diffs of the changes: (+11 -13) Index: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile diff -u llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.5 llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.6 --- llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.5 Wed Sep 1 09:33:19 2004 +++ llvm-test/External/SPEC/CFP2000/177.mesa/Makefile Mon Sep 6 18:22:12 2004 @@ -2,24 +2,22 @@ FP_ABSTOLERANCE := 4 ifdef LARGE_PROBLEM_SIZE -RUN_OPTIONS := -frames 500 +RUN_OPTIONS := -frames 500 else -RUN_OPTIONS := -frames 10 +RUN_OPTIONS := -frames 10 endif RUN_OPTIONS += -meshfile mesa.in -ppmfile mesa.ppm -#STDIN_FILENAME = ammp.in -#STDOUT_FILENAME = ammp.out CPPFLAGS = Source = $(addprefix $(SPEC_BENCH_DIR)/src/, \ - accum.c alpha.c alphabuf.c api1.c api2.c attrib.c bitmap.c blend.c \ - clip.c colortab.c context.c copypix.c depth.c dlist.c drawpix.c \ - enable.c eval.c feedback.c fog.c get.c hash.c image.c light.c \ - lines.c logic.c masking.c matrix.c misc.c mmath.c osmesa.c pb.c \ - pixel.c pointers.c points.c polygon.c quads.c rastpos.c readpix.c \ - rect.c scissor.c shade.c span.c stencil.c teximage.c texobj.c \ - texstate.c texture.c triangle.c varray.c vb.c vbfill.c vbrender.c \ - vbxform.c winpos.c xform.c mesa4.c) + accum.c alpha.c alphabuf.c api1.c api2.c attrib.c bitmap.c blend.c \ + clip.c colortab.c context.c copypix.c depth.c dlist.c drawpix.c \ + enable.c eval.c feedback.c fog.c get.c hash.c image.c light.c \ + lines.c logic.c masking.c matrix.c misc.c mmath.c osmesa.c pb.c \ + pixel.c pointers.c points.c polygon.c quads.c rastpos.c readpix.c \ + rect.c scissor.c shade.c span.c stencil.c teximage.c texobj.c \ + texstate.c texture.c triangle.c varray.c vb.c vbfill.c vbrender.c \ + vbxform.c winpos.c xform.c mesa4.c) -include ../../Makefile.spec2000 +include $(LEVEL)/External/SPEC/Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 18:24:08 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:24:08 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/179.art/Makefile Message-ID: <200409062324.SAA19375@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/179.art: Makefile updated: 1.3 -> 1.4 --- Log message: Fix path to Makefile.spec2000 as a result of moving test/Programs to a project --- Diffs of the changes: (+7 -5) Index: llvm-test/External/SPEC/CFP2000/179.art/Makefile diff -u llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.3 llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.4 --- llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.3 Wed Sep 1 09:33:20 2004 +++ llvm-test/External/SPEC/CFP2000/179.art/Makefile Mon Sep 6 18:23:58 2004 @@ -1,11 +1,13 @@ LEVEL = ../../../.. + ifdef LARGE_PROBLEM_SIZE -RUN_OPTIONS = -scanfile c756hel.in -trainfile1 a10.img -stride 2 -startx 134 -starty 220 -endx 184 -endy 240 -objects 3 +RUN_OPTIONS = -scanfile c756hel.in -trainfile1 a10.img -stride 2 -startx 134 -starty 220 -endx 184 -endy 240 -objects 3 else -RUN_OPTIONS = -scanfile c756hel.in -trainfile1 a10.img -stride 2 -startx 134 -starty 220 -endx 139 -endy 225 -objects 1 +RUN_OPTIONS = -scanfile c756hel.in -trainfile1 a10.img -stride 2 -startx 134 -starty 220 -endx 139 -endy 225 -objects 1 endif -#STDIN_FILENAME = $(RUN_TYPE).in -STDOUT_FILENAME = $(RUN_TYPE).out +#STDIN_FILENAME = $(RUN_TYPE).in +STDOUT_FILENAME = $(RUN_TYPE).out CPPFLAGS = -include ../../Makefile.spec2000 + +include $(LEVEL)/External/SPEC/Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 18:24:09 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:24:09 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/183.equake/Makefile Message-ID: <200409062324.SAA19381@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/183.equake: Makefile updated: 1.3 -> 1.4 --- Log message: Fix path to Makefile.spec2000 as a result of moving test/Programs to a project --- Diffs of the changes: (+3 -1) Index: llvm-test/External/SPEC/CFP2000/183.equake/Makefile diff -u llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.3 llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.4 --- llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.3 Wed Sep 1 09:33:20 2004 +++ llvm-test/External/SPEC/CFP2000/183.equake/Makefile Mon Sep 6 18:23:59 2004 @@ -1,6 +1,8 @@ LEVEL = ../../../.. + RUN_OPTIONS = STDIN_FILENAME = inp.in STDOUT_FILENAME = inp.out CPPFLAGS = -include ../../Makefile.spec2000 + +include $(LEVEL)/External/SPEC/Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 18:24:13 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:24:13 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile Message-ID: <200409062324.SAA19387@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/188.ammp: Makefile updated: 1.4 -> 1.5 --- Log message: Fix path to Makefile.spec2000 as a result of moving test/Programs to a project --- Diffs of the changes: (+4 -1) Index: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile diff -u llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.4 llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.5 --- llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.4 Wed Sep 1 09:33:20 2004 +++ llvm-test/External/SPEC/CFP2000/188.ammp/Makefile Mon Sep 6 18:24:03 2004 @@ -1,8 +1,10 @@ LEVEL = ../../../.. + RUN_OPTIONS = STDIN_FILENAME = ammp.in STDOUT_FILENAME = ammp.out CPPFLAGS = + # override RUN_TYPE (this is a long running test): ifndef RUN_TYPE ifdef LARGE_PROBLEM_SIZE @@ -11,4 +13,5 @@ RUN_TYPE := train endif endif -include ../../Makefile.spec2000 + +include $(LEVEL)/External/SPEC/Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 18:43:48 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:43:48 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile.spec2000 Message-ID: <200409062343.SAA07910@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile.spec2000 updated: 1.4 -> 1.5 --- Log message: Unbreak Makefile: we can get Makefile.config via Makefile.common --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/Makefile.spec2000 diff -u llvm-test/External/SPEC/Makefile.spec2000:1.4 llvm-test/External/SPEC/Makefile.spec2000:1.5 --- llvm-test/External/SPEC/Makefile.spec2000:1.4 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/Makefile.spec2000 Mon Sep 6 18:43:37 2004 @@ -4,7 +4,7 @@ # ##===----------------------------------------------------------------------===## -#include $(LEVEL)/Makefile.config +include $(LEVEL)/Makefile.common SPEC_ROOT := $(SPEC2000_ROOT) CPPFLAGS += -DSPEC_CPU2000 From brukman at cs.uiuc.edu Mon Sep 6 18:46:15 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 18:46:15 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile.spec Message-ID: <200409062346.SAA08064@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile.spec updated: 1.38 -> 1.39 --- Log message: Sandbox.sh lies in source dir only, so use $(PROGDIR) instead of $(LEVEL) --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/Makefile.spec diff -u llvm-test/External/SPEC/Makefile.spec:1.38 llvm-test/External/SPEC/Makefile.spec:1.39 --- llvm-test/External/SPEC/Makefile.spec:1.38 Mon Sep 6 18:21:40 2004 +++ llvm-test/External/SPEC/Makefile.spec Mon Sep 6 18:46:05 2004 @@ -45,7 +45,7 @@ LCXXFLAGS := -O3 CPPFLAGS += -I $(SPEC_BENCH_DIR)/src/ -SPEC_SANDBOX := $(LEVEL)/External/SPEC/Sandbox.sh +SPEC_SANDBOX := $(PROGDIR)/External/SPEC/Sandbox.sh # Information about testing the program... REF_IN_DIR := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/ From brukman at cs.uiuc.edu Mon Sep 6 22:25:13 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:25:13 -0500 Subject: [llvm-commits] CVS: llvm-test/Makefile Message-ID: <200409070325.WAA20777@zion.cs.uiuc.edu> Changes in directory llvm-test: Makefile updated: 1.24 -> 1.25 --- Log message: * Fix comment header * Remove extraneous comments that don't apply to non-sample projects --- Diffs of the changes: (+4 -13) Index: llvm-test/Makefile diff -u llvm-test/Makefile:1.24 llvm-test/Makefile:1.25 --- llvm-test/Makefile:1.24 Sun Sep 5 02:56:51 2004 +++ llvm-test/Makefile Mon Sep 6 22:25:02 2004 @@ -1,4 +1,4 @@ -##===- projects/ModuleMaker/Makefile -----------------------*- Makefile -*-===## +##===- projects/llvm-test/Makefile -------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -7,21 +7,12 @@ # ##===----------------------------------------------------------------------===## # -# This is a sample Makefile for a project that uses LLVM. +# This recursively traverses the programs, building them as necessary. This +# makefile also implements 'make report TEST='. # +##===----------------------------------------------------------------------===## -# -# Indicates our relative path to the top of the project's root directory. -# LEVEL = . - -# -# Directories that needs to be built. -# PARALLEL_DIRS = SingleSource MultiSource External -# -# Include the Master Makefile that knows how to build all. -# include $(LEVEL)/Makefile.programs - From brukman at cs.uiuc.edu Mon Sep 6 22:27:22 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:27:22 -0500 Subject: [llvm-commits] CVS: llvm-test/Makefile.common Makefile.config.in Makefile.common.in Message-ID: <200409070327.WAA20817@zion.cs.uiuc.edu> Changes in directory llvm-test: Makefile.common added (r1.1) Makefile.config.in added (r1.1) Makefile.common.in (r1.2) removed --- Log message: Reorganization to be more like the top-level llvm tree: * Makefile.config is auto-generated by configure It can be included separately without getting Makefile.rules * Makefile.common is NOT auto-generated and includes both Makefile.config and Makefile.rules --- Diffs of the changes: (+42 -0) Index: llvm-test/Makefile.common diff -c /dev/null llvm-test/Makefile.common:1.1 *** /dev/null Mon Sep 6 22:27:22 2004 --- llvm-test/Makefile.common Mon Sep 6 22:27:12 2004 *************** *** 0 **** --- 1,18 ---- + #===-- Makefile.common - Common make rules for LLVM --------*- Makefile -*--===# + # + # The LLVM Compiler Infrastructure + # + # This file was developed by the LLVM research group and is distributed under + # the University of Illinois Open Source License. See LICENSE.TXT for details. + # + #===------------------------------------------------------------------------===# + + # + # Include the configuration file + # + include $(LEVEL)/Makefile.config + + # + # Include LLVM's Master Makefile. + # + include $(LLVM_SRC_ROOT)/Makefile.rules Index: llvm-test/Makefile.config.in diff -c /dev/null llvm-test/Makefile.config.in:1.1 *** /dev/null Mon Sep 6 22:27:22 2004 --- llvm-test/Makefile.config.in Mon Sep 6 22:27:12 2004 *************** *** 0 **** --- 1,24 ---- + # + # Set this variable to the top of the LLVM source tree. + # + LLVM_SRC_ROOT = @LLVM_SRC@ + + # + # Set this variable to the top level directory where LLVM was built + # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config). + # + LLVM_OBJ_ROOT = @LLVM_OBJ@ + + # + # Include the configuration file + # + include $(LLVM_OBJ_ROOT)/Makefile.config + + # + # Set the source root and source directory pathnames + # + BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR))) + + BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@) + + From brukman at cs.uiuc.edu Mon Sep 6 22:31:39 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:31:39 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/configure.ac Message-ID: <200409070331.WAA21039@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: configure.ac updated: 1.3 -> 1.4 --- Log message: * Makefile.common is NOT auto-generated, needs to be copied over * Makefile.config IS auto-generated * Copy over Makefile.tests and all TEST.* Makefiles into the object tree * Alphabetize Makefile directories included * Bring back AC_DEFUN(EXTERNAL_BENCHMARK, ...) to support SPEC 95 and 2k --- Diffs of the changes: (+63 -7) Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.3 llvm-test/autoconf/configure.ac:1.4 --- llvm-test/autoconf/configure.ac:1.3 Mon Sep 6 03:33:42 2004 +++ llvm-test/autoconf/configure.ac Mon Sep 6 22:31:29 2004 @@ -5,16 +5,26 @@ AC_CONFIG_AUX_DIR([autoconf]) dnl Verify that the source directory is valid -AC_CONFIG_SRCDIR(["Makefile.common.in"]) +AC_CONFIG_SRCDIR(["Makefile.config.in"]) dnl Do special configuration of Makefiles AC_CONFIG_MAKEFILE(Makefile) -AC_CONFIG_MAKEFILE(Makefile.tests) +AC_CONFIG_MAKEFILE(Makefile.common) AC_CONFIG_MAKEFILE(Makefile.programs) -AC_CONFIG_MAKEFILE(SingleSource/Makefile) -AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc) -AC_CONFIG_MAKEFILE(MultiSource/Makefile) -AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc) +AC_CONFIG_MAKEFILE(Makefile.tests) +AC_CONFIG_MAKEFILE(TEST.aa.Makefile) +AC_CONFIG_MAKEFILE(TEST.dsgraph.report) +AC_CONFIG_MAKEFILE(TEST.aa.report) +AC_CONFIG_MAKEFILE(TEST.example.Makefile) +AC_CONFIG_MAKEFILE(TEST.nightly.Makefile) +AC_CONFIG_MAKEFILE(TEST.buildrepo.Makefile) +AC_CONFIG_MAKEFILE(TEST.jit.Makefile) +AC_CONFIG_MAKEFILE(TEST.nightly.report) +AC_CONFIG_MAKEFILE(TEST.dsgraph.Makefile) +AC_CONFIG_MAKEFILE(TEST.jit.report) +AC_CONFIG_MAKEFILE(TEST.typesafe.Makefile) +AC_CONFIG_MAKEFILE(TEST.dsgraph.gnuplot) +AC_CONFIG_MAKEFILE(TEST.vtl.Makefile) AC_CONFIG_MAKEFILE(External/Makefile) AC_CONFIG_MAKEFILE(External/Makefile.external) AC_CONFIG_MAKEFILE(External/Povray/Makefile) @@ -25,6 +35,10 @@ AC_CONFIG_MAKEFILE(External/SPEC/CFP2000/Makefile) AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile) AC_CONFIG_MAKEFILE(External/SPEC/CINT95/Makefile) +AC_CONFIG_MAKEFILE(MultiSource/Makefile) +AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc) +AC_CONFIG_MAKEFILE(SingleSource/Makefile) +AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc) dnl ************************************************************************** dnl * Set the location of various third-party software packages @@ -96,6 +110,48 @@ dnl Determine if the linker supports the -R option. AC_LINK_USE_R +AC_DEFUN(EXTERNAL_BENCHMARK, +[m4_define([allcapsname],translit($1,a-z,A-Z)) + AC_ARG_ENABLE($1, + AC_HELP_STRING([--enable-$1=ARG], + [Use $1 as a benchmark (srcs in DIR)]), + checkresult=$enableval, + checkresult=auto) +AC_MSG_CHECKING([for $1 benchmark sources]) +case "$checkresult" in +auto|yes) + defaultdir=$2 + if test -d "$defaultdir" + then + AC_SUBST(allcapsname()[_ROOT],[$defaultdir]) + AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) + checkresult="yes, found in $defaultdir" + else + checkresult=no + fi + ;; +no) + AC_SUBST(allcapsname()[_ROOT],[]) + AC_SUBST([USE_]allcapsname(),[]) + checkresult=no + ;; +*) if test -d "$checkresult" + then + AC_SUBST(allcapsname()[_ROOT],"$checkresult") + AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) + checkresult="yes, in $checkresult" + else + AC_SUBST(allcapsname()[_ROOT],[]) + AC_SUBST([USE_]allcapsname(),[]) + checkresult="no, not found in $checkresult" + fi + ;; +esac +AC_MSG_RESULT($checkresult) +m4_undefine([allcapsname]) +]) + + EXTERNAL_BENCHMARK(spec95,/home/vadve/shared/benchmarks/spec95/benchspec) EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec) EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31) @@ -116,4 +172,4 @@ AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) dnl Create the output files -AC_OUTPUT(Makefile.common) +AC_OUTPUT(Makefile.config) From brukman at cs.uiuc.edu Mon Sep 6 22:34:11 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:34:11 -0500 Subject: [llvm-commits] CVS: llvm-test/External/Makefile Message-ID: <200409070334.WAA21522@zion.cs.uiuc.edu> Changes in directory llvm-test/External: Makefile updated: 1.13 -> 1.14 --- Log message: Revert to the old format of Makefile, now that Makefile.config is around, and Makefile.common is as it should be --- Diffs of the changes: (+6 -1) Index: llvm-test/External/Makefile diff -u llvm-test/External/Makefile:1.13 llvm-test/External/Makefile:1.14 --- llvm-test/External/Makefile:1.13 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/Makefile Mon Sep 6 22:34:00 2004 @@ -1,6 +1,11 @@ LEVEL = .. # +# Include the configuration so that we know whether or not to include SPEC +# +include $(LEVEL)/Makefile.config + +# # Create the list of directories to compile # PARALLEL_DIRS := SPEC Povray @@ -9,4 +14,4 @@ PARALLEL_DIRS := $(filter-out Povray/, $(PARALLEL_DIRS)) endif -include Makefile.external +include $(LEVEL)/Makefile.programs From brukman at cs.uiuc.edu Mon Sep 6 22:36:15 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:36:15 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec Makefile.spec2000 Makefile.spec95 Message-ID: <200409070336.WAA21595@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile updated: 1.15 -> 1.16 Makefile.spec updated: 1.39 -> 1.40 Makefile.spec2000 updated: 1.5 -> 1.6 Makefile.spec95 updated: 1.9 -> 1.10 --- Log message: Revert Makefile structure back to what it used to be, since Makefile.config is generated in top-level testing directory. --- Diffs of the changes: (+5 -6) Index: llvm-test/External/SPEC/Makefile diff -u llvm-test/External/SPEC/Makefile:1.15 llvm-test/External/SPEC/Makefile:1.16 --- llvm-test/External/SPEC/Makefile:1.15 Mon Sep 6 18:21:40 2004 +++ llvm-test/External/SPEC/Makefile Mon Sep 6 22:36:04 2004 @@ -1,6 +1,6 @@ LEVEL = ../.. PARALLEL_DIRS := CFP2000 CINT2000 CINT95 -include $(LLVM_OBJ_ROOT)/Makefile.config +include $(LEVEL)/Makefile.config # # Remove SPEC95 and SPEC2000 per the user's configuration @@ -14,4 +14,4 @@ PARALLEL_DIRS := $(filter-out CINT95/, $(PARALLEL_DIRS)) endif -include $(LEVEL)/External/Makefile.external +include $(LEVEL)/Makefile.programs Index: llvm-test/External/SPEC/Makefile.spec diff -u llvm-test/External/SPEC/Makefile.spec:1.39 llvm-test/External/SPEC/Makefile.spec:1.40 --- llvm-test/External/SPEC/Makefile.spec:1.39 Mon Sep 6 18:46:05 2004 +++ llvm-test/External/SPEC/Makefile.spec Mon Sep 6 22:36:04 2004 @@ -5,8 +5,7 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.common -include $(LLVM_SRC_ROOT)/Makefile.rules +include $(LEVEL)/Makefile.config ## Information the test should have provided... ifndef STDOUT_FILENAME Index: llvm-test/External/SPEC/Makefile.spec2000 diff -u llvm-test/External/SPEC/Makefile.spec2000:1.5 llvm-test/External/SPEC/Makefile.spec2000:1.6 --- llvm-test/External/SPEC/Makefile.spec2000:1.5 Mon Sep 6 18:43:37 2004 +++ llvm-test/External/SPEC/Makefile.spec2000 Mon Sep 6 22:36:04 2004 @@ -4,7 +4,7 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.common +include $(LEVEL)/Makefile.config SPEC_ROOT := $(SPEC2000_ROOT) CPPFLAGS += -DSPEC_CPU2000 Index: llvm-test/External/SPEC/Makefile.spec95 diff -u llvm-test/External/SPEC/Makefile.spec95:1.9 llvm-test/External/SPEC/Makefile.spec95:1.10 --- llvm-test/External/SPEC/Makefile.spec95:1.9 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/Makefile.spec95 Mon Sep 6 22:36:04 2004 @@ -4,7 +4,7 @@ # ##===----------------------------------------------------------------------===## -#include $(LEVEL)/Makefile.config +include $(LEVEL)/Makefile.config SPEC_ROOT := $(SPEC95_ROOT) CPPFLAGS += -DSPEC_CPU95 From brukman at cs.uiuc.edu Mon Sep 6 22:37:20 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:37:20 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/Makefile Message-ID: <200409070337.WAA21630@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000: Makefile updated: 1.8 -> 1.9 --- Log message: Revert Makefile structure back to what it used to be, since Makefile.config is generated in top-level testing directory. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/Makefile diff -u llvm-test/External/SPEC/CFP2000/Makefile:1.8 llvm-test/External/SPEC/CFP2000/Makefile:1.9 --- llvm-test/External/SPEC/CFP2000/Makefile:1.8 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/CFP2000/Makefile Mon Sep 6 22:37:10 2004 @@ -5,4 +5,4 @@ 183.equake \ 188.ammp -include $(LEVEL)/External/Makefile.external +include $(LEVEL)/Makefile.programs From brukman at cs.uiuc.edu Mon Sep 6 22:37:45 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:37:45 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile Message-ID: <200409070337.WAA21710@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/177.mesa: Makefile updated: 1.6 -> 1.7 --- Log message: Use relative include for Makefile.spec2000 since we know where it is. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile diff -u llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.6 llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.7 --- llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.6 Mon Sep 6 18:22:12 2004 +++ llvm-test/External/SPEC/CFP2000/177.mesa/Makefile Mon Sep 6 22:37:34 2004 @@ -20,4 +20,4 @@ texstate.c texture.c triangle.c varray.c vb.c vbfill.c vbrender.c \ vbxform.c winpos.c xform.c mesa4.c) -include $(LEVEL)/External/SPEC/Makefile.spec2000 +include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 22:41:24 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:41:24 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/179.art/Makefile Message-ID: <200409070341.WAA22161@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/179.art: Makefile updated: 1.4 -> 1.5 --- Log message: Use relative include for Makefile.spec2000 since we know where it is. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/179.art/Makefile diff -u llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.4 llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.5 --- llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.4 Mon Sep 6 18:23:58 2004 +++ llvm-test/External/SPEC/CFP2000/179.art/Makefile Mon Sep 6 22:41:14 2004 @@ -10,4 +10,4 @@ STDOUT_FILENAME = $(RUN_TYPE).out CPPFLAGS = -include $(LEVEL)/External/SPEC/Makefile.spec2000 +include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 22:41:25 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:41:25 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/183.equake/Makefile Message-ID: <200409070341.WAA22167@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/183.equake: Makefile updated: 1.4 -> 1.5 --- Log message: Use relative include for Makefile.spec2000 since we know where it is. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/183.equake/Makefile diff -u llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.4 llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.5 --- llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.4 Mon Sep 6 18:23:59 2004 +++ llvm-test/External/SPEC/CFP2000/183.equake/Makefile Mon Sep 6 22:41:15 2004 @@ -5,4 +5,4 @@ STDOUT_FILENAME = inp.out CPPFLAGS = -include $(LEVEL)/External/SPEC/Makefile.spec2000 +include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 22:41:29 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 22:41:29 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile Message-ID: <200409070341.WAA22174@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CFP2000/188.ammp: Makefile updated: 1.5 -> 1.6 --- Log message: Use relative include for Makefile.spec2000 since we know where it is. --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile diff -u llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.5 llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.6 --- llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.5 Mon Sep 6 18:24:03 2004 +++ llvm-test/External/SPEC/CFP2000/188.ammp/Makefile Mon Sep 6 22:41:18 2004 @@ -14,4 +14,4 @@ endif endif -include $(LEVEL)/External/SPEC/Makefile.spec2000 +include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:04:05 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:04:05 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/Makefile Message-ID: <200409070404.XAA22486@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000: Makefile updated: 1.16 -> 1.17 --- Log message: Use Makefile.config now that it's available and Makefile.programs to be correct --- Diffs of the changes: (+2 -2) Index: llvm-test/External/SPEC/CINT2000/Makefile diff -u llvm-test/External/SPEC/CINT2000/Makefile:1.16 llvm-test/External/SPEC/CINT2000/Makefile:1.17 --- llvm-test/External/SPEC/CINT2000/Makefile:1.16 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/CINT2000/Makefile Mon Sep 6 23:03:55 2004 @@ -14,11 +14,11 @@ 300.twolf # Get the $(ARCH) setting -#include $(LEVEL)/Makefile.config +include $(LEVEL)/Makefile.config # Disable crafty until it stops infinite-looping on Sparc ifeq ($(ARCH), Sparc) PARALLEL_DIRS := $(filter-out 186.crafty, $(PARALLEL_DIRS)) endif -include ${LEVEL}/External/Makefile.external +include $(LEVEL)/Makefile.programs From brukman at cs.uiuc.edu Mon Sep 6 23:04:22 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:04:22 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/181.mcf/Makefile Message-ID: <200409070404.XAA22515@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/181.mcf: Makefile updated: 1.2 -> 1.3 --- Log message: Fix some formatting --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/181.mcf/Makefile diff -u llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.2 llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.3 --- llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.2 Wed Feb 25 18:01:20 2004 +++ llvm-test/External/SPEC/CINT2000/181.mcf/Makefile Mon Sep 6 23:04:11 2004 @@ -1,4 +1,4 @@ LEVEL = ../../../../../.. -RUN_OPTIONS := inp.in +RUN_OPTIONS := inp.in STDOUT_FILENAME := inp.out include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:04:23 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:04:23 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/186.crafty/Makefile Message-ID: <200409070404.XAA22560@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/186.crafty: Makefile updated: 1.5 -> 1.6 --- Log message: Fix some formatting --- Diffs of the changes: (+7 -1) Index: llvm-test/External/SPEC/CINT2000/186.crafty/Makefile diff -u llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.5 llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.6 --- llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.5 Wed Feb 25 18:01:20 2004 +++ llvm-test/External/SPEC/CINT2000/186.crafty/Makefile Mon Sep 6 23:04:12 2004 @@ -3,6 +3,12 @@ STDIN_FILENAME = crafty.in STDOUT_FILENAME = crafty.out CPPFLAGS = -DSPEC_CPU2000 -DLINUX_i386 -Source = $(addprefix $(SPEC_BENCH_DIR)/src/, attacks.c draw.c enprise.c init.c iterate.c make.c nexte.c output.c preeval.c resign.c searchr.c swap.c utility.c boolean.c drawn.c evaluate.c input.c lookup.c movgen.c nextr.c phase.c quiesce.c root.c setboard.c time.c validate.c edit.c history.c interupt.c main.c next.c option.c ponder.c repeat.c search.c store.c unmake.c valid.c) +Source = $(addprefix $(SPEC_BENCH_DIR)/src/, + attacks.c draw.c enprise.c init.c iterate.c make.c nexte.c output.c \ + preeval.c resign.c searchr.c swap.c utility.c boolean.c drawn.c \ + evaluate.c input.c lookup.c movgen.c nextr.c phase.c quiesce.c \ + root.c setboard.c time.c validate.c edit.c history.c interupt.c \ + main.c next.c option.c ponder.c repeat.c search.c store.c unmake.c \ + valid.c) include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:04:23 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:04:23 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile Message-ID: <200409070404.XAA22566@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/197.parser.hacked: Makefile updated: 1.2 -> 1.3 --- Log message: Fix some formatting --- Diffs of the changes: (+5 -3) Index: llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile diff -u llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.2 llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.3 --- llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.2 Fri Mar 5 14:38:55 2004 +++ llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile Mon Sep 6 23:04:13 2004 @@ -6,8 +6,10 @@ SPEC_BENCH_DIR := /home/vadve/shared/benchmarks/speccpu2000/benchspec/CINT2000/197.parser/ -Source = $(addprefix $(SPEC_BENCH_DIR)/src/, \ -analyze-linkage.c and.c build-disjuncts.c extract-links.c fast-match.c idiom.c main.c massage.c parse.c post-process.c print.c prune.c read-dict.c strncasecmp.c utilities.c word-file.c ) \ - xa.c +Source = $(addprefix $(SPEC_BENCH_DIR)/src/, \ + analyze-linkage.c and.c build-disjuncts.c extract-links.c \ + fast-match.c idiom.c main.c massage.c parse.c post-process.c \ + print.c prune.c read-dict.c strncasecmp.c utilities.c word-file.c) \ + xa.c include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:05:32 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:05:32 -0500 Subject: [llvm-commits] CVS: llvm-test/External/Povray/Makefile Message-ID: <200409070405.XAA24028@zion.cs.uiuc.edu> Changes in directory llvm-test/External/Povray: Makefile updated: 1.10 -> 1.11 --- Log message: Include Makefile.config now that we have it back --- Diffs of the changes: (+1 -1) Index: llvm-test/External/Povray/Makefile diff -u llvm-test/External/Povray/Makefile:1.10 llvm-test/External/Povray/Makefile:1.11 --- llvm-test/External/Povray/Makefile:1.10 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/Povray/Makefile Mon Sep 6 23:05:22 2004 @@ -1,6 +1,6 @@ LEVEL = ../.. -#include $(LEVEL)/Makefile.config +include $(LEVEL)/Makefile.config PROG = povray From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/099.go/Makefile Message-ID: <200409070418.XAA28058@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/099.go: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/099.go/Makefile diff -u llvm-test/External/SPEC/CINT95/099.go/Makefile:1.3 llvm-test/External/SPEC/CINT95/099.go/Makefile:1.4 --- llvm-test/External/SPEC/CINT95/099.go/Makefile:1.3 Sun Jun 20 12:29:30 2004 +++ llvm-test/External/SPEC/CINT95/099.go/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. BM=099.go ifeq ($(RUN_TYPE),test) From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/164.gzip/Makefile Message-ID: <200409070418.XAA28061@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/164.gzip: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/164.gzip/Makefile diff -u llvm-test/External/SPEC/CINT2000/164.gzip/Makefile:1.3 llvm-test/External/SPEC/CINT2000/164.gzip/Makefile:1.4 --- llvm-test/External/SPEC/CINT2000/164.gzip/Makefile:1.3 Fri Mar 5 14:49:34 2004 +++ llvm-test/External/SPEC/CINT2000/164.gzip/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = `cat $(REF_IN_DIR)control` ifeq ($(RUN_TYPE),test) STDOUT_FILENAME := input.compressed.out From brukman at cs.uiuc.edu Mon Sep 6 23:18:15 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:15 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile.spec2000 Message-ID: <200409070418.XAA28057@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC: Makefile.spec2000 updated: 1.6 -> 1.7 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+2 -2) Index: llvm-test/External/SPEC/Makefile.spec2000 diff -u llvm-test/External/SPEC/Makefile.spec2000:1.6 llvm-test/External/SPEC/Makefile.spec2000:1.7 --- llvm-test/External/SPEC/Makefile.spec2000:1.6 Mon Sep 6 22:36:04 2004 +++ llvm-test/External/SPEC/Makefile.spec2000 Mon Sep 6 23:18:02 2004 @@ -13,9 +13,9 @@ # individual tests may override this to provide better input sizes ifndef RUN_TYPE ifdef LARGE_PROBLEM_SIZE -RUN_TYPE := ref +RUN_TYPE := ref else -RUN_TYPE := train +RUN_TYPE := train endif endif From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile Message-ID: <200409070418.XAA28059@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/253.perlbmk: Makefile updated: 1.9 -> 1.10 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile diff -u llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.9 llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.10 --- llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.9 Sun Aug 15 01:15:10 2004 +++ llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. REQUIRES_EH_SUPPORT = 1 CPPFLAGS = -DSPEC_CPU2000_LINUX -Dbool=char -DI_TIME -DI_SYS_TIME From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/130.li/Makefile Message-ID: <200409070418.XAA28060@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/130.li: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/130.li/Makefile diff -u llvm-test/External/SPEC/CINT95/130.li/Makefile:1.3 llvm-test/External/SPEC/CINT95/130.li/Makefile:1.4 --- llvm-test/External/SPEC/CINT95/130.li/Makefile:1.3 Fri Mar 5 22:05:47 2004 +++ llvm-test/External/SPEC/CINT95/130.li/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. include ../../Makefile.spec95 REQUIRES_EH_SUPPORT = 1 STDIN_FILENAME := $(RUN_TYPE).lsp From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile Message-ID: <200409070418.XAA28063@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/197.parser.hacked: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile diff -u llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.3 llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.4 --- llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile:1.3 Mon Sep 6 23:04:13 2004 +++ llvm-test/External/SPEC/CINT2000/197.parser.hacked/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = 2.1.dict -batch STDIN_FILENAME = $(RUN_TYPE).in STDOUT_FILENAME = $(RUN_TYPE).out From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/Makefile Message-ID: <200409070418.XAA28065@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000: Makefile updated: 1.17 -> 1.18 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/Makefile diff -u llvm-test/External/SPEC/CINT2000/Makefile:1.17 llvm-test/External/SPEC/CINT2000/Makefile:1.18 --- llvm-test/External/SPEC/CINT2000/Makefile:1.17 Mon Sep 6 23:03:55 2004 +++ llvm-test/External/SPEC/CINT2000/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../.. PARALLEL_DIRS := \ 164.gzip \ 175.vpr \ From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/197.parser/Makefile Message-ID: <200409070418.XAA28069@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/197.parser: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/197.parser/Makefile diff -u llvm-test/External/SPEC/CINT2000/197.parser/Makefile:1.3 llvm-test/External/SPEC/CINT2000/197.parser/Makefile:1.4 --- llvm-test/External/SPEC/CINT2000/197.parser/Makefile:1.3 Wed Feb 25 18:01:20 2004 +++ llvm-test/External/SPEC/CINT2000/197.parser/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = 2.1.dict -batch STDIN_FILENAME = $(RUN_TYPE).in STDOUT_FILENAME = $(RUN_TYPE).out From brukman at cs.uiuc.edu Mon Sep 6 23:18:16 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/255.vortex/Makefile Message-ID: <200409070418.XAA28062@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/255.vortex: Makefile updated: 1.7 -> 1.8 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/255.vortex/Makefile diff -u llvm-test/External/SPEC/CINT2000/255.vortex/Makefile:1.7 llvm-test/External/SPEC/CINT2000/255.vortex/Makefile:1.8 --- llvm-test/External/SPEC/CINT2000/255.vortex/Makefile:1.7 Sun Aug 15 01:10:54 2004 +++ llvm-test/External/SPEC/CINT2000/255.vortex/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. #STDOUT_FILENAME := input.random.out include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile Message-ID: <200409070418.XAA28073@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/132.ijpeg: Makefile updated: 1.5 -> 1.6 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile diff -u llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile:1.5 llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile:1.6 --- llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile:1.5 Thu Aug 12 20:31:18 2004 +++ llvm-test/External/SPEC/CINT95/132.ijpeg/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. ifeq ($(RUN_TYPE),test) FILENAME := specmun else From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile Message-ID: <200409070418.XAA28086@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/124.m88ksim: Makefile updated: 1.5 -> 1.6 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile diff -u llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile:1.5 llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile:1.6 --- llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile:1.5 Tue Mar 9 04:39:31 2004 +++ llvm-test/External/SPEC/CINT95/124.m88ksim/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = -c ifeq ($(ENDIAN),big) From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/252.eon/Makefile Message-ID: <200409070418.XAA28072@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/252.eon: Makefile updated: 1.9 -> 1.10 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/252.eon/Makefile diff -u llvm-test/External/SPEC/CINT2000/252.eon/Makefile:1.9 llvm-test/External/SPEC/CINT2000/252.eon/Makefile:1.10 --- llvm-test/External/SPEC/CINT2000/252.eon/Makefile:1.9 Fri Jul 30 18:00:27 2004 +++ llvm-test/External/SPEC/CINT2000/252.eon/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook STDOUT_FILENAME = cook_log.out STDERR_FILENAME = cook_log.err From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/176.gcc/Makefile Message-ID: <200409070418.XAA28064@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/176.gcc: Makefile updated: 1.10 -> 1.11 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/176.gcc/Makefile diff -u llvm-test/External/SPEC/CINT2000/176.gcc/Makefile:1.10 llvm-test/External/SPEC/CINT2000/176.gcc/Makefile:1.11 --- llvm-test/External/SPEC/CINT2000/176.gcc/Makefile:1.10 Sun Aug 15 01:17:25 2004 +++ llvm-test/External/SPEC/CINT2000/176.gcc/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. ifeq ($(RUN_TYPE),test) RUN_OPTIONS = cccp.i -o - -quiet From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/300.twolf/Makefile Message-ID: <200409070418.XAA28088@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/300.twolf: Makefile updated: 1.5 -> 1.6 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/300.twolf/Makefile diff -u llvm-test/External/SPEC/CINT2000/300.twolf/Makefile:1.5 llvm-test/External/SPEC/CINT2000/300.twolf/Makefile:1.6 --- llvm-test/External/SPEC/CINT2000/300.twolf/Makefile:1.5 Sun Apr 18 14:09:32 2004 +++ llvm-test/External/SPEC/CINT2000/300.twolf/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. LDFLAGS = -lm RUN_OPTIONS = $(RUN_TYPE) STDOUT_FILENAME = $(RUN_TYPE).stdout From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/129.compress/Makefile Message-ID: <200409070418.XAA28090@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/129.compress: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/129.compress/Makefile diff -u llvm-test/External/SPEC/CINT95/129.compress/Makefile:1.3 llvm-test/External/SPEC/CINT95/129.compress/Makefile:1.4 --- llvm-test/External/SPEC/CINT95/129.compress/Makefile:1.3 Sat Feb 28 13:15:57 2004 +++ llvm-test/External/SPEC/CINT95/129.compress/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. STDOUT_FILENAME := test.out include ../../Makefile.spec95 From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/Makefile Message-ID: <200409070418.XAA28099@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95: Makefile updated: 1.6 -> 1.7 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/Makefile diff -u llvm-test/External/SPEC/CINT95/Makefile:1.6 llvm-test/External/SPEC/CINT95/Makefile:1.7 --- llvm-test/External/SPEC/CINT95/Makefile:1.6 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/CINT95/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../.. +LEVEL = ../../.. PARALLEL_DIRS := \ 099.go \ 124.m88ksim \ From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/126.gcc/Makefile Message-ID: <200409070418.XAA28100@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/126.gcc: Makefile updated: 1.5 -> 1.6 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/126.gcc/Makefile diff -u llvm-test/External/SPEC/CINT95/126.gcc/Makefile:1.5 llvm-test/External/SPEC/CINT95/126.gcc/Makefile:1.6 --- llvm-test/External/SPEC/CINT95/126.gcc/Makefile:1.5 Sun Feb 29 18:58:32 2004 +++ llvm-test/External/SPEC/CINT95/126.gcc/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. CPPFLAGS += -DSPEC -idirafter $(SPEC95_ROOT)/CINT95/126.gcc/src/src.alt RUN_OPTIONS := -quiet -funroll-loops -fforce-mem -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fstrength-reduce -fpeephole -fschedule-insns -finline-functions -fschedule-insns2 -O -o - From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/147.vortex/Makefile Message-ID: <200409070418.XAA28075@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/147.vortex: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/147.vortex/Makefile diff -u llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.3 llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.4 --- llvm-test/External/SPEC/CINT95/147.vortex/Makefile:1.3 Mon Sep 6 03:36:37 2004 +++ llvm-test/External/SPEC/CINT95/147.vortex/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. #include $(LEVEL)/Makefile.config From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile Message-ID: <200409070418.XAA28114@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/256.bzip2: Makefile updated: 1.4 -> 1.5 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile diff -u llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile:1.4 llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile:1.5 --- llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile:1.4 Sun Apr 18 20:06:05 2004 +++ llvm-test/External/SPEC/CINT2000/256.bzip2/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = `cat $(REF_IN_DIR)control` ifeq ($(RUN_TYPE),test) From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/181.mcf/Makefile Message-ID: <200409070418.XAA28091@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/181.mcf: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/181.mcf/Makefile diff -u llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.3 llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.4 --- llvm-test/External/SPEC/CINT2000/181.mcf/Makefile:1.3 Mon Sep 6 23:04:11 2004 +++ llvm-test/External/SPEC/CINT2000/181.mcf/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS := inp.in STDOUT_FILENAME := inp.out include ../../Makefile.spec2000 From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/186.crafty/Makefile Message-ID: <200409070418.XAA28098@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/186.crafty: Makefile updated: 1.6 -> 1.7 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/186.crafty/Makefile diff -u llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.6 llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.7 --- llvm-test/External/SPEC/CINT2000/186.crafty/Makefile:1.6 Mon Sep 6 23:04:12 2004 +++ llvm-test/External/SPEC/CINT2000/186.crafty/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. #RUN_OPTIONS = STDIN_FILENAME = crafty.in STDOUT_FILENAME = crafty.out From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/254.gap/Makefile Message-ID: <200409070418.XAA28087@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/254.gap: Makefile updated: 1.5 -> 1.6 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/254.gap/Makefile diff -u llvm-test/External/SPEC/CINT2000/254.gap/Makefile:1.5 llvm-test/External/SPEC/CINT2000/254.gap/Makefile:1.6 --- llvm-test/External/SPEC/CINT2000/254.gap/Makefile:1.5 Fri Jul 30 17:01:52 2004 +++ llvm-test/External/SPEC/CINT2000/254.gap/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS = -l ./ -q -m 64M STDOUT_FILENAME = $(RUN_TYPE).out STDIN_FILENAME = $(RUN_TYPE).in From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/175.vpr/Makefile Message-ID: <200409070418.XAA28089@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT2000/175.vpr: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT2000/175.vpr/Makefile diff -u llvm-test/External/SPEC/CINT2000/175.vpr/Makefile:1.3 llvm-test/External/SPEC/CINT2000/175.vpr/Makefile:1.4 --- llvm-test/External/SPEC/CINT2000/175.vpr/Makefile:1.3 Wed Feb 25 18:01:20 2004 +++ llvm-test/External/SPEC/CINT2000/175.vpr/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. LDFLAGS = -lm RUN_OPTIONS = net.in arch.in place.out dum.out -nodisp -place_only -init_t 5 -exit_t 0.005 -alpha_t 0.9412 -inner_num 2 STDOUT_FILENAME := place_log.out From brukman at cs.uiuc.edu Mon Sep 6 23:18:17 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:18:17 -0500 Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CINT95/134.perl/Makefile Message-ID: <200409070418.XAA28113@zion.cs.uiuc.edu> Changes in directory llvm-test/External/SPEC/CINT95/134.perl: Makefile updated: 1.3 -> 1.4 --- Log message: Fix LEVEL as test/Programs is now top-level llvm-test --- Diffs of the changes: (+1 -1) Index: llvm-test/External/SPEC/CINT95/134.perl/Makefile diff -u llvm-test/External/SPEC/CINT95/134.perl/Makefile:1.3 llvm-test/External/SPEC/CINT95/134.perl/Makefile:1.4 --- llvm-test/External/SPEC/CINT95/134.perl/Makefile:1.3 Fri Feb 20 11:48:43 2004 +++ llvm-test/External/SPEC/CINT95/134.perl/Makefile Mon Sep 6 23:18:02 2004 @@ -1,4 +1,4 @@ -LEVEL = ../../../../../.. +LEVEL = ../../../.. RUN_OPTIONS := primes.pl STDIN_FILENAME := primes.in STDOUT_FILENAME := primes.out From brukman at cs.uiuc.edu Mon Sep 6 23:20:06 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:20:06 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Message-ID: <200409070420.XAA28568@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.3 -> 1.4 --- Log message: Regenerated configure script with Makefile changes. --- Diffs of the changes: (+538 -1137) Index: llvm-test/configure diff -u llvm-test/configure:1.3 llvm-test/configure:1.4 --- llvm-test/configure:1.3 Mon Sep 6 03:34:28 2004 +++ llvm-test/configure Mon Sep 6 23:19:55 2004 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for LLVM-TEST 1.4. +# Generated by GNU Autoconf 2.57 for LLVM-TEST 1.4. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -21,10 +22,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,17 +220,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -427,7 +426,7 @@ PACKAGE_STRING='LLVM-TEST 1.4' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' -ac_unique_file=""Makefile.common.in"" +ac_unique_file=""Makefile.config.in"" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -824,7 +823,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -864,10 +863,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -979,9 +978,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1099,45 +1098,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1148,7 +1114,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1162,9 +1128,10 @@ if $ac_init_version; then cat <<\_ACEOF LLVM-TEST configure 1.4 -generated by GNU Autoconf 2.59 +generated by GNU Autoconf 2.57 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1176,7 +1143,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1253,19 +1220,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1299,12 +1266,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1333,7 +1300,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1352,7 +1319,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && + rm -f core core.* *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1432,7 +1399,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1449,13 +1416,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1543,22 +1510,52 @@ ac_config_commands="$ac_config_commands Makefile" - ac_config_commands="$ac_config_commands Makefile.tests" + ac_config_commands="$ac_config_commands Makefile.common" ac_config_commands="$ac_config_commands Makefile.programs" - ac_config_commands="$ac_config_commands SingleSource/Makefile" + ac_config_commands="$ac_config_commands Makefile.tests" - ac_config_commands="$ac_config_commands SingleSource/Makefile.singlesrc" + ac_config_commands="$ac_config_commands TEST.aa.Makefile" - ac_config_commands="$ac_config_commands MultiSource/Makefile" + ac_config_commands="$ac_config_commands TEST.dsgraph.report" - ac_config_commands="$ac_config_commands MultiSource/Makefile.multisrc" + ac_config_commands="$ac_config_commands TEST.aa.report" + + + ac_config_commands="$ac_config_commands TEST.example.Makefile" + + + ac_config_commands="$ac_config_commands TEST.nightly.Makefile" + + + ac_config_commands="$ac_config_commands TEST.buildrepo.Makefile" + + + ac_config_commands="$ac_config_commands TEST.jit.Makefile" + + + ac_config_commands="$ac_config_commands TEST.nightly.report" + + + ac_config_commands="$ac_config_commands TEST.dsgraph.Makefile" + + + ac_config_commands="$ac_config_commands TEST.jit.report" + + + ac_config_commands="$ac_config_commands TEST.typesafe.Makefile" + + + ac_config_commands="$ac_config_commands TEST.dsgraph.gnuplot" + + + ac_config_commands="$ac_config_commands TEST.vtl.Makefile" ac_config_commands="$ac_config_commands External/Makefile" @@ -1591,6 +1588,18 @@ ac_config_commands="$ac_config_commands External/SPEC/CINT95/Makefile" + ac_config_commands="$ac_config_commands MultiSource/Makefile" + + + ac_config_commands="$ac_config_commands MultiSource/Makefile.multisrc" + + + ac_config_commands="$ac_config_commands SingleSource/Makefile" + + + ac_config_commands="$ac_config_commands SingleSource/Makefile.singlesrc" + + @@ -1730,6 +1739,7 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1749,8 +1759,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 +echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -1770,23 +1780,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -1860,8 +1870,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -1886,6 +1896,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1936,6 +1947,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1955,21 +1967,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1982,7 +1984,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -1998,6 +2000,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2014,21 +2017,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2041,7 +2034,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2061,7 +2054,8 @@ fi fi for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2069,13 +2063,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2086,21 +2081,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2113,8 +2098,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2131,21 +2117,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2157,7 +2133,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2296,6 +2272,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2315,21 +2292,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2342,7 +2309,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2358,6 +2325,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2374,21 +2342,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2401,7 +2359,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2428,6 +2386,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2455,16 +2414,6 @@ va_end (v); return s; } - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2491,21 +2440,11 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2518,7 +2457,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext +rm -f conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2546,28 +2485,19 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2575,13 +2505,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2592,21 +2523,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2619,8 +2540,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2637,21 +2559,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2663,7 +2575,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2677,7 +2589,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2712,6 +2624,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2722,7 +2635,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2734,7 +2647,6 @@ (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 @@ -2755,6 +2667,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2772,7 +2685,6 @@ (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 @@ -2819,6 +2731,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2829,7 +2742,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2841,7 +2754,6 @@ (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 @@ -2862,6 +2774,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2879,7 +2792,6 @@ (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 @@ -3017,6 +2929,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3040,21 +2953,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3067,8 +2970,7 @@ ac_cv_lib_fl_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3084,6 +2986,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3107,21 +3010,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3134,8 +3027,7 @@ ac_cv_lib_l_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3197,21 +3089,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3223,8 +3105,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS rm -f "${LEX_OUTPUT_ROOT}.c" @@ -3933,7 +3814,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3936 "configure"' > conftest.$ac_ext + echo '#line 3817 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4030,6 +3911,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4046,21 +3928,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4073,8 +3945,7 @@ lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4102,6 +3973,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4122,21 +3994,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4149,11 +4011,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4175,6 +4038,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4199,6 +4063,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4210,9 +4075,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -4223,7 +4088,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -4248,7 +4113,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4273,7 +4138,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -4282,6 +4147,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4293,21 +4159,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4320,7 +4176,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4351,6 +4207,7 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4361,21 +4218,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4388,7 +4235,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -4396,6 +4243,7 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4413,7 +4261,6 @@ (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 @@ -4433,32 +4280,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4469,7 +4317,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + eval "$as_ac_Header=$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4508,6 +4356,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4518,7 +4367,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4530,7 +4379,6 @@ (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 @@ -4551,6 +4399,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4568,7 +4417,6 @@ (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 @@ -4615,6 +4463,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4625,7 +4474,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4637,7 +4486,6 @@ (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 @@ -4658,6 +4506,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4675,7 +4524,6 @@ (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 @@ -4720,7 +4568,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 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4762,7 +4610,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4807,7 +4655,7 @@ # Provide some information about the compiler. -echo "$as_me:4810:" \ +echo "$as_me:4658:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -4825,10 +4673,9 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) +# input file. ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -4846,21 +4693,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4873,13 +4710,14 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext +G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -4896,21 +4734,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4923,7 +4751,7 @@ ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -4931,20 +4759,18 @@ if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-O2" else FFLAGS= fi fi - -G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5810,10 +5636,6 @@ -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag= @@ -5838,11 +5660,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5841: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5845: \$? = $ac_status" >&5 + echo "$as_me:5667: \$? = $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 @@ -6070,11 +5892,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6073: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5895: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6077: \$? = $ac_status" >&5 + echo "$as_me:5899: \$? = $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 @@ -6137,11 +5959,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5962: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6144: \$? = $ac_status" >&5 + echo "$as_me:5966: \$? = $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 @@ -6477,6 +6299,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6493,21 +6316,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6524,8 +6337,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6538,6 +6350,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6554,21 +6367,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6585,8 +6388,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -7685,6 +7487,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7708,21 +7511,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7735,8 +7528,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -7760,28 +7552,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7812,21 +7597,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7839,8 +7614,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -7855,6 +7629,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7878,21 +7653,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7905,8 +7670,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -7920,28 +7684,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7972,21 +7729,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7999,8 +7746,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -8015,6 +7761,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8038,21 +7785,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8065,8 +7802,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -8082,6 +7818,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8105,21 +7842,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8132,8 +7859,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -8149,6 +7875,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8172,21 +7899,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8199,8 +7916,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -8255,7 +7971,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9405,21 +9122,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9436,8 +9143,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9451,6 +9157,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9467,21 +9174,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9498,8 +9195,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -10118,10 +9814,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... cat > conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10204: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10516: \$? = $ac_status" >&5 + echo "$as_me:10208: \$? = $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 @@ -10576,11 +10268,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10579: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10271: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10583: \$? = $ac_status" >&5 + echo "$as_me:10275: \$? = $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 @@ -11335,6 +11027,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11358,21 +11051,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11385,8 +11068,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11410,28 +11092,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include -#endif - -#undef shl_load - +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11462,21 +11137,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11489,8 +11154,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -11505,6 +11169,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11528,21 +11193,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11555,8 +11210,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -11570,28 +11224,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11622,21 +11269,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11649,8 +11286,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -11665,6 +11301,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11688,21 +11325,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11715,8 +11342,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11732,6 +11358,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11755,21 +11382,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11782,8 +11399,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -11799,6 +11415,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11822,21 +11439,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11849,8 +11456,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -11905,7 +11511,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12434: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12832: \$? = $ac_status" >&5 + echo "$as_me:12438: \$? = $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 @@ -12892,11 +12498,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12895: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12501: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12899: \$? = $ac_status" >&5 + echo "$as_me:12505: \$? = $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 @@ -13238,21 +12844,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13269,8 +12865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13289,21 +12884,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13320,8 +12905,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -14830,10 +14414,6 @@ # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= @@ -14858,11 +14438,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14861: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14441: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14865: \$? = $ac_status" >&5 + echo "$as_me:14445: \$? = $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 @@ -15090,11 +14670,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15093: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14673: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15097: \$? = $ac_status" >&5 + echo "$as_me:14677: \$? = $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 @@ -15157,11 +14737,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15160: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14740: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15164: \$? = $ac_status" >&5 + echo "$as_me:14744: \$? = $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 @@ -15497,6 +15077,7 @@ allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15513,21 +15094,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15544,8 +15115,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15558,6 +15128,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15574,21 +15145,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15605,8 +15166,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -16705,6 +16265,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16728,21 +16289,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16755,8 +16306,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -16780,28 +16330,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -16832,21 +16375,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16859,8 +16392,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -16875,6 +16407,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16898,21 +16431,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16925,8 +16448,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -16940,28 +16462,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -16992,21 +16507,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17019,8 +16524,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -17035,6 +16539,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17058,21 +16563,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17085,8 +16580,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -17102,6 +16596,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17125,21 +16620,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17152,8 +16637,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -17169,6 +16653,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17192,21 +16677,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17219,8 +16694,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -17275,7 +16749,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18470,21 +17945,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18497,11 +17962,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18523,6 +17989,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18547,6 +18014,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18558,9 +18026,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -18571,7 +18039,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -18596,7 +18064,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -18616,6 +18084,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18642,21 +18111,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18669,7 +18128,7 @@ ac_cv_header_sys_wait_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 @@ -18700,21 +18159,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18727,8 +18176,7 @@ ac_cv_link_use_r=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -18749,6 +18197,9 @@ + + + # Check whether --enable-spec95 or --disable-spec95 was given. if test "${enable_spec95+set}" = set; then enableval="$enable_spec95" @@ -18761,11 +18212,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/spec95/benchspec - if test -d "$defaultdir" - then - SPEC95_ROOT=$defaultdir + if test -d "$defaultdir" + then + SPEC95_ROOT=$defaultdir - USE_SPEC95=USE_SPEC95=1 + USE_SPEC95=USE_SPEC95=1 checkresult="yes, found in $defaultdir" else @@ -18808,11 +18259,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/speccpu2000/benchspec - if test -d "$defaultdir" - then - SPEC2000_ROOT=$defaultdir + if test -d "$defaultdir" + then + SPEC2000_ROOT=$defaultdir - USE_SPEC2000=USE_SPEC2000=1 + USE_SPEC2000=USE_SPEC2000=1 checkresult="yes, found in $defaultdir" else @@ -18855,11 +18306,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/povray31 - if test -d "$defaultdir" - then - POVRAY_ROOT=$defaultdir + if test -d "$defaultdir" + then + POVRAY_ROOT=$defaultdir - USE_POVRAY=USE_POVRAY=1 + USE_POVRAY=USE_POVRAY=1 checkresult="yes, found in $defaultdir" else @@ -18928,7 +18379,7 @@ fi; - ac_config_files="$ac_config_files Makefile.common" + ac_config_files="$ac_config_files Makefile.config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18957,13 +18408,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -18993,13 +18444,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -19013,13 +18464,13 @@ cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -19041,7 +18492,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -19085,10 +18536,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -19107,7 +18557,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -19286,17 +18736,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -19323,7 +18772,7 @@ cat >&5 <<_CSEOF This file was extended by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -19367,7 +18816,7 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -19381,10 +18830,11 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ LLVM-TEST config.status 1.4 -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -19479,12 +18929,22 @@ # ${srcdir}/autoconf/mkinstalldirs `dirname Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname Makefile.tests` +${srcdir}/autoconf/mkinstalldirs `dirname Makefile.common` ${srcdir}/autoconf/mkinstalldirs `dirname Makefile.programs` -${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile.singlesrc` -${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile` -${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile.multisrc` +${srcdir}/autoconf/mkinstalldirs `dirname Makefile.tests` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.aa.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.dsgraph.report` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.aa.report` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.example.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.nightly.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.buildrepo.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.jit.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.nightly.report` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.dsgraph.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.jit.report` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.typesafe.Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.dsgraph.gnuplot` +${srcdir}/autoconf/mkinstalldirs `dirname TEST.vtl.Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname External/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname External/Makefile.external` ${srcdir}/autoconf/mkinstalldirs `dirname External/Povray/Makefile` @@ -19495,6 +18955,10 @@ ${srcdir}/autoconf/mkinstalldirs `dirname External/SPEC/CFP2000/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname External/SPEC/CINT2000/Makefile` ${srcdir}/autoconf/mkinstalldirs `dirname External/SPEC/CINT95/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile.multisrc` +${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile` +${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile.singlesrc` _ACEOF @@ -19505,14 +18969,24 @@ do case "$ac_config_target" in # Handling of arguments. - "Makefile.common" ) CONFIG_FILES="$CONFIG_FILES Makefile.common" ;; + "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;; "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; - "Makefile.tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.tests" ;; + "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;; "Makefile.programs" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.programs" ;; - "SingleSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile" ;; - "SingleSource/Makefile.singlesrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile.singlesrc" ;; - "MultiSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile" ;; - "MultiSource/Makefile.multisrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile.multisrc" ;; + "Makefile.tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.tests" ;; + "TEST.aa.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.aa.Makefile" ;; + "TEST.dsgraph.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.dsgraph.report" ;; + "TEST.aa.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.aa.report" ;; + "TEST.example.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.example.Makefile" ;; + "TEST.nightly.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.nightly.Makefile" ;; + "TEST.buildrepo.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.buildrepo.Makefile" ;; + "TEST.jit.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.jit.Makefile" ;; + "TEST.nightly.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.nightly.report" ;; + "TEST.dsgraph.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.dsgraph.Makefile" ;; + "TEST.jit.report" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.jit.report" ;; + "TEST.typesafe.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.typesafe.Makefile" ;; + "TEST.dsgraph.gnuplot" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.dsgraph.gnuplot" ;; + "TEST.vtl.Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS TEST.vtl.Makefile" ;; "External/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/Makefile" ;; "External/Makefile.external" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/Makefile.external" ;; "External/Povray/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/Povray/Makefile" ;; @@ -19523,6 +18997,10 @@ "External/SPEC/CFP2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/SPEC/CFP2000/Makefile" ;; "External/SPEC/CINT2000/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/SPEC/CINT2000/Makefile" ;; "External/SPEC/CINT95/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/SPEC/CINT95/Makefile" ;; + "MultiSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile" ;; + "MultiSource/Makefile.multisrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile.multisrc" ;; + "SingleSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile" ;; + "SingleSource/Makefile.singlesrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile.singlesrc" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -19689,9 +19167,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -19709,21 +19187,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19739,10 +19217,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19780,45 +19258,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -19836,7 +19281,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -19845,24 +19290,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -19903,41 +19348,16 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. if test "$ac_dir" != .; then @@ -19963,57 +19383,34 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile Makefile ;; - Makefile.tests ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.tests Makefile.tests ;; + Makefile.common ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.common Makefile.common ;; Makefile.programs ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.programs Makefile.programs ;; - SingleSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile SingleSource/Makefile ;; - SingleSource/Makefile.singlesrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile.singlesrc SingleSource/Makefile.singlesrc ;; - MultiSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile MultiSource/Makefile ;; - MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile.multisrc MultiSource/Makefile.multisrc ;; + Makefile.tests ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.tests Makefile.tests ;; + TEST.aa.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.aa.Makefile TEST.aa.Makefile ;; + TEST.dsgraph.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.dsgraph.report TEST.dsgraph.report ;; + TEST.aa.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.aa.report TEST.aa.report ;; + TEST.example.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.example.Makefile TEST.example.Makefile ;; + TEST.nightly.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.nightly.Makefile TEST.nightly.Makefile ;; + TEST.buildrepo.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.buildrepo.Makefile TEST.buildrepo.Makefile ;; + TEST.jit.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.jit.Makefile TEST.jit.Makefile ;; + TEST.nightly.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.nightly.report TEST.nightly.report ;; + TEST.dsgraph.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.dsgraph.Makefile TEST.dsgraph.Makefile ;; + TEST.jit.report ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.jit.report TEST.jit.report ;; + TEST.typesafe.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.typesafe.Makefile TEST.typesafe.Makefile ;; + TEST.dsgraph.gnuplot ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.dsgraph.gnuplot TEST.dsgraph.gnuplot ;; + TEST.vtl.Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/TEST.vtl.Makefile TEST.vtl.Makefile ;; External/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Makefile External/Makefile ;; External/Makefile.external ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Makefile.external External/Makefile.external ;; External/Povray/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Povray/Makefile External/Povray/Makefile ;; @@ -20024,6 +19421,10 @@ External/SPEC/CFP2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CFP2000/Makefile External/SPEC/CFP2000/Makefile ;; External/SPEC/CINT2000/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CINT2000/Makefile External/SPEC/CINT2000/Makefile ;; External/SPEC/CINT95/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/SPEC/CINT95/Makefile External/SPEC/CINT95/Makefile ;; + MultiSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile MultiSource/Makefile ;; + MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile.multisrc MultiSource/Makefile.multisrc ;; + SingleSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile SingleSource/Makefile ;; + SingleSource/Makefile.singlesrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile.singlesrc SingleSource/Makefile.singlesrc ;; esac done _ACEOF From brukman at cs.uiuc.edu Mon Sep 6 23:52:01 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:52:01 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409070452.XAA05916@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.9 -> 1.10 --- Log message: Our website tables don't need borders. --- Diffs of the changes: (+3 -0) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.9 llvm-www/llvm.css:1.10 --- llvm-www/llvm.css:1.9 Mon Jun 21 13:13:56 2004 +++ llvm-www/llvm.css Mon Sep 6 23:51:49 2004 @@ -11,6 +11,9 @@ @import url("docs/llvm.css"); +/* We don't need borders on website tables */ +table, tr, th, td { border: none } + /* Main website */ .www_title { font-family: "Georgia,Palatino,Times,Roman"; font-size: 33pt; From brukman at cs.uiuc.edu Mon Sep 6 23:54:30 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:54:30 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409070454.XAA09923@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.10 -> 1.11 --- Log message: Website needs text to be left-aligned. --- Diffs of the changes: (+1 -1) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.10 llvm-www/llvm.css:1.11 --- llvm-www/llvm.css:1.10 Mon Sep 6 23:51:49 2004 +++ llvm-www/llvm.css Mon Sep 6 23:54:20 2004 @@ -12,7 +12,7 @@ @import url("docs/llvm.css"); /* We don't need borders on website tables */ -table, tr, th, td { border: none } +table, tr, th, td { border: none; text-align: left } /* Main website */ .www_title { font-family: "Georgia,Palatino,Times,Roman"; From brukman at cs.uiuc.edu Mon Sep 6 23:57:07 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Mon, 6 Sep 2004 23:57:07 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409070457.XAA10098@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.11 -> 1.12 --- Log message: Reset table margin properties to be the default for the website. --- Diffs of the changes: (+9 -2) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.11 llvm-www/llvm.css:1.12 --- llvm-www/llvm.css:1.11 Mon Sep 6 23:54:20 2004 +++ llvm-www/llvm.css Mon Sep 6 23:56:57 2004 @@ -11,8 +11,15 @@ @import url("docs/llvm.css"); -/* We don't need borders on website tables */ -table, tr, th, td { border: none; text-align: left } +/* Reset table properties to default for the website */ +table { text-align: left; border-collapse: default; margin: default } +table, tr, th, td { border: none } + +TR, TD { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; } +TH { border: 2px solid gray; font-weight: bold; font-size: 105%; } +TABLE { text-align: center; border: 2px solid black; + border-collapse: collapse; margin-top: 1em; margin-left: 1em; + margin-right: 1em; margin-bottom: 1em; } /* Main website */ .www_title { font-family: "Georgia,Palatino,Times,Roman"; From brukman at cs.uiuc.edu Tue Sep 7 00:07:38 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:07:38 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409070507.AAA10343@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.12 -> 1.13 --- Log message: Remove dependence on llvm/docs/llvm.css --- Diffs of the changes: (+18 -21) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.12 llvm-www/llvm.css:1.13 --- llvm-www/llvm.css:1.12 Mon Sep 6 23:56:57 2004 +++ llvm-www/llvm.css Tue Sep 7 00:07:28 2004 @@ -1,26 +1,7 @@ /* - * WHEREAS, we ship source code with the docs/ directory, we need to provide - * users with a style sheet in that directory so that the files they download - * look like the ones they see online; - * - * WHEREAS, it is quite silly to maintain two identical stylesheets in CVS; - * - * BE IT RESOLVED THAT we shall maintain one, and the other one will slurp the - * content. + * LLVM website style sheet */ - at import url("docs/llvm.css"); - -/* Reset table properties to default for the website */ -table { text-align: left; border-collapse: default; margin: default } -table, tr, th, td { border: none } - -TR, TD { border: 2px solid gray; padding: 4pt 4pt 2pt 2pt; } -TH { border: 2px solid gray; font-weight: bold; font-size: 105%; } -TABLE { text-align: center; border: 2px solid black; - border-collapse: collapse; margin-top: 1em; margin-left: 1em; - margin-right: 1em; margin-bottom: 1em; } - /* Main website */ .www_title { font-family: "Georgia,Palatino,Times,Roman"; font-size: 33pt; @@ -35,7 +16,7 @@ background: url("img/lines.gif"); border: 2px solid #cccccc } -.www_sectiontitle { +.www_sectiontitle, .www_subsection { border-width: 1px; border-style: solid none solid none; text-align: center; @@ -47,6 +28,22 @@ width: 100%; margin-bottom: 0.3em; } +.www_subsection { width: 75%; + text-align: left; font-size: 12pt; padding: 4pt 4pt 4pt 4pt; + margin: 1.5em 0.5em 0.5em 0.5em } + +.www_subsubsection { margin: 2.0em 0.5em 0.5em 0.5em; + font-weight: bold; font-style: oblique; + border-bottom: 1px solid #999999; font-size: 12pt; + width: 75%; } + + +.www_code { border: solid 1px gray; background: #eeeeee; + margin: 0 1em 0 1em; + padding: 0 1em 0 1em; + display:table; } + + /* Publications */ .pub_title { font-family: "Georgia,Palatino,Times,Roman"; font-size: 24pt; From brukman at cs.uiuc.edu Tue Sep 7 00:08:02 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:08:02 -0500 Subject: [llvm-commits] CVS: llvm-www/Documentation.html www-index.html Message-ID: <200409070508.AAA10573@zion.cs.uiuc.edu> Changes in directory llvm-www: Documentation.html updated: 1.15 -> 1.16 www-index.html updated: 1.112 -> 1.113 --- Log message: Use the www_* styles instead of the doc_* styles --- Diffs of the changes: (+2 -2) Index: llvm-www/Documentation.html diff -u llvm-www/Documentation.html:1.15 llvm-www/Documentation.html:1.16 --- llvm-www/Documentation.html:1.15 Mon Aug 2 16:42:12 2004 +++ llvm-www/Documentation.html Tue Sep 7 00:07:52 2004 @@ -1,5 +1,5 @@ -
    Obsolete link
    +
    Obsolete link
    This link is obsolete. Please update your bookmarks to point here. Index: llvm-www/www-index.html diff -u llvm-www/www-index.html:1.112 llvm-www/www-index.html:1.113 --- llvm-www/www-index.html:1.112 Wed Aug 18 12:43:54 2004 +++ llvm-www/www-index.html Tue Sep 7 00:07:52 2004 @@ -126,7 +126,7 @@

    Here is a random application or feature of LLVM:

    -
    +
    From brukman at cs.uiuc.edu Tue Sep 7 00:08:03 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:08:03 -0500 Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html Message-ID: <200409070508.AAA10580@zion.cs.uiuc.edu> Changes in directory llvm-www/ProjectsWithLLVM: index.html updated: 1.16 -> 1.17 --- Log message: Use the www_* styles instead of the doc_* styles --- Diffs of the changes: (+27 -27) Index: llvm-www/ProjectsWithLLVM/index.html diff -u llvm-www/ProjectsWithLLVM/index.html:1.16 llvm-www/ProjectsWithLLVM/index.html:1.17 --- llvm-www/ProjectsWithLLVM/index.html:1.16 Tue Aug 17 11:59:28 2004 +++ llvm-www/ProjectsWithLLVM/index.html Tue Sep 7 00:07:53 2004 @@ -1,7 +1,7 @@
    Projects built with LLVM
    -
    +

    This page is an incomplete list of the projects built with LLVM, sorted in reverse chronological order. The idea of this list is to show some of the @@ -25,12 +25,12 @@

    -
    + -
    +
    -
    + -
    By: Tobias Nurmiranta
    +
    By: Tobias Nurmiranta
    -
    +

    This is a small scheme compiler for LLVM, written in scheme. It is good enough to compile itself @@ -72,20 +72,20 @@ -

    + -
    + -
    +

    The LLVM Visualization Tool (LLVM-TV) can be used to visualize the effects of transformations written in the LLVM framework. Our visualizations @@ -114,18 +114,18 @@

    -
    + -
    + -
    +

    Linear scan register allocation is a fast global register allocation first presented in Linear Scan Register Allocation as an alternative to the more widely used graph @@ -140,15 +140,15 @@

    -
    + -
    By: eXtensible Systems, Inc.
    +
    By: eXtensible Systems, Inc.
    -
    +

    The XPS project's purpose is to provide a comprehensive application programming platform that will make development of high-quality Internet-aware @@ -190,19 +190,19 @@

    -
    + -
    + -
    +

    "Traditional architectures use the hardware instruction set for dual purposes: first, as a language in which to express the semantics of software programs, and second, as a means for controlling the hardware. The thesis of @@ -237,17 +237,17 @@

    -
    + -
    +
    By: Brian Fahs
    -
    +

    "As every modern computer user has experienced, software updates and upgrades frequently require programs and sometimes the entire operating system to be restarted. This can be a painful and annoying experience. What if this @@ -268,19 +268,19 @@

    -
    + -
    +
    Tanya Brethour, Joel Stanley, Bill Wendling
    -
    +

    "In this report we present implementation details, empirical performance data, and notable modifications to an algorithm for PRE based on [the 1999 TOPLAS SSAPRE paper]. In [the 1999 TOPLAS SSAPRE paper], a particular @@ -296,7 +296,7 @@

    -
    + @@ -304,13 +304,13 @@ -
    + -
    +

    "We present the design and implementation of Jello, a retargetable Just-In-Time (JIT) compiler for the Intel IA32 architecture. The input to Jello is a C program statically compiled to Low-Level Virtual Machine (LLVM) bytecode. From brukman at cs.uiuc.edu Tue Sep 7 00:09:33 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:09:33 -0500 Subject: [llvm-commits] CVS: llvm/docs/llvm.css Message-ID: <200409070509.AAA10724@zion.cs.uiuc.edu> Changes in directory llvm/docs: llvm.css updated: 1.20 -> 1.21 --- Log message: This is the documentation style sheet, not the one for the website. --- Diffs of the changes: (+1 -1) Index: llvm/docs/llvm.css diff -u llvm/docs/llvm.css:1.20 llvm/docs/llvm.css:1.21 --- llvm/docs/llvm.css:1.20 Thu Aug 26 15:43:21 2004 +++ llvm/docs/llvm.css Tue Sep 7 00:09:22 2004 @@ -1,5 +1,5 @@ /* - * LLVM website style sheet + * LLVM documentation style sheet */ /* Common styles */ From brukman at cs.uiuc.edu Tue Sep 7 00:11:07 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:11:07 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409070511.AAA10853@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.13 -> 1.14 --- Log message: Give less spacing above a third-level section header. --- Diffs of the changes: (+2 -4) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.13 llvm-www/llvm.css:1.14 --- llvm-www/llvm.css:1.13 Tue Sep 7 00:07:28 2004 +++ llvm-www/llvm.css Tue Sep 7 00:10:57 2004 @@ -32,17 +32,15 @@ text-align: left; font-size: 12pt; padding: 4pt 4pt 4pt 4pt; margin: 1.5em 0.5em 0.5em 0.5em } -.www_subsubsection { margin: 2.0em 0.5em 0.5em 0.5em; +.www_subsubsection { margin: 1.0em 0.5em 0.5em 0.5em; font-weight: bold; font-style: oblique; border-bottom: 1px solid #999999; font-size: 12pt; width: 75%; } - .www_code { border: solid 1px gray; background: #eeeeee; margin: 0 1em 0 1em; padding: 0 1em 0 1em; - display:table; } - + display: table; } /* Publications */ .pub_title { font-family: "Georgia,Palatino,Times,Roman"; From brukman at cs.uiuc.edu Tue Sep 7 00:17:37 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 00:17:37 -0500 Subject: [llvm-commits] CVS: llvm-www/ProjectsWithLLVM/index.html Message-ID: <200409070517.AAA11008@zion.cs.uiuc.edu> Changes in directory llvm-www/ProjectsWithLLVM: index.html updated: 1.17 -> 1.18 --- Log message: Be consistent and fix grammar: always use "by", but never with a colon. --- Diffs of the changes: (+10 -10) Index: llvm-www/ProjectsWithLLVM/index.html diff -u llvm-www/ProjectsWithLLVM/index.html:1.17 llvm-www/ProjectsWithLLVM/index.html:1.18 --- llvm-www/ProjectsWithLLVM/index.html:1.17 Tue Sep 7 00:07:53 2004 +++ llvm-www/ProjectsWithLLVM/index.html Tue Sep 7 00:17:27 2004 @@ -54,7 +54,7 @@

    -
    By: Tobias Nurmiranta
    +
    By Tobias Nurmiranta

    @@ -80,7 +80,7 @@

    @@ -122,7 +122,7 @@
    @@ -146,7 +146,7 @@ -
    By: eXtensible Systems, Inc.
    +
    By eXtensible Systems, Inc.
    @@ -198,7 +198,7 @@ @@ -244,7 +244,7 @@
    -By: Brian Fahs +By Brian Fahs
    @@ -276,8 +276,8 @@
    -Tanya Brethour, -Joel Stanley, Bill Wendling +By Tanya Brethour, +Joel Stanley, and Bill Wendling
    @@ -305,8 +305,8 @@ From llvm at cs.uiuc.edu Tue Sep 7 01:54:48 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 7 Sep 2004 01:54:48 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/m4/ Message-ID: <200409070654.BAA18890@zion.cs.uiuc.edu> Changes in directory llvm/autoconf/m4: --- Log message: Directory /var/cvs/llvm/llvm/autoconf/m4 added to the repository --- Diffs of the changes: (+0 -0) From reid at x10sys.com Tue Sep 7 01:56:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 01:56:24 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/m4/bison.m4 c_printf_a.m4 check_gnu_make.m4 config_makefile.m4 cxx_bidi_iterator.m4 cxx_fwd_iterator.m4 cxx_hash_map.m4 cxx_hash_set.m4 cxx_namespaces.m4 cxx_std_iterator.m4 flex.m4 func_mmap_file.m4 header_mmap_anonymous.m4 link_use_r.m4 single_cxx_check.m4 Message-ID: <200409070656.BAA18936@zion.cs.uiuc.edu> Changes in directory llvm/autoconf/m4: bison.m4 added (r1.1) c_printf_a.m4 added (r1.1) check_gnu_make.m4 added (r1.1) config_makefile.m4 added (r1.1) cxx_bidi_iterator.m4 added (r1.1) cxx_fwd_iterator.m4 added (r1.1) cxx_hash_map.m4 added (r1.1) cxx_hash_set.m4 added (r1.1) cxx_namespaces.m4 added (r1.1) cxx_std_iterator.m4 added (r1.1) flex.m4 added (r1.1) func_mmap_file.m4 added (r1.1) header_mmap_anonymous.m4 added (r1.1) link_use_r.m4 added (r1.1) single_cxx_check.m4 added (r1.1) --- Log message: Individual autoconf function broken out of acincludes.m4. This change per the recommended style guide for autoconf and so that individual autoconf functions can more easily be shared across projects. --- Diffs of the changes: (+435 -0) Index: llvm/autoconf/m4/bison.m4 diff -c /dev/null llvm/autoconf/m4/bison.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/bison.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,18 ---- + # + # Check for Bison. + # + # This macro verifies that Bison is installed. If successful, then + # 1) YACC is set to bison -y (to emulate YACC calls) + # 2) BISON is set to bison + # + AC_DEFUN([AC_PROG_BISON], + [AC_CACHE_CHECK(, + ac_cv_has_bison, + [AC_PROG_YACC() + ]) + if test "$YACC" != "bison -y"; then + AC_MSG_ERROR([bison not found but required]) + else + AC_SUBST(BISON,[bison],[location of bison]) + fi + ]) Index: llvm/autoconf/m4/c_printf_a.m4 diff -c /dev/null llvm/autoconf/m4/c_printf_a.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/c_printf_a.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,31 ---- + # + # Determine if the printf() functions have the %a format character. + # This is modified from: + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html + AC_DEFUN([AC_C_PRINTF_A], + [ + AC_MSG_CHECKING([for printf %a format specifier]) + AC_LANG_SAVE + AC_LANG_C + AC_RUN_IFELSE( + AC_LANG_PROGRAM([#include + #include ], + [[[ + volatile double A, B; + char Buffer[100]; + A = 1; + A /= 10.0; + sprintf(Buffer, "%a", A); + B = atof(Buffer); + if (A != B) + return (1); + if (A != 0x1.999999999999ap-4) + return (1); + return (0);]]]), + ac_c_printf_a=yes,ac_c_printf_a=no) + AC_LANG_RESTORE + AC_MSG_RESULT($ac_c_printf_a) + if test "$ac_c_printf_a" = "yes"; then + AC_DEFINE([HAVE_PRINTF_A],[1],[Define to have the %a format string]) + fi + ]) Index: llvm/autoconf/m4/check_gnu_make.m4 diff -c /dev/null llvm/autoconf/m4/check_gnu_make.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/check_gnu_make.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,25 ---- + # + # Check for GNU Make. This is from + # http://www.gnu.org/software/ac-archive/htmldoc/check_gnu_make.html + # + AC_DEFUN([AC_CHECK_GNU_MAKE], + [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, + _cv_gnu_make_command='' ; + dnl Search all the common names for GNU make + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then + _cv_gnu_make_command=$a ; + break; + fi + done ; + ) ; + dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise + if test "x$_cv_gnu_make_command" != "x" ; then + ifGNUmake='' ; + else + ifGNUmake='#' ; + AC_MSG_RESULT("Not found"); + fi + AC_SUBST(ifGNUmake) + ]) Index: llvm/autoconf/m4/config_makefile.m4 diff -c /dev/null llvm/autoconf/m4/config_makefile.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/config_makefile.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,7 ---- + # + # Configure a Makefile without clobbering it if it exists and is not out of + # date. This macro is unique to LLVM. + # + AC_DEFUN([AC_CONFIG_MAKEFILE], + [AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`) + ]) Index: llvm/autoconf/m4/cxx_bidi_iterator.m4 diff -c /dev/null llvm/autoconf/m4/cxx_bidi_iterator.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_bidi_iterator.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,23 ---- + # + # Check for bidirectional iterator extension. This is modified from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html + # + AC_DEFUN([AC_CXX_HAVE_BI_ITERATOR], + [AC_CACHE_CHECK(whether the compiler has the bidirectional iterator, + ac_cv_cxx_have_bi_iterator, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[bidirectional_iterator t; return 0;], + ac_cv_cxx_have_bi_iterator=yes, ac_cv_cxx_have_bi_iterator=no) + AC_LANG_RESTORE + ]) + HAVE_BI_ITERATOR=0 + if test "$ac_cv_cxx_have_bi_iterator" = yes + then + HAVE_BI_ITERATOR=1 + fi + AC_SUBST(HAVE_BI_ITERATOR)]) Index: llvm/autoconf/m4/cxx_fwd_iterator.m4 diff -c /dev/null llvm/autoconf/m4/cxx_fwd_iterator.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_fwd_iterator.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,23 ---- + # Check for forward iterator extension. This is modified from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html + AC_DEFUN([AC_CXX_HAVE_FWD_ITERATOR], + [AC_CACHE_CHECK(whether the compiler has forward iterators, + ac_cv_cxx_have_fwd_iterator, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[forward_iterator t; return 0;], + ac_cv_cxx_have_fwd_iterator=yes, ac_cv_cxx_have_fwd_iterator=no) + AC_LANG_RESTORE + ]) + HAVE_FWD_ITERATOR=0 + if test "$ac_cv_cxx_have_fwd_iterator" = yes + then + HAVE_FWD_ITERATOR=1 + fi + AC_SUBST(HAVE_FWD_ITERATOR)]) + + Index: llvm/autoconf/m4/cxx_hash_map.m4 diff -c /dev/null llvm/autoconf/m4/cxx_hash_map.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_hash_map.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,62 ---- + # Check for hash_map extension. This is from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html + AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP], + [AC_CACHE_CHECK([whether the compiler has defining template class std::hash_map], + ac_cv_cxx_have_std_ext_hash_map, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[hash_map t;], + [ac_cv_cxx_have_std_ext_hash_map=yes], [ac_cv_cxx_have_std_ext_hash_map=no]) + AC_LANG_RESTORE]) + HAVE_STD_EXT_HASH_MAP=0 + if test "$ac_cv_cxx_have_std_ext_hash_map" = yes + then + HAVE_STD_EXT_HASH_MAP=1 + fi + AC_SUBST(HAVE_STD_EXT_HASH_MAP)]) + + AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP], + [AC_CACHE_CHECK([whether the compiler has defining template class __gnu_cxx::hash_map], + ac_cv_cxx_have_gnu_ext_hash_map, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace __gnu_cxx; + #endif],[hash_map t; ], + [ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no]) + AC_LANG_RESTORE]) + HAVE_GNU_EXT_HASH_MAP=0 + if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes + then + HAVE_GNU_EXT_HASH_MAP=1 + fi + AC_SUBST(HAVE_GNU_EXT_HASH_MAP)]) + + AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP], + [AC_CACHE_CHECK([whether the compiler has defining template class ::hash_map], + ac_cv_cxx_have_global_hash_map, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ],[hash_map t; ], + [ac_cv_cxx_have_global_hash_map=yes], [ac_cv_cxx_have_global_hash_map=no]) + AC_LANG_RESTORE]) + HAVE_GLOBAL_HASH_MAP=0 + if test "$ac_cv_cxx_have_global_hash_map" = yes + then + HAVE_GLOBAL_HASH_MAP=1 + fi + AC_SUBST(HAVE_GLOBAL_HASH_MAP)]) + + AC_DEFUN([AC_CXX_HAVE_HASH_MAP], + [AC_CXX_HAVE_STD_EXT_HASH_MAP + AC_CXX_HAVE_GNU_EXT_HASH_MAP + AC_CXX_HAVE_GLOBAL_HASH_MAP]) + + Index: llvm/autoconf/m4/cxx_hash_set.m4 diff -c /dev/null llvm/autoconf/m4/cxx_hash_set.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_hash_set.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,63 ---- + # Check for hash_set extension. This is modified from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html + AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET], + [AC_CACHE_CHECK([whether the compiler has defining template class std::hash_set], + ac_cv_cxx_have_std_ext_hash_set, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[hash_set t; ], + [ac_cv_cxx_have_std_ext_hash_set=yes], [ac_cv_cxx_have_std_ext_hash_set=no]) + AC_LANG_RESTORE]) + HAVE_STD_EXT_HASH_SET=0 + if test "$ac_cv_cxx_have_std_ext_hash_set" = yes + then + HAVE_STD_EXT_HASH_SET=1 + fi + AC_SUBST(HAVE_STD_EXT_HASH_SET)]) + + AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET], + [AC_CACHE_CHECK( + [whether the compiler has defining template class __gnu_cxx::hash_set], + ac_cv_cxx_have_gnu_ext_hash_set, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace __gnu_cxx; + #endif],[hash_set t; ], + [ac_cv_cxx_have_gnu_ext_hash_set=yes], [ac_cv_cxx_have_gnu_ext_hash_set=no]) + AC_LANG_RESTORE]) + HAVE_GNU_EXT_HASH_SET=0 + if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes + then + HAVE_GNU_EXT_HASH_SET=1 + fi + AC_SUBST(HAVE_GNU_EXT_HASH_SET)]) + + AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET], + [AC_CACHE_CHECK([whether the compiler has defining template class ::hash_set], + ac_cv_cxx_have_global_hash_set, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ],[hash_set t; return 0;], + [ac_cv_cxx_have_global_hash_set=yes], [ac_cv_cxx_have_global_hash_set=no]) + AC_LANG_RESTORE]) + HAVE_GLOBAL_HASH_SET=0 + if test "$ac_cv_cxx_have_global_hash_set" = yes + then + HAVE_GLOBAL_HASH_SET=1 + fi + AC_SUBST(HAVE_GLOBAL_HASH_SET)]) + + AC_DEFUN([AC_CXX_HAVE_HASH_SET], + [AC_CXX_HAVE_STD_EXT_HASH_SET + AC_CXX_HAVE_GNU_EXT_HASH_SET + AC_CXX_HAVE_GLOBAL_HASH_SET]) + + Index: llvm/autoconf/m4/cxx_namespaces.m4 diff -c /dev/null llvm/autoconf/m4/cxx_namespaces.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_namespaces.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,18 ---- + # Check for C++ namespace support. This is from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html + # + AC_DEFUN([AC_CXX_NAMESPACES], + [AC_CACHE_CHECK(whether the compiler implements namespaces, + ac_cv_cxx_namespaces, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], + [using namespace Outer::Inner; return i;], + ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) + fi + ]) + Index: llvm/autoconf/m4/cxx_std_iterator.m4 diff -c /dev/null llvm/autoconf/m4/cxx_std_iterator.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/cxx_std_iterator.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,23 ---- + # Check for standard iterator extension. This is modified from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html + AC_DEFUN([AC_CXX_HAVE_STD_ITERATOR], + [AC_CACHE_CHECK(whether the compiler has the standard iterator, + ac_cv_cxx_have_std_iterator, + [AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + #ifdef HAVE_NAMESPACES + using namespace std; + #endif],[iterator t; return 0;], + ac_cv_cxx_have_std_iterator=yes, ac_cv_cxx_have_std_iterator=no) + AC_LANG_RESTORE + ]) + HAVE_STD_ITERATOR=0 + if test "$ac_cv_cxx_have_std_iterator" = yes + then + HAVE_STD_ITERATOR=1 + fi + AC_SUBST(HAVE_STD_ITERATOR)]) + + Index: llvm/autoconf/m4/flex.m4 diff -c /dev/null llvm/autoconf/m4/flex.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/flex.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,17 ---- + # + # Check for FLEX. + # + # This macro verifies that flex is installed. If successful, then + # 1) $LEX is set to "flex" (to emulate lex calls) + # 2) BISON is set to bison + AC_DEFUN([AC_PROG_FLEX], + [AC_CACHE_CHECK(, + ac_cv_has_flex, + [AC_PROG_LEX() + ]) + if test "$LEX" != "flex"; then + AC_MSG_ERROR([flex not found but required]) + else + AC_SUBST(FLEX,[flex],[location of flex]) + fi + ]) Index: llvm/autoconf/m4/func_mmap_file.m4 diff -c /dev/null llvm/autoconf/m4/func_mmap_file.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/func_mmap_file.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,32 ---- + # + # Check for the ability to mmap a file. + # + AC_DEFUN([AC_FUNC_MMAP_FILE], + [AC_CACHE_CHECK(for mmap of files, + ac_cv_func_mmap_file, + [AC_LANG_SAVE + AC_LANG_C + AC_TRY_RUN([ + #ifdef HAVE_SYS_TYPES_H + #include + #endif + + #ifdef HAVE_SYS_MMAN_H + #include + #endif + + #ifdef HAVE_FCNTL_H + #include + #endif + + int fd; + int main () { + fd = creat ("foo",0777); fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); unlink ("foo"); return (fd != (int) MAP_FAILED);}], + ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_func_mmap_file" = yes; then + AC_DEFINE([HAVE_MMAP_FILE],[],[Define if mmap() can map files into memory]) + AC_SUBST(MMAP_FILE,[yes]) + fi + ]) Index: llvm/autoconf/m4/header_mmap_anonymous.m4 diff -c /dev/null llvm/autoconf/m4/header_mmap_anonymous.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/header_mmap_anonymous.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,22 ---- + # + # Check for anonymous mmap macros. This is modified from + # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html + # + AC_DEFUN([AC_HEADER_MMAP_ANONYMOUS], + [AC_CACHE_CHECK(for MAP_ANONYMOUS vs. MAP_ANON, + ac_cv_header_mmap_anon, + [AC_LANG_SAVE + AC_LANG_C + AC_TRY_COMPILE([#include + #include + #include ], + [mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0);], + ac_cv_header_mmap_anon=yes, ac_cv_header_mmap_anon=no) + AC_LANG_RESTORE + ]) + if test "$ac_cv_header_mmap_anon" = yes; then + AC_DEFINE([HAVE_MMAP_ANONYMOUS],[],[Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if it uses MAP_ANON]) + fi + ]) + + Index: llvm/autoconf/m4/link_use_r.m4 diff -c /dev/null llvm/autoconf/m4/link_use_r.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/link_use_r.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,23 ---- + # + # Determine if the system can handle the -R option being passed to the linker. + # + # This macro is specific to LLVM. + # + AC_DEFUN([AC_LINK_USE_R], + [ + AC_MSG_CHECKING([for compiler -Wl,-R option]) + AC_LANG_SAVE + AC_LANG_C + oldcflags="$CFLAGS" + CFLAGS="$CFLAGS -Wl,-R." + AC_LINK_IFELSE([int main() { return 0; }],[ac_cv_link_use_r=yes],[ac_cv_link_use_r=no]) + CFLAGS="$oldcflags" + AC_LANG_RESTORE + AC_MSG_RESULT($ac_cv_link_use_r) + if test "$ac_cv_link_use_r" = yes + then + AC_DEFINE([HAVE_LINK_R],[1],[Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path.]) + fi + ]) + + Index: llvm/autoconf/m4/single_cxx_check.m4 diff -c /dev/null llvm/autoconf/m4/single_cxx_check.m4:1.1 *** /dev/null Tue Sep 7 01:56:24 2004 --- llvm/autoconf/m4/single_cxx_check.m4 Tue Sep 7 01:56:14 2004 *************** *** 0 **** --- 1,48 ---- + dnl AC_SINGLE_CXX_CHECK(DEFINEVAR, CACHEVAR, FUNCTION, HEADER, PROGRAM) + dnl $1, $2, $3, $4, $5 + dnl + AC_DEFUN([AC_SINGLE_CXX_CHECK], + [AC_CACHE_CHECK([for $3 in $4], [$2], + [AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([$5]),[$2=yes],[$2=no]) + AC_LANG_POP(C++)]) + if test "$$2" = "yes" + then + AC_DEFINE($1, 1, [Define to 1 if your compiler defines $3 in the $4 + header file.]) + fi]) + + AC_DEFUN([AC_FUNC_ISNAN],[ + AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_MATH_H], [ac_cv_func_isnan_in_math_h], + [isnan], [], + [#include + int foo(float f) {return isnan(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_CMATH], [ac_cv_func_isnan_in_cmath], + [isnan], [], + [#include + int foo(float f) {return isnan(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_STD_ISNAN_IN_CMATH], [ac_cv_func_std_isnan_in_cmath], + [std::isnan], [], + [#include + using std::isnan; int foo(float f) {return isnan(f);}]) + ]) + + AC_DEFUN([AC_FUNC_ISINF],[ + AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_MATH_H], [ac_cv_func_isinf_in_math_h], + [isinf], [], + [#include + int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_CMATH], [ac_cv_func_isinf_in_cmath], + [isinf], [], + [#include + int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_STD_ISINF_IN_CMATH], [ac_cv_func_std_isinf_in_cmath], + [std::isinf], [], + [#include + using std::isinf; int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_FINITE_IN_IEEEFP_H], [ac_cv_func_finite_in_ieeefp_h], + [finite], [], + [#include + int foo(float f) {return finite(f);}]) + ]) + From reid at x10sys.com Tue Sep 7 09:24:04 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 09:24:04 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/m4/func_isinf.m4 func_isnan.m4 single_cxx_check.m4 Message-ID: <200409071424.JAA11221@zion.cs.uiuc.edu> Changes in directory llvm/autoconf/m4: func_isinf.m4 added (r1.1) func_isnan.m4 added (r1.1) single_cxx_check.m4 updated: 1.1 -> 1.2 --- Log message: move AC_FUNC_ISINF and AC_FUNC_ISNAN to their own files. --- Diffs of the changes: (+42 -34) Index: llvm/autoconf/m4/func_isinf.m4 diff -c /dev/null llvm/autoconf/m4/func_isinf.m4:1.1 *** /dev/null Tue Sep 7 09:24:03 2004 --- llvm/autoconf/m4/func_isinf.m4 Tue Sep 7 09:23:53 2004 *************** *** 0 **** --- 1,24 ---- + # + # This function determins if the the isinf function isavailable on this + # platform. + # + AC_DEFUN([AC_FUNC_ISINF],[ + AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_MATH_H], [ac_cv_func_isinf_in_math_h], + [isinf], [], + [#include + int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_CMATH], [ac_cv_func_isinf_in_cmath], + [isinf], [], + [#include + int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_STD_ISINF_IN_CMATH], [ac_cv_func_std_isinf_in_cmath], + [std::isinf], [], + [#include + using std::isinf; int foo(float f) {return isinf(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_FINITE_IN_IEEEFP_H], [ac_cv_func_finite_in_ieeefp_h], + [finite], [], + [#include + int foo(float f) {return finite(f);}]) + ]) + + Index: llvm/autoconf/m4/func_isnan.m4 diff -c /dev/null llvm/autoconf/m4/func_isnan.m4:1.1 *** /dev/null Tue Sep 7 09:24:04 2004 --- llvm/autoconf/m4/func_isnan.m4 Tue Sep 7 09:23:53 2004 *************** *** 0 **** --- 1,18 ---- + # + # This function determines if the isnan function is available on this + # platform. + # + AC_DEFUN([AC_FUNC_ISNAN],[ + AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_MATH_H], [ac_cv_func_isnan_in_math_h], + [isnan], [], + [#include + int foo(float f) {return isnan(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_CMATH], [ac_cv_func_isnan_in_cmath], + [isnan], [], + [#include + int foo(float f) {return isnan(f);}]) + AC_SINGLE_CXX_CHECK([HAVE_STD_ISNAN_IN_CMATH], [ac_cv_func_std_isnan_in_cmath], + [std::isnan], [], + [#include + using std::isnan; int foo(float f) {return isnan(f);}]) + ]) Index: llvm/autoconf/m4/single_cxx_check.m4 diff -u llvm/autoconf/m4/single_cxx_check.m4:1.1 llvm/autoconf/m4/single_cxx_check.m4:1.2 --- llvm/autoconf/m4/single_cxx_check.m4:1.1 Tue Sep 7 01:56:14 2004 +++ llvm/autoconf/m4/single_cxx_check.m4 Tue Sep 7 09:23:53 2004 @@ -12,37 +12,3 @@ header file.]) fi]) -AC_DEFUN([AC_FUNC_ISNAN],[ -AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_MATH_H], [ac_cv_func_isnan_in_math_h], - [isnan], [], - [#include - int foo(float f) {return isnan(f);}]) -AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_CMATH], [ac_cv_func_isnan_in_cmath], - [isnan], [], - [#include - int foo(float f) {return isnan(f);}]) -AC_SINGLE_CXX_CHECK([HAVE_STD_ISNAN_IN_CMATH], [ac_cv_func_std_isnan_in_cmath], - [std::isnan], [], - [#include - using std::isnan; int foo(float f) {return isnan(f);}]) -]) - -AC_DEFUN([AC_FUNC_ISINF],[ -AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_MATH_H], [ac_cv_func_isinf_in_math_h], - [isinf], [], - [#include - int foo(float f) {return isinf(f);}]) -AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_CMATH], [ac_cv_func_isinf_in_cmath], - [isinf], [], - [#include - int foo(float f) {return isinf(f);}]) -AC_SINGLE_CXX_CHECK([HAVE_STD_ISINF_IN_CMATH], [ac_cv_func_std_isinf_in_cmath], - [std::isinf], [], - [#include - using std::isinf; int foo(float f) {return isinf(f);}]) -AC_SINGLE_CXX_CHECK([HAVE_FINITE_IN_IEEEFP_H], [ac_cv_func_finite_in_ieeefp_h], - [finite], [], - [#include - int foo(float f) {return finite(f);}]) -]) - From reid at x10sys.com Tue Sep 7 11:01:07 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:01:07 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/AutoRegen.sh Message-ID: <200409071601.LAA12659@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: AutoRegen.sh updated: 1.2 -> 1.3 --- Log message: - Perform all validity checks before doing anything. - Use the -I parameter to aclocal to tell it where the autoconf/m4 directory is located so it can find needed autoconf functions --- Diffs of the changes: (+5 -4) Index: llvm/autoconf/AutoRegen.sh diff -u llvm/autoconf/AutoRegen.sh:1.2 llvm/autoconf/AutoRegen.sh:1.3 --- llvm/autoconf/AutoRegen.sh:1.2 Tue Feb 24 16:58:31 2004 +++ llvm/autoconf/AutoRegen.sh Tue Sep 7 11:00:48 2004 @@ -4,18 +4,19 @@ exit 1 } test -d autoconf && test -f autoconf/configure.ac && cd autoconf -[ -f configure.ac ] || die "Can't find 'autoconf' dir; please cd into it first" -echo "Regenerating aclocal.m4 with aclocal" -aclocal || die "aclocal failed" +test -f configure.ac || die "Can't find 'autoconf' dir; please cd into it first" autoconf --version | egrep '2\.5[0-9]' > /dev/null if test $? -ne 0 then die "Your autoconf was not detected as being 2.5x" fi echo "Note: Warnings about 'AC_CONFIG_SUBDIRS: you should use literals' are ok" +echo "Regenerating aclocal.m4 with aclocal" +cwd=`pwd` +aclocal -I $cwd/m4 || die "aclocal failed" echo "Regenerating configure with autoconf 2.5x" autoconf -o ../configure configure.ac || die "autoconf failed" cd .. echo "Regenerating config.h.in with autoheader 2.5x" -autoheader -I autoconf autoconf/configure.ac || die "autoheader failed" +autoheader -I autoconf -I autoconf/m4 autoconf/configure.ac || die "autoheader failed" exit 0 From llvm at cs.uiuc.edu Tue Sep 7 11:02:00 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 7 Sep 2004 11:02:00 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/m4/ Message-ID: <200409071602.LAA12674@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf/m4: --- Log message: Directory /var/cvs/llvm/llvm-test/autoconf/m4 added to the repository --- Diffs of the changes: (+0 -0) From reid at x10sys.com Tue Sep 7 11:17:10 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:17:10 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/AutoRegen.sh Message-ID: <200409071617.LAA12944@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: AutoRegen.sh updated: 1.2 -> 1.3 --- Log message: Find and use the llvm/autoconf/m4 directory as a source of autoconf function definitions. --- Diffs of the changes: (+17 -7) Index: llvm-test/autoconf/AutoRegen.sh diff -u llvm-test/autoconf/AutoRegen.sh:1.2 llvm-test/autoconf/AutoRegen.sh:1.3 --- llvm-test/autoconf/AutoRegen.sh:1.2 Mon Sep 6 03:33:42 2004 +++ llvm-test/autoconf/AutoRegen.sh Tue Sep 7 11:16:59 2004 @@ -4,16 +4,26 @@ exit 1 } test -d autoconf && test -f autoconf/configure.ac && cd autoconf -[ -f configure.ac ] || die "Can't find 'autoconf' dir; please cd into it first" -echo "Regenerating aclocal.m4 with aclocal" -rm -f aclocal.m4 -cwd=`pwd` -aclocal -I $cwd/m4 || die "aclocal failed" +test -f configure.ac || die "Can't find 'autoconf' dir; please cd into it first" autoconf --version | egrep '2\.5[0-9]' > /dev/null -if test $? -ne 0 -then +if test $? -ne 0 ; then die "Your autoconf was not detected as being 2.5x" fi +cwd=`pwd` +if test -d ../../../autoconf/m4 ; then + cd ../../../autoconf/m4 + llvm_m4=`pwd` + cd $cwd +elif test -d ../../llvm/autoconf/m4 ; then + cd ../../llvm/autoconf/m4 + llvm_m4=`pwd` + cd $cwd +else + die "Can't find the LLVM autoconf/m4 directory. llvm-test should be checked out to projects directory" +fi +echo "Regenerating aclocal.m4 with aclocal" +rm -f aclocal.m4 +aclocal -I $cwd/m4 -I $llvm_m4 || die "aclocal failed" echo "Regenerating configure with autoconf 2.5x" autoconf -o ../configure configure.ac || die "autoconf failed" cd .. From reid at x10sys.com Tue Sep 7 11:18:02 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:18:02 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/configure.ac Message-ID: <200409071618.LAA12976@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: configure.ac updated: 1.4 -> 1.5 --- Log message: Remove the EXTERNAL_BENCHMARK definition because its now located in autoconf/m4/external_benchmark.m4 --- Diffs of the changes: (+1 -42) Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.4 llvm-test/autoconf/configure.ac:1.5 --- llvm-test/autoconf/configure.ac:1.4 Mon Sep 6 22:31:29 2004 +++ llvm-test/autoconf/configure.ac Tue Sep 7 11:17:51 2004 @@ -110,48 +110,7 @@ dnl Determine if the linker supports the -R option. AC_LINK_USE_R -AC_DEFUN(EXTERNAL_BENCHMARK, -[m4_define([allcapsname],translit($1,a-z,A-Z)) - AC_ARG_ENABLE($1, - AC_HELP_STRING([--enable-$1=ARG], - [Use $1 as a benchmark (srcs in DIR)]), - checkresult=$enableval, - checkresult=auto) -AC_MSG_CHECKING([for $1 benchmark sources]) -case "$checkresult" in -auto|yes) - defaultdir=$2 - if test -d "$defaultdir" - then - AC_SUBST(allcapsname()[_ROOT],[$defaultdir]) - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult=no - ;; -*) if test -d "$checkresult" - then - AC_SUBST(allcapsname()[_ROOT],"$checkresult") - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, in $checkresult" - else - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult="no, not found in $checkresult" - fi - ;; -esac -AC_MSG_RESULT($checkresult) -m4_undefine([allcapsname]) -]) - - +dnl Configure the default locations of the external benchmarks EXTERNAL_BENCHMARK(spec95,/home/vadve/shared/benchmarks/spec95/benchspec) EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec) EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31) From reid at x10sys.com Tue Sep 7 11:18:37 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:18:37 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/m4/external_benchmark.m4 Message-ID: <200409071618.LAA12989@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf/m4: external_benchmark.m4 added (r1.1) --- Log message: Separate EXTERNAL_BENCHMARK function from the configure.ac file. --- Diffs of the changes: (+46 -0) Index: llvm-test/autoconf/m4/external_benchmark.m4 diff -c /dev/null llvm-test/autoconf/m4/external_benchmark.m4:1.1 *** /dev/null Tue Sep 7 11:18:37 2004 --- llvm-test/autoconf/m4/external_benchmark.m4 Tue Sep 7 11:18:27 2004 *************** *** 0 **** --- 1,46 ---- + dnl This macro allows an external benchmark to be added + dnl into the configure.ac script more easily. The + dnl arguments are: + dnl $1 short name of benchmark (e.g. spec95) + dnl $2 full path to benchmark source + AC_DEFUN([EXTERNAL_BENCHMARK], + [m4_define([allcapsname],translit($1,a-z,A-Z)) + AC_ARG_ENABLE($1, + AC_HELP_STRING([--enable-$1=ARG], + [Use $1 as a benchmark (srcs in DIR)]), + checkresult=$enableval, + checkresult=auto) + AC_MSG_CHECKING([for $1 benchmark sources]) + case "$checkresult" in + auto|yes) + defaultdir=$2 + if test -d "$defaultdir" + then + AC_SUBST(allcapsname()[_ROOT],[$defaultdir]) + AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) + checkresult="yes, found in $defaultdir" + else + checkresult=no + fi + ;; + no) + AC_SUBST(allcapsname()[_ROOT],[]) + AC_SUBST([USE_]allcapsname(),[]) + checkresult=no + ;; + *) if test -d "$checkresult" + then + AC_SUBST(allcapsname()[_ROOT],"$checkresult") + AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) + checkresult="yes, in $checkresult" + else + AC_SUBST(allcapsname()[_ROOT],[]) + AC_SUBST([USE_]allcapsname(),[]) + checkresult="no, not found in $checkresult" + fi + ;; + esac + AC_MSG_RESULT($checkresult) + m4_undefine([allcapsname]) + ]) + From reid at x10sys.com Tue Sep 7 11:19:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:19:53 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Message-ID: <200409071619.LAA13029@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.4 -> 1.5 --- Log message: Changes resulting from autoconf/configure.ac changes. --- Diffs of the changes: (+1114 -431) Index: llvm-test/configure diff -u llvm-test/configure:1.4 llvm-test/configure:1.5 --- llvm-test/configure:1.4 Mon Sep 6 23:19:55 2004 +++ llvm-test/configure Tue Sep 7 11:19:43 2004 @@ -1,11 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for LLVM-TEST 1.4. +# Generated by GNU Autoconf 2.59 for LLVM-TEST 1.4. # # Report bugs to . # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -22,9 +21,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,16 +220,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -823,7 +824,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -863,10 +864,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -978,9 +979,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1098,12 +1099,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1114,7 +1148,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1128,10 +1162,9 @@ if $ac_init_version; then cat <<\_ACEOF LLVM-TEST configure 1.4 -generated by GNU Autoconf 2.57 +generated by GNU Autoconf 2.59 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1143,7 +1176,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1220,19 +1253,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1266,12 +1299,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1300,7 +1333,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1319,7 +1352,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1399,7 +1432,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1416,13 +1449,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1739,7 +1772,6 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1759,8 +1791,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 -echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -1780,23 +1812,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -1870,8 +1902,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -1896,7 +1928,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1947,7 +1978,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1967,11 +1997,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1984,7 +2024,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2000,7 +2040,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2017,11 +2056,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2034,7 +2083,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2054,8 +2103,7 @@ fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2063,14 +2111,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2081,11 +2128,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2098,9 +2155,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2117,11 +2173,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2133,7 +2199,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2272,7 +2338,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2292,11 +2357,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2309,7 +2384,7 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2325,7 +2400,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2342,11 +2416,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2359,7 +2443,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2386,7 +2470,6 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2414,6 +2497,16 @@ va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2440,11 +2533,21 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + (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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2457,7 +2560,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2485,19 +2588,28 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2505,14 +2617,13 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2523,11 +2634,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2540,9 +2661,8 @@ continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2559,11 +2679,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2575,7 +2705,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2589,7 +2719,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2624,7 +2754,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2635,7 +2764,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2647,6 +2776,7 @@ (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 @@ -2667,7 +2797,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2685,6 +2814,7 @@ (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 @@ -2731,7 +2861,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2742,7 +2871,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2754,6 +2883,7 @@ (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 @@ -2774,7 +2904,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2792,6 +2921,7 @@ (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 @@ -2929,7 +3059,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2953,11 +3082,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2970,7 +3109,8 @@ ac_cv_lib_fl_yywrap=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -2986,7 +3126,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3010,11 +3149,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3027,7 +3176,8 @@ ac_cv_lib_l_yywrap=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3089,11 +3239,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3105,7 +3265,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS rm -f "${LEX_OUTPUT_ROOT}.c" @@ -3814,7 +3975,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3817 "configure"' > conftest.$ac_ext + echo '#line 3978 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3911,7 +4072,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3928,11 +4088,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3945,7 +4115,8 @@ lt_cv_cc_needs_belf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3973,7 +4144,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3994,11 +4164,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4011,12 +4191,11 @@ ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4038,7 +4217,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4063,7 +4241,6 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4075,9 +4252,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -4088,7 +4265,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -4113,7 +4290,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4138,7 +4315,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -4147,7 +4324,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4159,11 +4335,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4176,7 +4362,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4207,7 +4393,6 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4218,11 +4403,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4235,7 +4430,7 @@ ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -4243,7 +4438,6 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4261,6 +4455,7 @@ (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 @@ -4280,33 +4475,32 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf at gnu.org. ## -## ------------------------------------ ## +## ----------------------------------- ## +## Report this to llvmbugs at cs.uiuc.edu ## +## ----------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4317,7 +4511,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4356,7 +4550,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4367,7 +4560,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4379,6 +4572,7 @@ (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 @@ -4399,7 +4593,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4417,6 +4610,7 @@ (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 @@ -4463,7 +4657,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4474,7 +4667,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4486,6 +4679,7 @@ (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 @@ -4506,7 +4700,6 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4524,6 +4717,7 @@ (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 @@ -4568,7 +4762,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran 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 @@ -4610,7 +4804,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 + for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4655,7 +4849,7 @@ # Provide some information about the compiler. -echo "$as_me:4658:" \ +echo "$as_me:4852:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -4673,9 +4867,10 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } +rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. +# input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -4693,11 +4888,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4710,14 +4915,13 @@ ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext -G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -4734,11 +4938,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4751,7 +4965,7 @@ ac_cv_prog_f77_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -4759,18 +4973,20 @@ if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "$G77" = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then FFLAGS="-O2" else FFLAGS= fi fi + +G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5636,6 +5852,10 @@ +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... lt_prog_compiler_no_builtin_flag= @@ -5660,11 +5880,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5883: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5667: \$? = $ac_status" >&5 + echo "$as_me:5887: \$? = $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 @@ -5892,11 +6112,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5895: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6115: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5899: \$? = $ac_status" >&5 + echo "$as_me:6119: \$? = $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 @@ -5959,11 +6179,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5962: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6182: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:5966: \$? = $ac_status" >&5 + echo "$as_me:6186: \$? = $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 @@ -6299,7 +6519,6 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6316,11 +6535,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6337,7 +6566,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6350,7 +6580,6 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6367,11 +6596,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6388,7 +6627,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -7487,7 +7727,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7511,11 +7750,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7528,7 +7777,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -7552,21 +7802,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7597,11 +7854,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7614,7 +7881,8 @@ ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -7629,7 +7897,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7653,11 +7920,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7670,7 +7947,8 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_shl_load" >&5 @@ -7684,21 +7962,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7729,11 +8014,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7746,7 +8041,8 @@ ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -7761,7 +8057,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7785,11 +8080,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7802,7 +8107,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -7818,7 +8124,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7842,11 +8147,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7859,7 +8174,8 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_svld_dlopen" >&5 @@ -7875,7 +8191,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7899,11 +8214,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7916,7 +8241,8 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_dld_link" >&5 @@ -7971,7 +8297,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9122,11 +9447,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9143,7 +9478,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9157,7 +9493,6 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9174,11 +9509,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9195,7 +9540,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9814,6 +10160,10 @@ GCC_CXX="$GXX" LD_CXX="$LD" +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... cat > conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10554: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10208: \$? = $ac_status" >&5 + echo "$as_me:10558: \$? = $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 @@ -10268,11 +10618,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10271: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10621: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10275: \$? = $ac_status" >&5 + echo "$as_me:10625: \$? = $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 @@ -11027,7 +11377,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11051,11 +11400,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11068,7 +11427,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -11092,21 +11452,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11137,11 +11504,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11154,7 +11531,8 @@ ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -11169,7 +11547,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11193,11 +11570,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11210,7 +11597,8 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_shl_load" >&5 @@ -11224,21 +11612,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11269,11 +11664,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11286,7 +11691,8 @@ ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -11301,7 +11707,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11325,11 +11730,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11342,7 +11757,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -11358,7 +11774,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11382,11 +11797,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11399,7 +11824,8 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_svld_dlopen" >&5 @@ -11415,7 +11841,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11439,11 +11864,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11456,7 +11891,8 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_dld_link" >&5 @@ -11511,7 +11947,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12870: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12438: \$? = $ac_status" >&5 + echo "$as_me:12874: \$? = $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 @@ -12498,11 +12934,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12501: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12937: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12505: \$? = $ac_status" >&5 + echo "$as_me:12941: \$? = $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 @@ -12844,11 +13280,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12865,7 +13311,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -12884,11 +13331,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_f77_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12905,7 +13362,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -14414,6 +14872,10 @@ # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= @@ -14438,11 +14900,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14441: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14903: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14445: \$? = $ac_status" >&5 + echo "$as_me:14907: \$? = $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 @@ -14670,11 +15132,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14673: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15135: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14677: \$? = $ac_status" >&5 + echo "$as_me:15139: \$? = $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 @@ -14737,11 +15199,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15202: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14744: \$? = $ac_status" >&5 + echo "$as_me:15206: \$? = $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 @@ -15077,7 +15539,6 @@ allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15094,11 +15555,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15115,7 +15586,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15128,7 +15600,6 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15145,11 +15616,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15166,7 +15647,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -16265,7 +16747,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16289,11 +16770,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16306,7 +16797,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -16330,21 +16822,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -16375,11 +16874,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16392,7 +16901,8 @@ ac_cv_func_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -16407,7 +16917,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16431,11 +16940,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16448,7 +16967,8 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_shl_load" >&5 @@ -16462,21 +16982,28 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -16507,11 +17034,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16524,7 +17061,8 @@ ac_cv_func_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -16539,7 +17077,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16563,11 +17100,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16580,7 +17127,8 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dl_dlopen" >&5 @@ -16596,7 +17144,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16620,11 +17167,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16637,7 +17194,8 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_svld_dlopen" >&5 @@ -16653,7 +17211,6 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16677,11 +17234,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16694,7 +17261,8 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f 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_dld_dld_link" >&5 @@ -16749,7 +17317,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17945,11 +18512,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17962,12 +18539,11 @@ ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17989,7 +18565,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18014,7 +18589,6 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18026,9 +18600,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -18039,7 +18613,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -18064,7 +18638,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -18084,7 +18658,6 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18111,11 +18684,21 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18128,7 +18711,7 @@ ac_cv_header_sys_wait_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 @@ -18159,11 +18742,21 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18176,7 +18769,8 @@ ac_cv_link_use_r=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -18197,9 +18791,6 @@ - - - # Check whether --enable-spec95 or --disable-spec95 was given. if test "${enable_spec95+set}" = set; then enableval="$enable_spec95" @@ -18212,11 +18803,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/spec95/benchspec - if test -d "$defaultdir" - then - SPEC95_ROOT=$defaultdir + if test -d "$defaultdir" + then + SPEC95_ROOT=$defaultdir - USE_SPEC95=USE_SPEC95=1 + USE_SPEC95=USE_SPEC95=1 checkresult="yes, found in $defaultdir" else @@ -18259,11 +18850,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/speccpu2000/benchspec - if test -d "$defaultdir" - then - SPEC2000_ROOT=$defaultdir + if test -d "$defaultdir" + then + SPEC2000_ROOT=$defaultdir - USE_SPEC2000=USE_SPEC2000=1 + USE_SPEC2000=USE_SPEC2000=1 checkresult="yes, found in $defaultdir" else @@ -18306,11 +18897,11 @@ case "$checkresult" in auto|yes) defaultdir=/home/vadve/shared/benchmarks/povray31 - if test -d "$defaultdir" - then - POVRAY_ROOT=$defaultdir + if test -d "$defaultdir" + then + POVRAY_ROOT=$defaultdir - USE_POVRAY=USE_POVRAY=1 + USE_POVRAY=USE_POVRAY=1 checkresult="yes, found in $defaultdir" else @@ -18408,13 +18999,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -18444,13 +19035,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -18464,13 +19055,13 @@ cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -18492,7 +19083,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -18536,9 +19127,10 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -18557,7 +19149,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -18736,16 +19328,17 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -18772,7 +19365,7 @@ cat >&5 <<_CSEOF This file was extended by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18816,7 +19409,7 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -18830,11 +19423,10 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ LLVM-TEST config.status 1.4 -configured by $0, generated by GNU Autoconf 2.57, +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -19167,9 +19759,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -19187,21 +19779,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19217,10 +19809,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19258,12 +19850,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac @@ -19281,7 +19906,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -19290,24 +19915,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -19348,16 +19973,41 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. if test "$ac_dir" != .; then @@ -19383,12 +20033,45 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 From reid at x10sys.com Tue Sep 7 11:26:28 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:26:28 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200409071626.LAA13203@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.108 -> 1.109 --- Log message: - Handle AC_CONFIG_SUBDIRS properly for existing "well known" projects while still retaining the ability to configure unknown ones. - Excise crud left over from when test/Projects was still part of the main LLVM module. These removed tests are now all in llvm-test/autoconf/configure.ac --- Diffs of the changes: (+14 -73) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.108 llvm/autoconf/configure.ac:1.109 --- llvm/autoconf/configure.ac:1.108 Sun Sep 5 12:48:32 2004 +++ llvm/autoconf/configure.ac Tue Sep 7 11:26:18 2004 @@ -17,12 +17,19 @@ dnl Configure all of the projects present in our source tree. for i in `ls ${srcdir}/projects` do - if test ${i} != "CVS" - then - if test -f ${srcdir}/projects/${i}/configure - then - AC_CONFIG_SUBDIRS(projects/${i}) - fi + if test -d ${srcdir}/projects/${i} ; then + case ${i} in + "CVS") ;; + "sample") AC_CONFIG_SUBDIRS([projects/sample]) ;; + "Stacker") AC_CONFIG_SUBDIRS([projects/Stacker]) ;; + "llvm-test") AC_CONFIG_SUBDIRS([projects/llvm-test]) ;; + "llvm-reopt") AC_CONFIG_SUBDIRS([projects/llvm-reopt]);; + "llvm-gcc") AC_CONFIG_SUBDIRS([projects/llvm-gcc]) ;; + "llvm-java") AC_CONFIG_SUBDIRS([projects/llvm-java]) ;; + "llvm-tv") AC_CONFIG_SUBDIRS([projects/llvm-tv]) ;; + "llvm-fefw") AC_CONFIG_SUBDIRS([projects/llvm-fefw]) ;; + *) AC_CONFIG_SUBDIRS(${i}) ;; + esac fi done @@ -177,7 +184,7 @@ fi dnl Check for GNU Make. We use its extensions too, so don't build without it -CHECK_GNU_MAKE +AC_CHECK_GNU_MAKE if test -z "$_cv_gnu_make_command" then AC_MSG_ERROR([GNU Make required but not found]) @@ -328,69 +335,6 @@ AC_SUBST(ENABLE_OPTIMIZED,[[ENABLE_OPTIMIZED=1]]) fi -AC_DEFUN(EXTERNAL_BENCHMARK, -[m4_define([allcapsname],translit($1,a-z,A-Z)) - AC_ARG_ENABLE($1, - AC_HELP_STRING([--enable-$1=ARG], - [Use $1 as a benchmark (srcs in DIR)]), - checkresult=$enableval, - checkresult=auto) -AC_MSG_CHECKING([for $1 benchmark sources]) -case "$checkresult" in -auto|yes) - defaultdir=$2 - if test -d "$defaultdir" - then - AC_SUBST(allcapsname()[_ROOT],[$defaultdir]) - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult=no - ;; -*) if test -d "$checkresult" - then - AC_SUBST(allcapsname()[_ROOT],"$checkresult") - AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1) - checkresult="yes, in $checkresult" - else - AC_SUBST(allcapsname()[_ROOT],[]) - AC_SUBST([USE_]allcapsname(),[]) - checkresult="no, not found in $checkresult" - fi - ;; -esac -AC_MSG_RESULT($checkresult) -m4_undefine([allcapsname]) -]) - -EXTERNAL_BENCHMARK(spec95,/home/vadve/shared/benchmarks/spec95/benchspec) -EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec) -EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31) - -dnl Precompiled Bytecode Option -AC_ARG_ENABLE(precompiled_bytecode,AC_HELP_STRING([--enable-precompiled_bytecode],[Use pre-compiled bytecode (default is NO)]),,enableval=no) -if test ${enableval} = "no" -then - AC_SUBST(UPB,[[]]) -else - AC_SUBST(UPB,[[USE_PRECOMPILED_BYTECODE=1]]) -fi - -dnl LLC Diff Option -AC_ARG_ENABLE(llc_diffs,AC_HELP_STRING([--enable-llc_diffs],[Enable LLC Diffs when testing (default is YES)]),,enableval=yes) -if test ${enableval} = "no" -then - AC_SUBST(DISABLE_LLC_DIFFS,[DISABLE_LLC_DIFFS:=1]) -else - AC_SUBST(DISABLE_LLC_DIFFS,[[]]) -fi - dnl JIT Option AC_ARG_ENABLE(jit,AC_HELP_STRING([--enable-jit],[Enable Just In Time Compiling (default is YES)]),,enableval=default) if test ${enableval} = "no" @@ -449,9 +393,6 @@ llvmgccwarn=yes fi -dnl Location of the bytecode repository -AC_ARG_WITH(bcrepos,AC_HELP_STRING([--with-bcrepos],[Location of Bytecode Repository]),AC_SUBST(BCR,[$withval]),AC_SUBST(BCR,[/home/vadve/lattner/LLVMPrograms])) - dnl Location of PAPI AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) From reid at x10sys.com Tue Sep 7 11:35:55 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:35:55 -0500 Subject: [llvm-commits] CVS: llvm/Makefile.config.in configure Message-ID: <200409071635.LAA13453@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.config.in updated: 1.29 -> 1.30 configure updated: 1.112 -> 1.113 --- Log message: Remove variables and tests that were specific to the now defunct test/Programs. These have been moved to llvm-test/autoconf/configure.ac and llvm-test/Makefile.config.in --- Diffs of the changes: (+75 -270) Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.29 llvm/Makefile.config.in:1.30 --- llvm/Makefile.config.in:1.29 Mon Aug 2 17:24:39 2004 +++ llvm/Makefile.config.in Tue Sep 7 11:35:45 2004 @@ -74,34 +74,6 @@ # want to override the value set by configure. LLVMGCCDIR := @LLVMGCCDIR@ -# When this variable is set to 1, programs in the llvm/test/Programs hierarchy -# are not recompiled from source code. Instead, the bytecode for the file is -# pulled from the BYTECODE_REPOSITORY directory. This can be useful when disk -# space is limited or when you just don't want to spend time running the C -# frontend. -#USE_PRECOMPILED_BYTECODE := 1 - at UPB@ - -# This path specifies the cannonical location of bytecode files for compiled -# versions of the test/Programs/* programs. This is used as the bytecode source -# when USE_PRECOMPILED_BYTECODE is specified or when source code is not -# available for the program (such as SPEC). -BYTECODE_REPOSITORY := @BCR@ - -# SPEC benchmarks: -# If these are set then run the SPEC benchmarks. -# You must provide the SPEC benchmarks on your own. - at USE_SPEC2000@ - at USE_SPEC95@ - -# Path to the SPEC benchmarks. -SPEC2000_ROOT := @SPEC2000_ROOT@ -SPEC95_ROOT := @SPEC95_ROOT@ - -# Path to the Povray source code. - at USE_POVRAY@ -POVRAY_ROOT := @POVRAY_ROOT@ - # Path to the PAPI code. This is used by the reoptimizer only. #PAPIDIR := /home/vadve/shared/papi-2.3.4.1 PAPIDIR := @PAPIDIR@ @@ -125,9 +97,6 @@ # Enable JIT for this platform @JIT@ -# Disable LLC diffs for testing. - at DISABLE_LLC_DIFFS@ - # Shared library extension for this platform. SHLIBEXT = @SHLIBEXT@ Index: llvm/configure diff -u llvm/configure:1.112 llvm/configure:1.113 --- llvm/configure:1.112 Sun Sep 5 12:48:31 2004 +++ llvm/configure Tue Sep 7 11:35:45 2004 @@ -427,7 +427,15 @@ PACKAGE_STRING='LLVM 1.4' PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' -ac_subdirs_all="$ac_subdirs_all projects/${i}" +ac_subdirs_all="$ac_subdirs_all projects/sample" +ac_subdirs_all="$ac_subdirs_all projects/Stacker" +ac_subdirs_all="$ac_subdirs_all projects/llvm-test" +ac_subdirs_all="$ac_subdirs_all projects/llvm-reopt" +ac_subdirs_all="$ac_subdirs_all projects/llvm-gcc" +ac_subdirs_all="$ac_subdirs_all projects/llvm-java" +ac_subdirs_all="$ac_subdirs_all projects/llvm-tv" +ac_subdirs_all="$ac_subdirs_all projects/llvm-fefw" +ac_subdirs_all="$ac_subdirs_all ${i}" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -466,7 +474,7 @@ #endif" ac_unique_file=""Makefile.config.in"" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST HAVE_PTHREAD_MUTEX_LOCK INCLUDE_SYS_TYPES_H INCLUDE_INTTYPES_H INCLUDE_STDINT_H ENDIAN HAVE_STD_EXT_HASH_MAP HAVE_GNU_EXT_HASH_MAP HAVE_GLOBAL_HASH_MAP HAVE_STD_EXT_HASH_SET HAVE_GNU_EXT_HASH_SET H! AVE_GLOBAL_HASH_SET HAVE_STD_ITERATOR HAVE_BI_ITERATOR HAVE_FWD_ITERATOR ALLOCA MMAP_FILE ENABLE_OPTIMIZED SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY UPB DISABLE_LLC_DIFFS JIT LLVMCC1 LLVMCC1PLUS BCR PAPIDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST HAVE_PTHREAD_MUTEX_LOCK INCLUDE_SYS_TYPES_H INCLUDE_INTTYPES_H INCLUDE_STDINT_H ENDIAN HAVE_STD_EXT_HASH_MAP HAVE_GNU_EXT_HASH_MAP HAVE_GLOBAL_HASH_MAP HAVE_STD_EXT_HASH_SET HAVE_GNU_EXT_HASH_SET H! AVE_GLOBAL_HASH_SET HAVE_STD_ITERATOR HAVE_BI_ITERATOR HAVE_FWD_ITERATOR ALLOCA MMAP_FILE ENABLE_OPTIMIZED JIT LLVMCC1 LLVMCC1PLUS PAPIDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1032,12 +1040,6 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-optimized Compile with optimizations enabled (default is NO) - --enable-spec95=ARG Use spec95 as a benchmark (srcs in DIR) - --enable-spec2000=ARG Use spec2000 as a benchmark (srcs in DIR) - --enable-povray=ARG Use povray as a benchmark (srcs in DIR) - --enable-precompiled_bytecode - Use pre-compiled bytecode (default is NO) - --enable-llc_diffs Enable LLC Diffs when testing (default is YES) --enable-jit Enable Just In Time Compiling (default is YES) Optional Packages: @@ -1049,7 +1051,6 @@ --with-tags[=TAGS] include additional configurations [automatic] --with-llvmgccdir Location of LLVM GCC front-end - --with-bcrepos Location of Bytecode Repository --with-papi Location of PAPI Some influential environment variables: @@ -1554,15 +1555,46 @@ for i in `ls ${srcdir}/projects` do - if test ${i} != "CVS" - then - if test -f ${srcdir}/projects/${i}/configure - then + if test -d ${srcdir}/projects/${i} ; then + case ${i} in + "CVS") ;; + "sample") + +subdirs="$subdirs projects/sample" + ;; + "Stacker") +subdirs="$subdirs projects/Stacker" + ;; + "llvm-test") -subdirs="$subdirs projects/${i}" +subdirs="$subdirs projects/llvm-test" + ;; + "llvm-reopt") - fi +subdirs="$subdirs projects/llvm-reopt" +;; + "llvm-gcc") + +subdirs="$subdirs projects/llvm-gcc" + ;; + "llvm-java") + +subdirs="$subdirs projects/llvm-java" + ;; + "llvm-tv") + +subdirs="$subdirs projects/llvm-tv" + ;; + "llvm-fefw") + +subdirs="$subdirs projects/llvm-fefw" + ;; + *) + +subdirs="$subdirs ${i}" + ;; + esac fi done @@ -4155,7 +4187,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4158 "configure"' > conftest.$ac_ext + echo '#line 4190 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5029,7 +5061,7 @@ # Provide some information about the compiler. -echo "$as_me:5032:" \ +echo "$as_me:5064:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6060,11 +6092,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6063: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6095: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6067: \$? = $ac_status" >&5 + echo "$as_me:6099: \$? = $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 @@ -6292,11 +6324,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6295: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6327: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6299: \$? = $ac_status" >&5 + echo "$as_me:6331: \$? = $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 @@ -6359,11 +6391,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6362: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6394: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6366: \$? = $ac_status" >&5 + echo "$as_me:6398: \$? = $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 @@ -8477,7 +8509,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10766: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10738: \$? = $ac_status" >&5 + echo "$as_me:10770: \$? = $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 @@ -10798,11 +10830,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10833: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10805: \$? = $ac_status" >&5 + echo "$as_me:10837: \$? = $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 @@ -12127,7 +12159,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13082: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13054: \$? = $ac_status" >&5 + echo "$as_me:13086: \$? = $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 @@ -13114,11 +13146,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13117: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13149: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13121: \$? = $ac_status" >&5 + echo "$as_me:13153: \$? = $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 @@ -15080,11 +15112,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15115: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15087: \$? = $ac_status" >&5 + echo "$as_me:15119: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15312,11 +15344,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15347: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15319: \$? = $ac_status" >&5 + echo "$as_me:15351: \$? = $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 @@ -15379,11 +15411,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15382: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15414: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15386: \$? = $ac_status" >&5 + echo "$as_me:15418: \$? = $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 @@ -17497,7 +17529,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 $ECHO_N "checking for spec95 benchmark sources... $ECHO_C" >&6 -case "$checkresult" in -auto|yes) - defaultdir=/home/vadve/shared/benchmarks/spec95/benchspec - if test -d "$defaultdir" - then - SPEC95_ROOT=$defaultdir - - USE_SPEC95=USE_SPEC95=1 - - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - - - checkresult=no - ;; -*) if test -d "$checkresult" - then - SPEC95_ROOT="$checkresult" - - USE_SPEC95=USE_SPEC95=1 - - checkresult="yes, in $checkresult" - else - - - checkresult="no, not found in $checkresult" - fi - ;; -esac -echo "$as_me:$LINENO: result: $checkresult" >&5 -echo "${ECHO_T}$checkresult" >&6 - - - - # Check whether --enable-spec2000 or --disable-spec2000 was given. -if test "${enable_spec2000+set}" = set; then - enableval="$enable_spec2000" - checkresult=$enableval -else - checkresult=auto -fi; -echo "$as_me:$LINENO: checking for spec2000 benchmark sources" >&5 -echo $ECHO_N "checking for spec2000 benchmark sources... $ECHO_C" >&6 -case "$checkresult" in -auto|yes) - defaultdir=/home/vadve/shared/benchmarks/speccpu2000/benchspec - if test -d "$defaultdir" - then - SPEC2000_ROOT=$defaultdir - - USE_SPEC2000=USE_SPEC2000=1 - - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - - - checkresult=no - ;; -*) if test -d "$checkresult" - then - SPEC2000_ROOT="$checkresult" - - USE_SPEC2000=USE_SPEC2000=1 - - checkresult="yes, in $checkresult" - else - - - checkresult="no, not found in $checkresult" - fi - ;; -esac -echo "$as_me:$LINENO: result: $checkresult" >&5 -echo "${ECHO_T}$checkresult" >&6 - - - - # Check whether --enable-povray or --disable-povray was given. -if test "${enable_povray+set}" = set; then - enableval="$enable_povray" - checkresult=$enableval -else - checkresult=auto -fi; -echo "$as_me:$LINENO: checking for povray benchmark sources" >&5 -echo $ECHO_N "checking for povray benchmark sources... $ECHO_C" >&6 -case "$checkresult" in -auto|yes) - defaultdir=/home/vadve/shared/benchmarks/povray31 - if test -d "$defaultdir" - then - POVRAY_ROOT=$defaultdir - - USE_POVRAY=USE_POVRAY=1 - - checkresult="yes, found in $defaultdir" - else - checkresult=no - fi - ;; -no) - - - checkresult=no - ;; -*) if test -d "$checkresult" - then - POVRAY_ROOT="$checkresult" - - USE_POVRAY=USE_POVRAY=1 - - checkresult="yes, in $checkresult" - else - - - checkresult="no, not found in $checkresult" - fi - ;; -esac -echo "$as_me:$LINENO: result: $checkresult" >&5 -echo "${ECHO_T}$checkresult" >&6 - - - -# Check whether --enable-precompiled_bytecode or --disable-precompiled_bytecode was given. -if test "${enable_precompiled_bytecode+set}" = set; then - enableval="$enable_precompiled_bytecode" - -else - enableval=no -fi; -if test ${enableval} = "no" -then - UPB= - -else - UPB=USE_PRECOMPILED_BYTECODE=1 - -fi - -# Check whether --enable-llc_diffs or --disable-llc_diffs was given. -if test "${enable_llc_diffs+set}" = set; then - enableval="$enable_llc_diffs" - -else - enableval=yes -fi; -if test ${enableval} = "no" -then - DISABLE_LLC_DIFFS=DISABLE_LLC_DIFFS:=1 - -else - DISABLE_LLC_DIFFS= - -fi - # Check whether --enable-jit or --disable-jit was given. if test "${enable_jit+set}" = set; then enableval="$enable_jit" @@ -23702,17 +23558,6 @@ fi -# Check whether --with-bcrepos or --without-bcrepos was given. -if test "${with_bcrepos+set}" = set; then - withval="$with_bcrepos" - BCR=$withval - -else - BCR=/home/vadve/lattner/LLVMPrograms - -fi; - - # Check whether --with-papi or --without-papi was given. if test "${with_papi+set}" = set; then withval="$with_papi" @@ -24537,18 +24382,9 @@ s, at ALLOCA@,$ALLOCA,;t t s, at MMAP_FILE@,$MMAP_FILE,;t t s, at ENABLE_OPTIMIZED@,$ENABLE_OPTIMIZED,;t t -s, at SPEC95_ROOT@,$SPEC95_ROOT,;t t -s, at USE_SPEC95@,$USE_SPEC95,;t t -s, at SPEC2000_ROOT@,$SPEC2000_ROOT,;t t -s, at USE_SPEC2000@,$USE_SPEC2000,;t t -s, at POVRAY_ROOT@,$POVRAY_ROOT,;t t -s, at USE_POVRAY@,$USE_POVRAY,;t t -s, at UPB@,$UPB,;t t -s, at DISABLE_LLC_DIFFS@,$DISABLE_LLC_DIFFS,;t t s, at JIT@,$JIT,;t t s, at LLVMCC1@,$LLVMCC1,;t t s, at LLVMCC1PLUS@,$LLVMCC1PLUS,;t t -s, at BCR@,$BCR,;t t s, at PAPIDIR@,$PAPIDIR,;t t s, at SHLIBEXT@,$SHLIBEXT,;t t s, at LLVM_PREFIX@,$LLVM_PREFIX,;t t From reid at x10sys.com Tue Sep 7 11:42:09 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:42:09 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/configure.ac Message-ID: <200409071642.LAA13604@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: configure.ac updated: 1.5 -> 1.6 --- Log message: Add back the removed DISABLE_LCC_DIFF option. --- Diffs of the changes: (+11 -0) Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.5 llvm-test/autoconf/configure.ac:1.6 --- llvm-test/autoconf/configure.ac:1.5 Tue Sep 7 11:17:51 2004 +++ llvm-test/autoconf/configure.ac Tue Sep 7 11:41:59 2004 @@ -130,5 +130,16 @@ dnl Location of PAPI AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) +dnl LLC Diff Option +AC_ARG_ENABLE(llc_diffs,AC_HELP_STRING([--enable-llc_diffs],[Enable LLC Diffs + when testing (default is + YES)]),,enableval=yes) +if test ${enableval} = "no" +then + AC_SUBST(DISABLE_LLC_DIFFS,[DISABLE_LLC_DIFFS:=1]) +else + AC_SUBST(DISABLE_LLC_DIFFS,[[]]) +fi + dnl Create the output files AC_OUTPUT(Makefile.config) From reid at x10sys.com Tue Sep 7 11:42:09 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:42:09 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Message-ID: <200409071642.LAA13607@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.5 -> 1.6 --- Log message: Add back the removed DISABLE_LCC_DIFF option. --- Diffs of the changes: (+47 -29) Index: llvm-test/configure diff -u llvm-test/configure:1.5 llvm-test/configure:1.6 --- llvm-test/configure:1.5 Tue Sep 7 11:19:43 2004 +++ llvm-test/configure Tue Sep 7 11:41:59 2004 @@ -465,7 +465,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY UPB BCR PAPIDIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY UPB BCR PAPIDIR DISABLE_LLC_DIFFS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1034,6 +1034,7 @@ --enable-povray=ARG Use povray as a benchmark (srcs in DIR) --enable-precompiled_bytecode Use pre-compiled bytecode (default is NO) + --enable-llc_diffs Enable LLC Diffs when testing (default is YES) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3975,7 +3976,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3978 "configure"' > conftest.$ac_ext + echo '#line 3979 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4849,7 +4850,7 @@ # Provide some information about the compiler. -echo "$as_me:4852:" \ +echo "$as_me:4853:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5880,11 +5881,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5883: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5884: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5887: \$? = $ac_status" >&5 + echo "$as_me:5888: \$? = $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 @@ -6112,11 +6113,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6115: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6116: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6119: \$? = $ac_status" >&5 + echo "$as_me:6120: \$? = $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 @@ -6179,11 +6180,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6182: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6183: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6186: \$? = $ac_status" >&5 + echo "$as_me:6187: \$? = $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 @@ -8297,7 +8298,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10555: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10558: \$? = $ac_status" >&5 + echo "$as_me:10559: \$? = $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 @@ -10618,11 +10619,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10622: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10625: \$? = $ac_status" >&5 + echo "$as_me:10626: \$? = $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 @@ -11947,7 +11948,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12871: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12874: \$? = $ac_status" >&5 + echo "$as_me:12875: \$? = $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 @@ -12934,11 +12935,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12937: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12938: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12941: \$? = $ac_status" >&5 + echo "$as_me:12942: \$? = $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 @@ -14900,11 +14901,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14903: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14904: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14907: \$? = $ac_status" >&5 + echo "$as_me:14908: \$? = $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 @@ -15132,11 +15133,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15135: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15136: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15139: \$? = $ac_status" >&5 + echo "$as_me:15140: \$? = $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 @@ -15199,11 +15200,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15202: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15203: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15206: \$? = $ac_status" >&5 + echo "$as_me:15207: \$? = $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 @@ -17317,7 +17318,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -19728,6 +19745,7 @@ s, at UPB@,$UPB,;t t s, at BCR@,$BCR,;t t s, at PAPIDIR@,$PAPIDIR,;t t +s, at DISABLE_LLC_DIFFS@,$DISABLE_LLC_DIFFS,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF From reid at x10sys.com Tue Sep 7 11:43:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 11:43:24 -0500 Subject: [llvm-commits] CVS: llvm-test/Makefile.config.in Message-ID: <200409071643.LAA13643@zion.cs.uiuc.edu> Changes in directory llvm-test: Makefile.config.in updated: 1.1 -> 1.2 --- Log message: Add configuration items from llvm/Makefile.config.in that were removed because they are specific to llvm-test and llvm itself doesn't do anything with them (result of moving llvm/test/Programs -> llvm-test). --- Diffs of the changes: (+34 -1) Index: llvm-test/Makefile.config.in diff -u llvm-test/Makefile.config.in:1.1 llvm-test/Makefile.config.in:1.2 --- llvm-test/Makefile.config.in:1.1 Mon Sep 6 22:27:12 2004 +++ llvm-test/Makefile.config.in Tue Sep 7 11:43:14 2004 @@ -10,7 +10,7 @@ LLVM_OBJ_ROOT = @LLVM_OBJ@ # -# Include the configuration file +# Include the LLVM configuration file # include $(LLVM_OBJ_ROOT)/Makefile.config @@ -21,4 +21,37 @@ BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@) +# +# Provide variables specific to llvm-test +# + +# When this variable is set to 1, programs in the llvm/test/Programs hierarchy +# are not recompiled from source code. Instead, the bytecode for the file is +# pulled from the BYTECODE_REPOSITORY directory. This can be useful when disk +# space is limited or when you just don't want to spend time running the C +# frontend. +#USE_PRECOMPILED_BYTECODE := 1 + at UPB@ + +# This path specifies the cannonical location of bytecode files for compiled +# versions of the test/Programs/* programs. This is used as the bytecode source +# when USE_PRECOMPILED_BYTECODE is specified or when source code is not +# available for the program (such as SPEC). +BYTECODE_REPOSITORY := @BCR@ + +# SPEC benchmarks: +# If these are set then run the SPEC benchmarks. +# You must provide the SPEC benchmarks on your own. + at USE_SPEC2000@ + at USE_SPEC95@ + +# Path to the SPEC benchmarks. +SPEC2000_ROOT := @SPEC2000_ROOT@ +SPEC95_ROOT := @SPEC95_ROOT@ + +# Path to the Povray source code. + at USE_POVRAY@ +POVRAY_ROOT := @POVRAY_ROOT@ +# Disable LLC diffs for testing. + at DISABLE_LLC_DIFFS@ From llvm at cs.uiuc.edu Tue Sep 7 11:50:33 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 7 Sep 2004 11:50:33 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/acinclude.m4 Message-ID: <200409071650.LAA13742@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: acinclude.m4 (r1.9) removed --- Log message: Removed this file as its contents are now in the m4 directory. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Tue Sep 7 11:51:44 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 7 Sep 2004 11:51:44 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/acinclude.m4 Message-ID: <200409071651.LAA13790@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: acinclude.m4 (r1.1) removed --- Log message: Remove this file as its not needed and goes against current autoconf standards/practices. New macros needed by llvm-test should be put in the autoconf/m4 directory, one per file. --- Diffs of the changes: (+0 -0) From reid at x10sys.com Tue Sep 7 11:57:50 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 07 Sep 2004 09:57:50 -0700 Subject: [llvm-commits] Configure Commits Done In-Reply-To: <200409071643.LAA13643@zion.cs.uiuc.edu> References: <200409071643.LAA13643@zion.cs.uiuc.edu> Message-ID: <1094576270.13294.106.camel@bashful.x10sys.com> Just wanted to let you know my recent set of autoconf/configure changes are done. They work on Linux. I don't expect problems elsewhere. Here's a summary of the changes: * Individual AC functions are now in the autoconf/m4 directory, one per file. This helps to minimize configure script size as only the actual tests needed by autoconf.ac will get included by aclocal. It also helps us maintain them and share them between projects. * The acinclude.m4 file in both llvm/autoconf and llvm-test/autoconf has been removed. This is the "old" way to do function definitions and the autoconf/m4 directories replace it. * AC functions specific to llvm-test have been moved to the autoconf/m4 directory in llvm-test (currently just EXTERNAL_BENCHMARK). * Tests and configuration items specific to llvm-test have been removed from llvm/autoconf/configure.ac and llvm/Makefile.config.in These tests are now in the corresponding places in llvm-test. * The AutoRegen.sh scripts in both autoconf directories now do things a little differently. They both will attempt to do all validation before running anything. They have also been modified to pass the -I argument to aclocal so that aclocal can find the m4 directories. In the case of llvm-test/autoconf/AutoRegen.sh it also passes in the llvm/autoconf/m4 directory since some of the tests in llvm-test depend on AC functions defined by the llvm module. If none of the above makes any sense to you, just ignore it. Its just restructuring for ease of future maintenance. Reid. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20040907/7f2583b6/attachment.bin From gaeke at cs.uiuc.edu Tue Sep 7 12:33:20 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 12:33:20 -0500 Subject: [llvm-commits] CVS: reopt/Makefile.config.in Message-ID: <200409071733.MAA14513@zion.cs.uiuc.edu> Changes in directory reopt: Makefile.config.in updated: 1.3 -> 1.4 --- Log message: Move PAPI configure stuff used by lib/Inst/rtl into the reoptimizer project's Makefile/configure script. --- Diffs of the changes: (+5 -0) Index: reopt/Makefile.config.in diff -u reopt/Makefile.config.in:1.3 reopt/Makefile.config.in:1.4 --- reopt/Makefile.config.in:1.3 Wed Nov 19 23:27:15 2003 +++ reopt/Makefile.config.in Tue Sep 7 12:33:09 2004 @@ -14,3 +14,8 @@ # include $(LLVM_SRC_ROOT)/Makefile.config +# Path to the PAPI code. This is used by the reoptimizer only. +# e.g.: +#PAPIDIR := /home/vadve/shared/papi-2.3.4.1 +PAPIDIR := @PAPIDIR@ + From gaeke at cs.uiuc.edu Tue Sep 7 12:33:20 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 12:33:20 -0500 Subject: [llvm-commits] CVS: reopt/autoconf/configure.ac Message-ID: <200409071733.MAA14514@zion.cs.uiuc.edu> Changes in directory reopt/autoconf: configure.ac updated: 1.6 -> 1.7 --- Log message: Move PAPI configure stuff used by lib/Inst/rtl into the reoptimizer project's Makefile/configure script. --- Diffs of the changes: (+3 -0) Index: reopt/autoconf/configure.ac diff -u reopt/autoconf/configure.ac:1.6 reopt/autoconf/configure.ac:1.7 --- reopt/autoconf/configure.ac:1.6 Mon Jan 5 12:39:32 2004 +++ reopt/autoconf/configure.ac Tue Sep 7 12:33:09 2004 @@ -34,5 +34,8 @@ AC_ARG_WITH(llvmsrc,AC_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[`cd ${srcdir}/../..; pwd`])) AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`])) +dnl Location of PAPI +AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) + dnl Create the output files AC_OUTPUT([Makefile.common Makefile.config]) From gaeke at cs.uiuc.edu Tue Sep 7 12:33:31 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 12:33:31 -0500 Subject: [llvm-commits] CVS: reopt/configure Message-ID: <200409071733.MAA14562@zion.cs.uiuc.edu> Changes in directory reopt: configure updated: 1.7 -> 1.8 --- Log message: Regenerated. --- Diffs of the changes: (+14 -1) Index: reopt/configure diff -u reopt/configure:1.7 reopt/configure:1.8 --- reopt/configure:1.7 Mon Jan 5 12:39:57 2004 +++ reopt/configure Tue Sep 7 12:33:21 2004 @@ -273,7 +273,7 @@ PACKAGE_BUGREPORT='llvmbugs at cs.uiuc.edu' ac_unique_file=""Makefile.common.in"" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ PAPIDIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -788,6 +788,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-llvmsrc Location of LLVM Source Code --with-llvmobj Location of LLVM Object Code + --with-papi Location of PAPI Report bugs to . _ACEOF @@ -1302,6 +1303,17 @@ fi; + +# Check whether --with-papi or --without-papi was given. +if test "${with_papi+set}" = set; then + withval="$with_papi" + PAPIDIR=$withval + +else + PAPIDIR=/home/vadve/shared/Sparc/papi-2.3.4.1 + +fi; + ac_config_files="$ac_config_files Makefile.common Makefile.config" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -1981,6 +1993,7 @@ s, at LIBS@,$LIBS,;t t s, at LLVM_SRC@,$LLVM_SRC,;t t s, at LLVM_OBJ@,$LLVM_OBJ,;t t +s, at PAPIDIR@,$PAPIDIR,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF From gaeke at cs.uiuc.edu Tue Sep 7 12:34:44 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 12:34:44 -0500 Subject: [llvm-commits] CVS: llvm/Makefile.config.in Message-ID: <200409071734.MAA14792@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.config.in updated: 1.30 -> 1.31 --- Log message: PAPI is not used here. --- Diffs of the changes: (+0 -4) Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.30 llvm/Makefile.config.in:1.31 --- llvm/Makefile.config.in:1.30 Tue Sep 7 11:35:45 2004 +++ llvm/Makefile.config.in Tue Sep 7 12:34:34 2004 @@ -74,10 +74,6 @@ # want to override the value set by configure. LLVMGCCDIR := @LLVMGCCDIR@ -# Path to the PAPI code. This is used by the reoptimizer only. -#PAPIDIR := /home/vadve/shared/papi-2.3.4.1 -PAPIDIR := @PAPIDIR@ - # These are options that can either be enabled here, or can be enabled on the # make command line (ie, make ENABLE_PROFILING=1): From gaeke at cs.uiuc.edu Tue Sep 7 12:35:27 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 12:35:27 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200409071735.MAA14943@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.109 -> 1.110 --- Log message: PAPI check has been moved to projects/reopt. --- Diffs of the changes: (+0 -3) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.109 llvm/autoconf/configure.ac:1.110 --- llvm/autoconf/configure.ac:1.109 Tue Sep 7 11:26:18 2004 +++ llvm/autoconf/configure.ac Tue Sep 7 12:35:16 2004 @@ -393,9 +393,6 @@ llvmgccwarn=yes fi -dnl Location of PAPI -AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) - dnl Get libtool's idea of what the shared library suffix is. dnl (This is a hack; it relies on undocumented behavior.) AC_MSG_CHECKING([for shared library suffix]) From reid at x10sys.com Tue Sep 7 12:52:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 12:52:48 -0500 Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html Message-ID: <200409071752.MAA15119@zion.cs.uiuc.edu> Changes in directory llvm/docs: ReleaseNotes.html updated: 1.235 -> 1.236 --- Log message: bug 352: http://llvm.cs.uiuc.edu/PR352 fixed bug 257: http://llvm.cs.uiuc.edu/PR257 fixed --- Diffs of the changes: (+5 -2) Index: llvm/docs/ReleaseNotes.html diff -u llvm/docs/ReleaseNotes.html:1.235 llvm/docs/ReleaseNotes.html:1.236 --- llvm/docs/ReleaseNotes.html:1.235 Thu Aug 26 19:48:26 2004 +++ llvm/docs/ReleaseNotes.html Tue Sep 7 12:52:38 2004 @@ -140,7 +140,10 @@ @@ -610,7 +613,7 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /> The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/08/27 00:48:26 $ + Last modified: $Date: 2004/09/07 17:52:38 $ From reid at x10sys.com Tue Sep 7 13:00:17 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 13:00:17 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/configure.ac Message-ID: <200409071800.NAA15271@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: configure.ac updated: 1.6 -> 1.7 --- Log message: Removed ancient/unused configuration variables. --- Diffs of the changes: (+0 -15) Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.6 llvm-test/autoconf/configure.ac:1.7 --- llvm-test/autoconf/configure.ac:1.6 Tue Sep 7 11:41:59 2004 +++ llvm-test/autoconf/configure.ac Tue Sep 7 13:00:07 2004 @@ -115,21 +115,6 @@ EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec) EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31) -dnl Precompiled Bytecode Option -AC_ARG_ENABLE(precompiled_bytecode,AC_HELP_STRING([--enable-precompiled_bytecode],[Use pre-compiled bytecode (default is NO)]),,enableval=no) -if test ${enableval} = "no" -then - AC_SUBST(UPB,[[]]) -else - AC_SUBST(UPB,[[USE_PRECOMPILED_BYTECODE=1]]) -fi - -dnl Location of the bytecode repository -AC_ARG_WITH(bcrepos,AC_HELP_STRING([--with-bcrepos],[Location of Bytecode Repository]),AC_SUBST(BCR,[$withval]),AC_SUBST(BCR,[/home/vadve/lattner/LLVMPrograms])) - -dnl Location of PAPI -AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1])) - dnl LLC Diff Option AC_ARG_ENABLE(llc_diffs,AC_HELP_STRING([--enable-llc_diffs],[Enable LLC Diffs when testing (default is From reid at x10sys.com Tue Sep 7 13:00:17 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 7 Sep 2004 13:00:17 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Makefile.config.in Message-ID: <200409071800.NAA15276@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.6 -> 1.7 Makefile.config.in updated: 1.2 -> 1.3 --- Log message: Removed ancient/unused configuration variables. --- Diffs of the changes: (+611 -627) Index: llvm-test/configure diff -u llvm-test/configure:1.6 llvm-test/configure:1.7 --- llvm-test/configure:1.6 Tue Sep 7 11:41:59 2004 +++ llvm-test/configure Tue Sep 7 13:00:06 2004 @@ -393,9 +393,9 @@ -tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}CXX -tagnames=`echo "$tagnames,F77" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}F77 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -465,7 +465,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY UPB BCR PAPIDIR DISABLE_LLC_DIFFS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY DISABLE_LLC_DIFFS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1032,8 +1032,6 @@ --enable-spec95=ARG Use spec95 as a benchmark (srcs in DIR) --enable-spec2000=ARG Use spec2000 as a benchmark (srcs in DIR) --enable-povray=ARG Use povray as a benchmark (srcs in DIR) - --enable-precompiled_bytecode - Use pre-compiled bytecode (default is NO) --enable-llc_diffs Enable LLC Diffs when testing (default is YES) Optional Packages: @@ -1046,8 +1044,6 @@ both] --with-tags[=TAGS] include additional configurations [automatic] - --with-bcrepos Location of Bytecode Repository - --with-papi Location of PAPI Some influential environment variables: CXX C++ compiler command @@ -2970,32 +2966,7 @@ { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for GNU make" >&5 -echo $ECHO_N "checking for GNU make... $ECHO_C" >&6 -if test "${_cv_gnu_make_command+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - _cv_gnu_make_command='' ; - for a in "$MAKE" make gmake gnumake ; do - if test -z "$a" ; then continue ; fi ; - if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then - _cv_gnu_make_command=$a ; - break; - fi - done ; - -fi -echo "$as_me:$LINENO: result: $_cv_gnu_make_command" >&5 -echo "${ECHO_T}$_cv_gnu_make_command" >&6 ; - if test "x$_cv_gnu_make_command" != "x" ; then - ifGNUmake='' ; - else - ifGNUmake='#' ; - echo "$as_me:$LINENO: result: \"Not found\"" >&5 -echo "${ECHO_T}\"Not found\"" >&6; - fi - - +CHECK_GNU_MAKE if test -z "$_cv_gnu_make_command" then { { echo "$as_me:$LINENO: error: GNU Make required but not found" >&5 @@ -3291,6 +3262,9 @@ { { echo "$as_me:$LINENO: error: flex not found but required" >&5 echo "$as_me: error: flex not found but required" >&2;} { (exit 1); exit 1; }; } +else + FLEX=flex + fi echo "$as_me:$LINENO: checking " >&5 @@ -3574,7 +3548,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -3643,7 +3617,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 &1 /dev/null; then case $host_cpu in i*86 ) @@ -3847,7 +3821,7 @@ # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3870,7 +3844,7 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx) +nto-qnx*) lt_cv_deplibs_check_method=unknown ;; @@ -3976,7 +3950,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3979 "configure"' > conftest.$ac_ext + echo '#line 3953 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4025,7 +3999,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -4381,25 +4355,19 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + 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 <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -4424,100 +4392,17 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +eval "$as_ac_Header=no" fi rm -f 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 $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header 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 <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - 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 - 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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: 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 $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -4850,7 +4735,7 @@ # Provide some information about the compiler. -echo "$as_me:4853:" \ +echo "$as_me:4738:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5034,6 +4919,12 @@ lt_cv_sys_max_cmd_len=8192; ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -5319,7 +5210,7 @@ rm="rm -f" # Global variables: -default_ofile=mklib +default_ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except M$VC, @@ -5853,17 +5744,14 @@ -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5881,11 +5769,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5884: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5772: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5888: \$? = $ac_status" >&5 + echo "$as_me:5776: \$? = $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 @@ -6028,12 +5916,12 @@ linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' @@ -6095,7 +5983,8 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6113,11 +6002,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6116: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6005: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6120: \$? = $ac_status" >&5 + echo "$as_me:6009: \$? = $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 @@ -6180,11 +6069,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6072: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6187: \$? = $ac_status" >&5 + echo "$as_me:6076: \$? = $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 @@ -6194,8 +6083,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -6682,20 +6574,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -6706,19 +6605,21 @@ else archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes + else + ld_shlibs=no fi ;; @@ -6752,7 +6653,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7112,72 +7013,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -7271,7 +7106,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -7318,7 +7153,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -7357,17 +7192,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -7385,6 +7219,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -7537,6 +7383,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -7562,7 +7420,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -7575,7 +7433,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -7693,6 +7551,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -8298,7 +8222,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&1 | grep 'Apple' >/dev/null ; then + if test "$GCC" = yes; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - output_verbose_link_cmd='echo' + output_verbose_link_cmd='echo' archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - fi + else + ld_shlibs=no + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -8578,7 +8511,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -8756,7 +8689,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -9210,7 +9143,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -9279,7 +9212,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 &1 &1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes; then archive_cmds_need_lc_CXX=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_CXX='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='-all_load $convenience' link_all_deplibs_CXX=yes - fi + else + ld_shlibs_CXX=no + fi ;; dgux*) @@ -9655,7 +9601,7 @@ freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10103,14 +10049,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -10161,10 +10107,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... cat > conftest.$ac_ext <&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10552,11 +10495,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10555: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10498: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10559: \$? = $ac_status" >&5 + echo "$as_me:10502: \$? = $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 @@ -10619,11 +10562,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10622: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10565: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10626: \$? = $ac_status" >&5 + echo "$as_me:10569: \$? = $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 @@ -10633,8 +10576,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -10762,72 +10708,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -10921,7 +10801,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -10968,7 +10848,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -11007,17 +10887,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -11035,6 +10914,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11187,6 +11078,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11212,7 +11115,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -11225,7 +11128,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -11343,6 +11246,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -11948,7 +11917,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: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12868,11 +12838,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12841: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12875: \$? = $ac_status" >&5 + echo "$as_me:12845: \$? = $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 @@ -12935,11 +12905,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12938: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12908: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12942: \$? = $ac_status" >&5 + echo "$as_me:12912: \$? = $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 @@ -12949,8 +12919,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -13417,20 +13390,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc_F77=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_F77='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_F77='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -13441,19 +13421,21 @@ else archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes + else + ld_shlibs_F77=no fi ;; @@ -13487,7 +13469,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -13847,72 +13829,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -14006,7 +13922,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -14053,7 +13969,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -14092,17 +14008,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -14120,6 +14035,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -14272,6 +14199,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14297,7 +14236,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -14310,7 +14249,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14428,6 +14367,73 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -14442,7 +14448,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -14572,7 +14578,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -14873,17 +14879,14 @@ # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14901,11 +14904,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14904: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14907: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14908: \$? = $ac_status" >&5 + echo "$as_me:14911: \$? = $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 @@ -15048,12 +15051,12 @@ linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' @@ -15115,7 +15118,8 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15133,11 +15137,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15136: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15140: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15140: \$? = $ac_status" >&5 + echo "$as_me:15144: \$? = $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 @@ -15200,11 +15204,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15203: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15207: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15207: \$? = $ac_status" >&5 + echo "$as_me:15211: \$? = $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 @@ -15214,8 +15218,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -15702,20 +15709,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc_GCJ=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_GCJ='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -15726,19 +15740,21 @@ else archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes + else + ld_shlibs_GCJ=no fi ;; @@ -15772,7 +15788,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16132,72 +16148,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -16291,7 +16241,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -16338,7 +16288,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -16377,17 +16327,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -16405,6 +16354,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -16557,6 +16518,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16582,7 +16555,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -16595,7 +16568,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -16713,6 +16686,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -17318,7 +17357,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < Changes in directory llvm: configure updated: 1.113 -> 1.114 --- Log message: Remove PAPIDIR, per brg --- Diffs of the changes: (+610 -554) Index: llvm/configure diff -u llvm/configure:1.113 llvm/configure:1.114 --- llvm/configure:1.113 Tue Sep 7 11:35:45 2004 +++ llvm/configure Tue Sep 7 13:04:45 2004 @@ -393,9 +393,9 @@ -tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}CXX -tagnames=`echo "$tagnames,F77" | sed 's/^,//'` +tagnames=${tagnames+${tagnames},}F77 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -474,7 +474,7 @@ #endif" ac_unique_file=""Makefile.config.in"" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST HAVE_PTHREAD_MUTEX_LOCK INCLUDE_SYS_TYPES_H INCLUDE_INTTYPES_H INCLUDE_STDINT_H ENDIAN HAVE_STD_EXT_HASH_MAP HAVE_GNU_EXT_HASH_MAP HAVE_GLOBAL_HASH_MAP HAVE_STD_EXT_HASH_SET HAVE_GNU_EXT_HASH_SET H! AVE_GLOBAL_HASH_SET HAVE_STD_ITERATOR HAVE_BI_ITERATOR HAVE_FWD_ITERATOR ALLOCA MMAP_FILE ENABLE_OPTIMIZED JIT LLVMCC1 LLVMCC1PLUS PAPIDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST HAVE_PTHREAD_MUTEX_LOCK INCLUDE_SYS_TYPES_H INCLUDE_INTTYPES_H INCLUDE_STDINT_H ENDIAN HAVE_STD_EXT_HASH_MAP HAVE_GNU_EXT_HASH_MAP HAVE_GLOBAL_HASH_MAP HAVE_STD_EXT_HASH_SET HAVE_GNU_EXT_HASH_! SET HAVE_GLOBAL_HASH_SET HAVE_STD_ITERATOR HAVE_BI_ITERATOR HAVE_FWD_ITERATOR ALLOCA MMAP_FILE ENABLE_OPTIMIZED JIT LLVMCC1 LLVMCC1PLUS SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1051,7 +1051,6 @@ --with-tags[=TAGS] include additional configurations [automatic] --with-llvmgccdir Location of LLVM GCC front-end - --with-papi Location of PAPI Some influential environment variables: CXX C++ compiler command @@ -3556,6 +3555,9 @@ { { echo "$as_me:$LINENO: error: flex not found but required" >&5 echo "$as_me: error: flex not found but required" >&2;} { (exit 1); exit 1; }; } +else + FLEX=flex + fi echo "$as_me:$LINENO: checking " >&5 @@ -3785,7 +3787,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -3854,7 +3856,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 &1 /dev/null; then case $host_cpu in i*86 ) @@ -4058,7 +4060,7 @@ # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -4081,7 +4083,7 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx) +nto-qnx*) lt_cv_deplibs_check_method=unknown ;; @@ -4187,7 +4189,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4190 "configure"' > conftest.$ac_ext + echo '#line 4192 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4236,7 +4238,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -4592,25 +4594,19 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + 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 <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -4635,100 +4631,17 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +eval "$as_ac_Header=no" fi rm -f 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 $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header 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 <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - 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 - 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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: 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 $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -5061,7 +4974,7 @@ # Provide some information about the compiler. -echo "$as_me:5064:" \ +echo "$as_me:4977:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5245,6 +5158,12 @@ lt_cv_sys_max_cmd_len=8192; ;; + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -5530,7 +5449,7 @@ rm="rm -f" # Global variables: -default_ofile=mklib +default_ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except M$VC, @@ -6064,17 +5983,14 @@ -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6092,11 +6008,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6095: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6011: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6099: \$? = $ac_status" >&5 + echo "$as_me:6015: \$? = $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 @@ -6239,12 +6155,12 @@ linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' @@ -6306,7 +6222,8 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6324,11 +6241,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6327: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6244: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6331: \$? = $ac_status" >&5 + echo "$as_me:6248: \$? = $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 @@ -6391,11 +6308,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6394: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6311: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6398: \$? = $ac_status" >&5 + echo "$as_me:6315: \$? = $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 @@ -6405,8 +6322,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -6893,20 +6813,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -6917,19 +6844,21 @@ else archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes + else + ld_shlibs=no fi ;; @@ -6963,7 +6892,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7323,72 +7252,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -7482,7 +7345,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -7529,7 +7392,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -7568,17 +7431,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -7596,6 +7458,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -7748,6 +7622,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -7773,7 +7659,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -7786,7 +7672,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -7904,6 +7790,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -8509,7 +8461,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&1 | grep 'Apple' >/dev/null ; then + if test "$GCC" = yes; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! - output_verbose_link_cmd='echo' + output_verbose_link_cmd='echo' archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - fi + else + ld_shlibs=no + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -8789,7 +8750,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -8967,7 +8928,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -9421,7 +9382,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld + # Canonicalize the pathname of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -9490,7 +9451,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `"$LD" -v 2>&1 &1 &1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes; then archive_cmds_need_lc_CXX=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_CXX='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='-all_load $convenience' link_all_deplibs_CXX=yes - fi + else + ld_shlibs_CXX=no + fi ;; dgux*) @@ -9866,7 +9840,7 @@ freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd*) + freebsd* | kfreebsd*-gnu) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10314,14 +10288,14 @@ if test "$GXX" = yes && test "$with_gnu_ld" = no; then no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -10372,10 +10346,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... cat > conftest.$ac_ext <&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10763,11 +10734,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10766: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10737: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10770: \$? = $ac_status" >&5 + echo "$as_me:10741: \$? = $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 @@ -10830,11 +10801,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10833: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10804: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10837: \$? = $ac_status" >&5 + echo "$as_me:10808: \$? = $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 @@ -10844,8 +10815,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -10973,72 +10947,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -11132,7 +11040,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -11179,7 +11087,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -11218,17 +11126,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -11246,6 +11153,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11398,6 +11317,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11423,7 +11354,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -11436,7 +11367,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -11554,6 +11485,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -12159,7 +12156,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: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13079,11 +13077,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13082: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13080: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13086: \$? = $ac_status" >&5 + echo "$as_me:13084: \$? = $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 @@ -13146,11 +13144,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13149: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13147: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13153: \$? = $ac_status" >&5 + echo "$as_me:13151: \$? = $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 @@ -13160,8 +13158,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -13628,20 +13629,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc_F77=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_F77='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_F77='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -13652,19 +13660,21 @@ else archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes + else + ld_shlibs_F77=no fi ;; @@ -13698,7 +13708,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -14058,72 +14068,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -14217,7 +14161,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -14264,7 +14208,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -14303,17 +14247,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -14331,6 +14274,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -14483,6 +14438,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -14508,7 +14475,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -14521,7 +14488,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14639,6 +14606,73 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + + # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -14653,7 +14687,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -14783,7 +14817,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$STRIP +STRIP=$lt_STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -15084,17 +15118,14 @@ # GCJ did not exist at the time GCC didn't implicitly link libc in. archive_cmds_need_lc_GCJ=no -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... lt_prog_compiler_no_builtin_flag_GCJ= if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + +echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15112,11 +15143,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15115: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15146: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15119: \$? = $ac_status" >&5 + echo "$as_me:15150: \$? = $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 @@ -15259,12 +15290,12 @@ linux*) case $CC in - icc|ecc) + icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - ccc) + ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' @@ -15326,7 +15357,8 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then - echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + +echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15344,11 +15376,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15347: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15379: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15351: \$? = $ac_status" >&5 + echo "$as_me:15383: \$? = $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 @@ -15411,11 +15443,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15414: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15446: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15418: \$? = $ac_status" >&5 + echo "$as_me:15450: \$? = $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 @@ -15425,8 +15457,11 @@ fi fi chmod u+w . - $rm conftest* out/* - rmdir out + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out cd .. rmdir conftest $rm conftest* @@ -15913,20 +15948,27 @@ ;; darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + if test "$GXX" = yes ; then archive_cmds_need_lc_GCJ=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_GCJ='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-undefined dynamic_lookup' + ;; + esac + fi ;; esac - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. Also zsh mangles - # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -15937,19 +15979,21 @@ else archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' + module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes + else + ld_shlibs_GCJ=no fi ;; @@ -15983,7 +16027,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd*) + freebsd* | kfreebsd*-gnu) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16343,72 +16387,6 @@ ;; esac -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -16502,7 +16480,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; beos*) @@ -16549,7 +16527,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -16588,17 +16566,16 @@ version_type=darwin need_lib_prefix=no need_version=no - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -16616,6 +16593,18 @@ dynamic_linker=no ;; +kfreebsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -16768,6 +16757,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='GNU ld.so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16793,7 +16794,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx) +nto-qnx*) version_type=linux need_lib_prefix=no need_version=no @@ -16806,7 +16807,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=no + need_version=yes library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -16924,6 +16925,72 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -17529,7 +17596,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 $ECHO_N "checking for shared library suffix... $ECHO_C" >&6 eval "SHLIBEXT=$shrext" @@ -24344,6 +24400,7 @@ s, at LEX@,$LEX,;t t s, at LEXLIB@,$LEXLIB,;t t s, at LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t +s, at FLEX@,$FLEX,;t t s, at YACC@,$YACC,;t t s, at BISON@,$BISON,;t t s, at EGREP@,$EGREP,;t t @@ -24385,7 +24442,6 @@ s, at JIT@,$JIT,;t t s, at LLVMCC1@,$LLVMCC1,;t t s, at LLVMCC1PLUS@,$LLVMCC1PLUS,;t t -s, at PAPIDIR@,$PAPIDIR,;t t s, at SHLIBEXT@,$SHLIBEXT,;t t s, at LLVM_PREFIX@,$LLVM_PREFIX,;t t s, at LLVM_BINDIR@,$LLVM_BINDIR,;t t From brukman at cs.uiuc.edu Tue Sep 7 13:46:46 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 13:46:46 -0500 Subject: [llvm-commits] CVS: llvm-test/autoconf/configure.ac Message-ID: <200409071846.NAA03186@zion.cs.uiuc.edu> Changes in directory llvm-test/autoconf: configure.ac updated: 1.7 -> 1.8 --- Log message: The correct autoconf macro for checking for GNU make is AC_CHECK_GNU_MAKE --- Diffs of the changes: (+1 -1) Index: llvm-test/autoconf/configure.ac diff -u llvm-test/autoconf/configure.ac:1.7 llvm-test/autoconf/configure.ac:1.8 --- llvm-test/autoconf/configure.ac:1.7 Tue Sep 7 13:00:07 2004 +++ llvm-test/autoconf/configure.ac Tue Sep 7 13:46:36 2004 @@ -67,7 +67,7 @@ fi dnl Check for GNU Make. We use its extensions too, so don't build without it -CHECK_GNU_MAKE +AC_CHECK_GNU_MAKE if test -z "$_cv_gnu_make_command" then AC_MSG_ERROR([GNU Make required but not found]) From brukman at cs.uiuc.edu Tue Sep 7 13:47:09 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 13:47:09 -0500 Subject: [llvm-commits] CVS: llvm-test/configure Message-ID: <200409071847.NAA03213@zion.cs.uiuc.edu> Changes in directory llvm-test: configure updated: 1.7 -> 1.8 --- Log message: Regenerated configure with correct AC_CHECK_GNU_MAKE macro change --- Diffs of the changes: (+1090 -1644) Index: llvm-test/configure diff -u llvm-test/configure:1.7 llvm-test/configure:1.8 --- llvm-test/configure:1.7 Tue Sep 7 13:00:06 2004 +++ llvm-test/configure Tue Sep 7 13:46:58 2004 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for LLVM-TEST 1.4. +# Generated by GNU Autoconf 2.57 for LLVM-TEST 1.4. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -21,10 +22,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,17 +220,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -393,9 +392,9 @@ -tagnames=${tagnames+${tagnames},}CXX +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` -tagnames=${tagnames+${tagnames},}F77 +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -465,7 +464,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY DISABLE_LLC_DIFFS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PYTHON SPEC95_ROOT USE_SPEC95 SPEC2000_ROOT USE_SPEC2000 POVRAY_ROOT USE_POVRAY DISABLE_LLC_DIFFS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -824,7 +823,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -864,10 +863,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -979,9 +978,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1096,45 +1095,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1145,7 +1111,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1159,9 +1125,10 @@ if $ac_init_version; then cat <<\_ACEOF LLVM-TEST configure 1.4 -generated by GNU Autoconf 2.59 +generated by GNU Autoconf 2.57 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1173,7 +1140,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1250,19 +1217,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1296,12 +1263,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1330,7 +1297,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1349,7 +1316,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && + rm -f core core.* *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1429,7 +1396,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1446,13 +1413,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1769,6 +1736,7 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1788,8 +1756,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 +echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -1809,23 +1777,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -1899,8 +1867,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -1925,6 +1893,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1975,6 +1944,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1994,21 +1964,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2021,7 +1981,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2037,6 +1997,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2053,21 +2014,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2080,7 +2031,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2100,7 +2051,8 @@ fi fi for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2108,13 +2060,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2125,21 +2078,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2152,8 +2095,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2170,21 +2114,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2196,7 +2130,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2335,6 +2269,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2354,21 +2289,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2381,7 +2306,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2397,6 +2322,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2413,21 +2339,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2440,7 +2356,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2467,6 +2383,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2494,16 +2411,6 @@ va_end (v); return s; } - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2530,21 +2437,11 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2557,7 +2454,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext +rm -f conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2585,28 +2482,19 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2614,13 +2502,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2631,21 +2520,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2658,8 +2537,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2676,21 +2556,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2702,7 +2572,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2716,7 +2586,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2751,6 +2621,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2761,7 +2632,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2773,7 +2644,6 @@ (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 @@ -2794,6 +2664,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2811,7 +2682,6 @@ (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 @@ -2858,6 +2728,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2868,7 +2739,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -2880,7 +2751,6 @@ (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 @@ -2901,6 +2771,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2918,7 +2789,6 @@ (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 @@ -2966,7 +2836,32 @@ { (exit 1); exit 1; }; } fi -CHECK_GNU_MAKE + echo "$as_me:$LINENO: checking for GNU make" >&5 +echo $ECHO_N "checking for GNU make... $ECHO_C" >&6 +if test "${_cv_gnu_make_command+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + _cv_gnu_make_command='' ; + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then + _cv_gnu_make_command=$a ; + break; + fi + done ; + +fi +echo "$as_me:$LINENO: result: $_cv_gnu_make_command" >&5 +echo "${ECHO_T}$_cv_gnu_make_command" >&6 ; + if test "x$_cv_gnu_make_command" != "x" ; then + ifGNUmake='' ; + else + ifGNUmake='#' ; + echo "$as_me:$LINENO: result: \"Not found\"" >&5 +echo "${ECHO_T}\"Not found\"" >&6; + fi + + if test -z "$_cv_gnu_make_command" then { { echo "$as_me:$LINENO: error: GNU Make required but not found" >&5 @@ -3031,6 +2926,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3054,21 +2950,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3081,8 +2967,7 @@ ac_cv_lib_fl_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3098,6 +2983,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3121,21 +3007,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3148,8 +3024,7 @@ ac_cv_lib_l_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3211,21 +3086,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3237,8 +3102,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS rm -f "${LEX_OUTPUT_ROOT}.c" @@ -3548,7 +3412,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld + # Canonicalize the path of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -3759,7 +3623,7 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3821,7 +3685,7 @@ # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -3844,7 +3708,7 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx*) +nto-qnx) lt_cv_deplibs_check_method=unknown ;; @@ -3950,7 +3814,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3953 "configure"' > conftest.$ac_ext + echo '#line 3817 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3999,7 +3863,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + ppc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -4047,6 +3911,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4063,21 +3928,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4090,8 +3945,7 @@ lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4119,6 +3973,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4139,21 +3994,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4166,11 +4011,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4192,6 +4038,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4216,6 +4063,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4227,9 +4075,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -4240,7 +4088,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -4265,7 +4113,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4290,7 +4138,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -4299,6 +4147,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4310,21 +4159,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4337,7 +4176,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4355,54 +4194,135 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - #include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); }; }; 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 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 $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +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 in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -4436,6 +4356,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4446,7 +4367,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4458,7 +4379,6 @@ (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 @@ -4479,6 +4399,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4496,7 +4417,6 @@ (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 @@ -4543,6 +4463,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4553,7 +4474,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4565,7 +4486,6 @@ (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 @@ -4586,6 +4506,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4603,7 +4524,6 @@ (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 @@ -4648,7 +4568,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 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4690,7 +4610,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4735,7 +4655,7 @@ # Provide some information about the compiler. -echo "$as_me:4738:" \ +echo "$as_me:4658:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -4753,10 +4673,9 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) +# input file. ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -4774,21 +4693,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4801,13 +4710,14 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext +G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -4824,21 +4734,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4851,7 +4751,7 @@ ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -4859,20 +4759,18 @@ if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-O2" else FFLAGS= fi fi - -G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4919,12 +4817,6 @@ lt_cv_sys_max_cmd_len=8192; ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -5006,7 +4898,7 @@ symcode='[BCDEGQRST]' ;; solaris* | sysv5*) - symcode='[BDT]' + symcode='[BDRT]' ;; sysv4) symcode='[DFNSTU]' @@ -5024,7 +4916,7 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) - symcode='[ABCDGISTW]' ;; + symcode='[ABCDGIRSTW]' ;; esac # Try without a prefix undercore, then with it. @@ -5750,8 +5642,7 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5769,11 +5660,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5772: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5776: \$? = $ac_status" >&5 + echo "$as_me:5667: \$? = $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 @@ -5916,12 +5807,12 @@ linux*) case $CC in - icc* | ecc*) + icc|ecc) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - ccc*) + ccc) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' @@ -5983,8 +5874,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6002,11 +5892,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5895: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6009: \$? = $ac_status" >&5 + echo "$as_me:5899: \$? = $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 @@ -6069,11 +5959,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6072: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5962: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6076: \$? = $ac_status" >&5 + echo "$as_me:5966: \$? = $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 @@ -6083,11 +5973,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -6284,14 +6171,39 @@ hardcode_shlibpath_var=no ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' else - ld_shlibs=no + archive_expsym_cmds="$tmp_archive_cmds" fi - ;; + else + ld_shlibs=no + fi + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; esac if test "$ld_shlibs" = yes; then @@ -6412,6 +6324,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6428,21 +6341,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6459,8 +6362,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6473,6 +6375,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6489,21 +6392,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6520,8 +6413,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6574,27 +6466,20 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag='-undefined dynamic_lookup' - ;; - esac - fi + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -6605,21 +6490,19 @@ else archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - else - ld_shlibs=no fi ;; @@ -6653,7 +6536,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7013,6 +6896,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -7106,7 +7055,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -7153,7 +7102,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -7192,16 +7141,17 @@ version_type=darwin need_lib_prefix=no need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -7219,18 +7169,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -7381,18 +7319,30 @@ # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 7327 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -7420,7 +7370,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -7433,7 +7383,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -7551,72 +7501,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -7652,6 +7536,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7675,21 +7560,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7702,8 +7577,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -7727,28 +7601,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7779,21 +7646,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7806,8 +7663,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -7822,6 +7678,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7845,21 +7702,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7872,8 +7719,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -7887,28 +7733,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7939,21 +7778,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7966,8 +7795,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -7982,6 +7810,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8005,21 +7834,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8032,8 +7851,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -8049,6 +7867,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8072,21 +7891,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8099,8 +7908,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -8116,6 +7924,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8139,21 +7948,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8166,8 +7965,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -8222,7 +8020,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag='-undefined dynamic_lookup' - ;; - esac - fi + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' ;; esac - output_verbose_link_cmd='echo' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + output_verbose_link_cmd='echo' archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - else - ld_shlibs=no - fi + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -8511,7 +8300,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -8689,7 +8478,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -9143,7 +8932,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld + # Canonicalize the path of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -9365,6 +9154,7 @@ allow_undefined_flag_CXX='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9381,21 +9171,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9412,8 +9192,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9427,6 +9206,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9443,21 +9223,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9474,8 +9244,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9527,54 +9296,41 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_CXX=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_CXX='-undefined suppress' ;; *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_CXX='-undefined dynamic_lookup' - ;; - esac - fi + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='-all_load $convenience' link_all_deplibs_CXX=yes - else - ld_shlibs_CXX=no - fi + fi ;; dgux*) @@ -9601,7 +9357,7 @@ freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu) + freebsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -10308,7 +10064,7 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -10476,8 +10232,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10495,11 +10250,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10498: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10253: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10502: \$? = $ac_status" >&5 + echo "$as_me:10257: \$? = $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 @@ -10562,11 +10317,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10565: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10320: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10569: \$? = $ac_status" >&5 + echo "$as_me:10324: \$? = $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 @@ -10576,11 +10331,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -10708,6 +10460,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -10801,7 +10619,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -10848,7 +10666,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -10887,16 +10705,17 @@ version_type=darwin need_lib_prefix=no need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -10914,18 +10733,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11076,18 +10883,30 @@ # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 10891 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -11115,7 +10934,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -11128,7 +10947,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -11246,72 +11065,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -11347,6 +11100,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11370,21 +11124,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11397,8 +11141,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11422,28 +11165,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11474,21 +11210,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11501,8 +11227,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -11517,6 +11242,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11540,21 +11266,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11567,8 +11283,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -11582,28 +11297,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11634,21 +11342,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11661,8 +11359,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -11677,6 +11374,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11700,21 +11398,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11727,8 +11415,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11744,6 +11431,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11767,21 +11455,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11794,8 +11472,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -11811,6 +11488,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11834,21 +11512,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11861,8 +11529,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -11917,7 +11584,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: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12838,11 +12504,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12841: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12507: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12845: \$? = $ac_status" >&5 + echo "$as_me:12511: \$? = $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 @@ -12905,11 +12571,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12908: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12574: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12912: \$? = $ac_status" >&5 + echo "$as_me:12578: \$? = $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 @@ -12919,11 +12585,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -13120,6 +12783,31 @@ hardcode_shlibpath_var_F77=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_F77="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_F77="$tmp_archive_cmds" + fi + else + ld_shlibs_F77=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -13254,21 +12942,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13285,8 +12963,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13305,21 +12982,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13336,8 +13003,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13390,27 +13056,20 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_F77=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_F77='-undefined suppress' ;; *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_F77='-undefined dynamic_lookup' - ;; - esac - fi + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -13421,21 +13080,19 @@ else archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes - else - ld_shlibs_F77=no fi ;; @@ -13469,7 +13126,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -13829,6 +13486,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -13922,7 +13645,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -13969,7 +13692,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -14008,16 +13731,17 @@ version_type=darwin need_lib_prefix=no need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -14035,18 +13759,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -14197,18 +13909,30 @@ # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 13917 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -14236,7 +13960,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -14249,7 +13973,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14367,73 +14091,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -14448,7 +14105,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -14578,7 +14235,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -14885,8 +14542,7 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14904,11 +14560,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14907: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14563: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14911: \$? = $ac_status" >&5 + echo "$as_me:14567: \$? = $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 @@ -15051,12 +14707,12 @@ linux*) case $CC in - icc* | ecc*) + icc|ecc) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - ccc*) + ccc) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' @@ -15118,8 +14774,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15137,11 +14792,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15140: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14795: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15144: \$? = $ac_status" >&5 + echo "$as_me:14799: \$? = $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 @@ -15204,11 +14859,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15207: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14862: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15211: \$? = $ac_status" >&5 + echo "$as_me:14866: \$? = $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 @@ -15218,11 +14873,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -15419,6 +15071,31 @@ hardcode_shlibpath_var_GCJ=no ;; + linux*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds_GCJ="$tmp_archive_cmds" + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ +cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +$echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + else + archive_expsym_cmds_GCJ="$tmp_archive_cmds" + fi + else + ld_shlibs_GCJ=no + fi + ;; + *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -15547,6 +15224,7 @@ allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15563,21 +15241,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15594,8 +15262,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15608,6 +15275,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15624,21 +15292,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15655,8 +15313,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15709,27 +15366,20 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_GCJ=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_GCJ='-undefined suppress' ;; *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='-undefined dynamic_lookup' - ;; - esac - fi + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then @@ -15740,21 +15390,19 @@ else archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes - else - ld_shlibs_GCJ=no fi ;; @@ -15788,7 +15436,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16148,6 +15796,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -16241,7 +15955,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -16288,7 +16002,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -16327,16 +16041,17 @@ version_type=darwin need_lib_prefix=no need_version=no + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -16354,18 +16069,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -16516,18 +16219,30 @@ # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' + # Find out which ABI we are using (multilib Linux x86_64 hack). + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 16227 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + ;; + esac + fi + rm -rf conftest* + ;; + *) + ;; + esac + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) @@ -16555,7 +16270,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -16568,7 +16283,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -16686,72 +16401,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -16787,6 +16436,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16810,21 +16460,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16837,8 +16477,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -16862,28 +16501,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -16914,21 +16546,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16941,8 +16563,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -16957,6 +16578,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16980,21 +16602,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17007,8 +16619,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -17022,28 +16633,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -17074,21 +16678,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17101,8 +16695,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -17117,6 +16710,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17140,21 +16734,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17167,8 +16751,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -17184,6 +16767,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17207,21 +16791,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17234,8 +16808,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -17251,6 +16824,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17274,21 +16848,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17301,8 +16865,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -17357,7 +16920,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18552,21 +18116,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18579,11 +18133,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18605,6 +18160,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18629,6 +18185,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18640,9 +18197,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -18653,7 +18210,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -18678,7 +18235,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -18698,6 +18255,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18724,21 +18282,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18751,7 +18299,7 @@ ac_cv_header_sys_wait_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 @@ -18782,21 +18330,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18809,8 +18347,7 @@ ac_cv_link_use_r=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -19017,13 +18554,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -19053,13 +18590,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -19073,13 +18610,13 @@ cat >confdef2opt.sed <<\_ACEOF t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g @@ -19101,7 +18638,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -19145,10 +18682,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -19167,7 +18703,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -19346,17 +18882,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -19383,7 +18918,7 @@ cat >&5 <<_CSEOF This file was extended by LLVM-TEST $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -19427,7 +18962,7 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -19441,10 +18976,11 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ LLVM-TEST config.status 1.4 -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -19708,6 +19244,7 @@ s, at CFLAGS@,$CFLAGS,;t t s, at ac_ct_CC@,$ac_ct_CC,;t t s, at CPP@,$CPP,;t t +s, at ifGNUmake@,$ifGNUmake,;t t s, at LEX@,$LEX,;t t s, at LEXLIB@,$LEXLIB,;t t s, at LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t @@ -19775,9 +19312,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -19795,21 +19332,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19825,10 +19362,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -19866,45 +19403,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -19922,7 +19426,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -19931,24 +19435,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -19989,41 +19493,16 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. if test "$ac_dir" != .; then @@ -20049,45 +19528,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 From gaeke at cs.uiuc.edu Tue Sep 7 14:03:45 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Tue, 7 Sep 2004 14:03:45 -0500 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200409071903.OAA23321@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.193 -> 1.194 --- Log message: Use libtool, not mklib (which somehow doesn't get generated anymore) --- Diffs of the changes: (+1 -1) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.193 llvm/Makefile.rules:1.194 --- llvm/Makefile.rules:1.193 Sun Sep 5 11:39:01 2004 +++ llvm/Makefile.rules Tue Sep 7 14:03:35 2004 @@ -210,7 +210,7 @@ # # Libtool is found in the current directory. # -LIBTOOL := $(LLVM_OBJ_ROOT)/mklib +LIBTOOL := $(LLVM_OBJ_ROOT)/libtool # # If we're not building a shared library, use the disable-shared tag with From brukman at cs.uiuc.edu Tue Sep 7 19:05:04 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 19:05:04 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409080005.TAA31468@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.14 -> 1.15 --- Log message: Add the footer style, adapted from the docs. --- Diffs of the changes: (+2 -0) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.14 llvm-www/llvm.css:1.15 --- llvm-www/llvm.css:1.14 Tue Sep 7 00:10:57 2004 +++ llvm-www/llvm.css Tue Sep 7 19:04:53 2004 @@ -42,6 +42,8 @@ padding: 0 1em 0 1em; display: table; } +.www_footer { text-align: left; padding: 0 0 0 0 } + /* Publications */ .pub_title { font-family: "Georgia,Palatino,Times,Roman"; font-size: 24pt; From brukman at cs.uiuc.edu Tue Sep 7 19:05:27 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 7 Sep 2004 19:05:27 -0500 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200409080005.TAA31589@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.11 -> 1.12 --- Log message: Use the website styles, not the ones from documentation. --- Diffs of the changes: (+4 -4) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.11 llvm-www/testresults/index.html:1.12 --- llvm-www/testresults/index.html:1.11 Fri Aug 6 13:46:29 2004 +++ llvm-www/testresults/index.html Tue Sep 7 19:05:17 2004 @@ -7,11 +7,11 @@ -
    +
    Automated LLVM Test Results
    -
    +

    This directory contains test results which are automatically generated every night on the following platforms. This system is still under development, but @@ -39,11 +39,11 @@


    - From alkis at cs.uiuc.edu Tue Sep 7 22:02:00 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Tue, 7 Sep 2004 22:02:00 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.h LiveIntervalAnalysis.cpp Message-ID: <200409080302.WAA00551@zion.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: LiveIntervalAnalysis.h updated: 1.41 -> 1.42 LiveIntervalAnalysis.cpp updated: 1.124 -> 1.125 --- Log message: Use a DenseMap for mapping reg->reg. This improves the LiveInterval analysis running time from 2.7869secs to 2.5226secs on 176.gcc. --- Diffs of the changes: (+12 -9) Index: llvm/lib/CodeGen/LiveIntervalAnalysis.h diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.h:1.41 llvm/lib/CodeGen/LiveIntervalAnalysis.h:1.42 --- llvm/lib/CodeGen/LiveIntervalAnalysis.h:1.41 Thu Aug 26 17:22:38 2004 +++ llvm/lib/CodeGen/LiveIntervalAnalysis.h Tue Sep 7 22:01:50 2004 @@ -20,6 +20,7 @@ #ifndef LLVM_CODEGEN_LIVEINTERVAL_ANALYSIS_H #define LLVM_CODEGEN_LIVEINTERVAL_ANALYSIS_H +#include "llvm/ADT/DenseMap.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "LiveInterval.h" @@ -44,7 +45,7 @@ typedef std::map Reg2IntervalMap; Reg2IntervalMap r2iMap_; - typedef std::map Reg2RegMap; + typedef DenseMap Reg2RegMap; Reg2RegMap r2rMap_; std::vector allocatableRegs_; @@ -171,11 +172,11 @@ } /// rep - returns the representative of this register - unsigned rep(unsigned reg) { - Reg2RegMap::iterator it = r2rMap_.find(reg); - if (it != r2rMap_.end()) - return it->second = rep(it->second); - return reg; + unsigned rep(unsigned Reg) { + unsigned Rep = r2rMap_[Reg]; + if (Rep) + return r2rMap_[Reg] = rep(Rep); + return Reg; } void printRegName(unsigned reg) const; Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.124 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.125 --- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.124 Fri Sep 3 13:25:53 2004 +++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp Tue Sep 7 22:01:50 2004 @@ -619,6 +619,8 @@ void LiveIntervals::joinIntervals() { DEBUG(std::cerr << "********** JOINING INTERVALS ***********\n"); + // reserve space for the reg2reg map + r2rMap_.grow(mf_->getSSARegMap()->getLastVirtReg()); const LoopInfo &LI = getAnalysis(); if (LI.begin() == LI.end()) { @@ -644,9 +646,9 @@ } DEBUG(std::cerr << "*** Register mapping ***\n"); - DEBUG(for (std::map::iterator I = r2rMap_.begin(), - E = r2rMap_.end(); I != E; ++I) - std::cerr << " reg " << I->first << " -> reg " << I->second << "\n";); + DEBUG(for (int i = 0, e = r2rMap_.size(); i != e; ++i) + if (r2rMap_[i]) + std::cerr << " reg " << i << " -> reg " << r2rMap_[i] << "\n"); } /// Return true if the two specified registers belong to different register From alkis at cs.uiuc.edu Wed Sep 8 11:55:05 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 11:55:05 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td Message-ID: <200409081655.LAA07691@zion.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: X86InstrInfo.td updated: 1.101 -> 1.102 --- Log message: A call instruction should implicitely define ST0 since the return value is returned in that register. The pseudo instructions FpGETRESULT and FpSETRESULT shold also have an implicity use and def of ST0 repsecitvely. --- Diffs of the changes: (+8 -3) Index: llvm/lib/Target/X86/X86InstrInfo.td diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.101 llvm/lib/Target/X86/X86InstrInfo.td:1.102 --- llvm/lib/Target/X86/X86InstrInfo.td:1.101 Wed Aug 11 02:12:02 2004 +++ llvm/lib/Target/X86/X86InstrInfo.td Wed Sep 8 11:54:54 2004 @@ -177,7 +177,7 @@ // let isCall = 1 in // All calls clobber the non-callee saved registers... - let Defs = [EAX, ECX, EDX, FP0, FP1, FP2, FP3, FP4, FP5, FP6] in { + let Defs = [EAX, ECX, EDX, FP0, FP1, FP2, FP3, FP4, FP5, FP6, ST0] in { def CALLpcrel32 : I<0xE8, RawFrm, (ops calltarget:$dst), "call $dst">; def CALL32r : I<0xFF, MRM2r, (ops R32:$dst), "call $dst">; def CALL32m : I<0xFF, MRM2m, (ops i32mem:$dst), "call $dst">; @@ -885,8 +885,13 @@ def FpMUL : FPI<0, Pseudo, TwoArgFP , (ops RFP, RFP, RFP), "">; // f1 = fmul f2, f3 def FpDIV : FPI<0, Pseudo, TwoArgFP , (ops RFP, RFP, RFP), "">; // f1 = fdiv f2, f3 -def FpGETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // FPR = ST(0) -def FpSETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // ST(0) = FPR +let Uses = [ST0] in { + def FpGETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // FPR = ST(0) +} + +let Defs = [ST0] in { + def FpSETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // ST(0) = FPR +} // FADD reg, mem: Before stackification, these are represented by: R1 = FADD* R2, [mem] def FADD32m : FPI<0xD8, MRM0m, OneArgFPRW, (ops f32mem:$src), "fadd $src">; // ST(0) = ST(0) + [mem32real] From alkis at cs.uiuc.edu Wed Sep 8 13:29:42 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 13:29:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td Message-ID: <200409081829.NAA26207@zion.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: X86InstrInfo.td updated: 1.102 -> 1.103 --- Log message: Use a shorter form to express implicit use/defs in FpGETRESULT and FpSETRESULT. --- Diffs of the changes: (+4 -6) Index: llvm/lib/Target/X86/X86InstrInfo.td diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.102 llvm/lib/Target/X86/X86InstrInfo.td:1.103 --- llvm/lib/Target/X86/X86InstrInfo.td:1.102 Wed Sep 8 11:54:54 2004 +++ llvm/lib/Target/X86/X86InstrInfo.td Wed Sep 8 13:29:31 2004 @@ -885,13 +885,11 @@ def FpMUL : FPI<0, Pseudo, TwoArgFP , (ops RFP, RFP, RFP), "">; // f1 = fmul f2, f3 def FpDIV : FPI<0, Pseudo, TwoArgFP , (ops RFP, RFP, RFP), "">; // f1 = fdiv f2, f3 -let Uses = [ST0] in { - def FpGETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // FPR = ST(0) -} +def FpGETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">, + Imp<[ST0], []>; // FPR = ST(0) -let Defs = [ST0] in { - def FpSETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">; // ST(0) = FPR -} +def FpSETRESULT : FPI<0, Pseudo, SpecialFP, (ops RFP), "">, + Imp<[], [ST0]>; // ST(0) = FPR // FADD reg, mem: Before stackification, these are represented by: R1 = FADD* R2, [mem] def FADD32m : FPI<0xD8, MRM0m, OneArgFPRW, (ops f32mem:$src), "fadd $src">; // ST(0) = ST(0) + [mem32real] From brukman at cs.uiuc.edu Wed Sep 8 14:08:45 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 14:08:45 -0500 Subject: [llvm-commits] CVS: llvm-www/llvm.css Message-ID: <200409081908.OAA03771@zion.cs.uiuc.edu> Changes in directory llvm-www: llvm.css updated: 1.15 -> 1.16 --- Log message: Add no-border image links and address style on the bottom of pages from docs. --- Diffs of the changes: (+6 -0) Index: llvm-www/llvm.css diff -u llvm-www/llvm.css:1.15 llvm-www/llvm.css:1.16 --- llvm-www/llvm.css:1.15 Tue Sep 7 19:04:53 2004 +++ llvm-www/llvm.css Wed Sep 8 14:08:34 2004 @@ -2,6 +2,12 @@ * LLVM website style sheet */ +/* No borders on image links */ +a:link img, a:visited img { border-style: none } + +address img { float: right; width: 88px; height: 31px; } +address { clear: right; } + /* Main website */ .www_title { font-family: "Georgia,Palatino,Times,Roman"; font-size: 33pt; From brukman at cs.uiuc.edu Wed Sep 8 14:09:13 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 14:09:13 -0500 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200409081909.OAA03893@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.13 -> 1.14 --- Log message: Add "Valid HTML 4.01" and "Valid CSS" buttons to the page. --- Diffs of the changes: (+10 -6) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.13 llvm-www/testresults/index.html:1.14 --- llvm-www/testresults/index.html:1.13 Tue Sep 7 19:14:22 2004 +++ llvm-www/testresults/index.html Wed Sep 8 14:09:03 2004 @@ -44,12 +44,16 @@

    - +
    + Valid CSS! + Valid HTML 4.01! + + Chris Lattner
    + The LLVM Compiler Infrastructure
    + Last modified: $Date: 2004/09/08 19:09:03 $ +
    From brukman at cs.uiuc.edu Wed Sep 8 14:15:46 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 14:15:46 -0500 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200409081915.OAA04688@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.14 -> 1.15 --- Log message: Use the standard website header and footer to get the nice header and nav bar. --- Diffs of the changes: (+2 -25) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.14 llvm-www/testresults/index.html:1.15 --- llvm-www/testresults/index.html:1.14 Wed Sep 8 14:09:03 2004 +++ llvm-www/testresults/index.html Wed Sep 8 14:15:36 2004 @@ -1,15 +1,4 @@ - - - - Automated LLVM Test Results - - - - -
    - LLVM Compiler Infrastructure -
    +
    Automated LLVM Test Results @@ -43,17 +32,5 @@
    -
    -
    - Valid CSS! - Valid HTML 4.01! - - Chris Lattner
    - The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/09/08 19:09:03 $ -
    - - + From alkis at cs.uiuc.edu Wed Sep 8 14:26:23 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 14:26:23 -0500 Subject: [llvm-commits] CVS: llvm-java/docs/object-layout.txt Message-ID: <200409081926.OAA05593@zion.cs.uiuc.edu> Changes in directory llvm-java/docs: object-layout.txt updated: 1.1 -> 1.2 --- Log message: Update object layout description. --- Diffs of the changes: (+68 -57) Index: llvm-java/docs/object-layout.txt diff -u llvm-java/docs/object-layout.txt:1.1 llvm-java/docs/object-layout.txt:1.2 --- llvm-java/docs/object-layout.txt:1.1 Thu Apr 15 16:00:49 2004 +++ llvm-java/docs/object-layout.txt Wed Sep 8 14:26:13 2004 @@ -1,59 +1,70 @@ -Object layout for Java objects and array objects ------------------------------------------------- +Object layout for Java objects +------------------------------ -1) objects +Each Java object will have the following basic layout: - Need extensible header for the use of: - - a) VM: locking, hashing, dynamic type checking, virtual function - invocation. - - b) GC: garbage collection (can be the reference count for a - reference counting garbage collector) - - obj_t : { , , , ..., } - - +--------+ <-- pointer to object - | header | - +--------+ - | field1 | - +--------+ - | field2 | - +--------+ - | ...... | - +--------+ - | fieldN | - +--------+ - -2) arrays - - +--------+ <-- pointer to array object - | len | - +--------+ - | header | - +--------+ - | obj_t* | - +--------+ - | ...... | - +--------+ - | ...... | - +--------+ - - array_object_t : { uint, , [ 0 x * ] } - - -Type information for java objects ---------------------------------- - -VM_Class object for each class. This object needs at least the -following fields: - -a) pointer to VM_Class object of its super class -b) list of interfaces implemented -c) list of field descriptors -d) list of methods (static, constructor, virtual, finalizer) -e) list of attributes (constant value, code, exceptions, inner -classes, synthetic, source file, line number table, local variable -table, deprecated) - -We would most likely need a method dispatch table as well (vtable). +struct llvm_java_object_base { + llvm_java_object_header header; + llvm_java_object_vtable* vtable; +} + +Additional fields go to the end of the struct. + + + +The 'llvm_java_object_header' is not defined yet. + +struct llvm_java_object_header { + // gc info, hash info, locking +} + + + +The vtable holds a nested struct of a 'llvm_java_object_typeinfo' +object. All methods are added after the nested struct and calls to +them are made by fetching the correct function pointer from the vtable +at runtime. + +struct llvm_java_object_vtable { + java_object_typeinfo typeinfo; +} + + + +For each class we keep track of its depth and an array of vtables to +all its superclasses. The depth of a class is the number of +superclasses it has. So java.lang.Object has depth 0, class A (extends +java.lang.Object) has depth 1 and so on. We also keep an array of +pointers to interface vtables. Each interface (vtable) gets a unique +number and it is indexed to this array. This mostly empty array is +filled up to the last interface implemented (the interface with the +largest index in this array). Since interfaces cannot implement other +interfaces (they can only extend) the lastIface and interfaces are +used to differentiate between class typeinfo's and interface +typeinfo's. More specifically if interfaces == -1 then this typeinfo +is for an interface and the lastIface field is the unique number of +this interface in the objects interfaces array. + +struct llvm_java_object_typeinfo { + uint depth; + llvm_java_object_vtable* vtables; + uint lastIface; + llvm_java_object_vtable* interfaces; +} + +The structure of llvm_java_object_typeinfo allows constant time +dynamic type checks: + +bool isInstanceOf(llvm_java_object_base* obj, llvm_java_object_vtable* clazz) { + llvm_java_object_vtable* objClazz = obj->vtable; + if (objClazz == clazz) + return true; + // we are checking against a class' typeinfo + if (clazz->interfaces != -1) + return objClazz->depth > clazz->depth && + objClazz->vtables[clazz->depth] == clazz; + // otherwise we are checking against an interface's typeinfo + else + return objClazz->lastIface >= clazz->lastIface && + objClazz->interfaces[class->lastIface]; +} From brukman at cs.uiuc.edu Wed Sep 8 14:48:26 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 14:48:26 -0500 Subject: [llvm-commits] CVS: llvm/tools/llee/Makefile Message-ID: <200409081948.OAA07718@zion.cs.uiuc.edu> Changes in directory llvm/tools/llee: Makefile updated: 1.6 -> 1.7 --- Log message: Make file comment span the entire line --- Diffs of the changes: (+1 -1) Index: llvm/tools/llee/Makefile diff -u llvm/tools/llee/Makefile:1.6 llvm/tools/llee/Makefile:1.7 --- llvm/tools/llee/Makefile:1.6 Wed Aug 4 16:19:27 2004 +++ llvm/tools/llee/Makefile Wed Sep 8 14:48:15 2004 @@ -1,4 +1,4 @@ -##===- tools/llee/Makefile ------------------------------*- Makefile -*-===## +##===- tools/llee/Makefile ---------------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # From alkis at cs.uiuc.edu Wed Sep 8 15:10:20 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 15:10:20 -0500 Subject: [llvm-commits] CVS: llvm-java/docs/object-layout.txt Message-ID: <200409082010.PAA09966@zion.cs.uiuc.edu> Changes in directory llvm-java/docs: object-layout.txt updated: 1.2 -> 1.3 --- Log message: Fixup code and struct declarations. --- Diffs of the changes: (+18 -17) Index: llvm-java/docs/object-layout.txt diff -u llvm-java/docs/object-layout.txt:1.2 llvm-java/docs/object-layout.txt:1.3 --- llvm-java/docs/object-layout.txt:1.2 Wed Sep 8 14:26:13 2004 +++ llvm-java/docs/object-layout.txt Wed Sep 8 15:10:09 2004 @@ -4,9 +4,9 @@ Each Java object will have the following basic layout: struct llvm_java_object_base { - llvm_java_object_header header; - llvm_java_object_vtable* vtable; -} + struct llvm_java_object_header header; + struct llvm_java_object_vtable* vtable; +}; Additional fields go to the end of the struct. @@ -16,7 +16,7 @@ struct llvm_java_object_header { // gc info, hash info, locking -} +}; @@ -26,8 +26,8 @@ at runtime. struct llvm_java_object_vtable { - java_object_typeinfo typeinfo; -} + struct java_object_typeinfo typeinfo; +}; @@ -47,24 +47,25 @@ struct llvm_java_object_typeinfo { uint depth; - llvm_java_object_vtable* vtables; + struct llvm_java_object_vtable* vtables; uint lastIface; - llvm_java_object_vtable* interfaces; -} + struct llvm_java_object_vtable* interfaces; +}; The structure of llvm_java_object_typeinfo allows constant time dynamic type checks: -bool isInstanceOf(llvm_java_object_base* obj, llvm_java_object_vtable* clazz) { - llvm_java_object_vtable* objClazz = obj->vtable; +int isInstanceOf(struct llvm_java_object_base* obj, + struct llvm_java_object_vtable* clazz) { + struct llvm_java_object_vtable* objClazz = obj->vtable; if (objClazz == clazz) - return true; + return 1; // we are checking against a class' typeinfo - if (clazz->interfaces != -1) - return objClazz->depth > clazz->depth && - objClazz->vtables[clazz->depth] == clazz; + if (clazz->typeinfo.interfaces != (struct llvm_java_object_vtable*)-1) + return objClazz->typeinfo.depth > clazz->typeinfo.depth && + &objClazz->typeinfo.vtables[clazz->typeinfo.depth] == clazz; // otherwise we are checking against an interface's typeinfo else - return objClazz->lastIface >= clazz->lastIface && - objClazz->interfaces[class->lastIface]; + return objClazz->typeinfo.lastIface >= clazz->typeinfo.lastIface && + &objClazz->typeinfo.interfaces[clazz->typeinfo.lastIface]; } From alkis at cs.uiuc.edu Wed Sep 8 15:18:36 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 15:18:36 -0500 Subject: [llvm-commits] CVS: llvm-java/test/Programs/SingleSource/Makefile.singlesrc Message-ID: <200409082018.PAA11793@zion.cs.uiuc.edu> Changes in directory llvm-java/test/Programs/SingleSource: Makefile.singlesrc updated: 1.4 -> 1.5 --- Log message: Add instcombine to the optimization passes. --- Diffs of the changes: (+1 -1) Index: llvm-java/test/Programs/SingleSource/Makefile.singlesrc diff -u llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.4 llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.5 --- llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.4 Sun Aug 15 05:07:31 2004 +++ llvm-java/test/Programs/SingleSource/Makefile.singlesrc Wed Sep 8 15:18:25 2004 @@ -11,6 +11,6 @@ %.raw.bc: %.class $(CLASS2LLVM) @$(ECHO) Compiling $< $(CLASS2LLVM) -cp $(CLASSPATH):Output $(subst /,.,$(*F)) | \ - $(LOPT) -simplifycfg -mem2reg > $@ + $(LOPT) -simplifycfg -instcombine -mem2reg > $@ include $(LEVEL)/test/Makefile.test From alkis at cs.uiuc.edu Wed Sep 8 15:28:41 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Wed, 8 Sep 2004 15:28:41 -0500 Subject: [llvm-commits] CVS: llvm-java/test/Programs/SingleSource/Makefile.singlesrc Message-ID: <200409082028.PAA12246@zion.cs.uiuc.edu> Changes in directory llvm-java/test/Programs/SingleSource: Makefile.singlesrc updated: 1.5 -> 1.6 --- Log message: Move instcombine after mem2reg. --- Diffs of the changes: (+1 -1) Index: llvm-java/test/Programs/SingleSource/Makefile.singlesrc diff -u llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.5 llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.6 --- llvm-java/test/Programs/SingleSource/Makefile.singlesrc:1.5 Wed Sep 8 15:18:25 2004 +++ llvm-java/test/Programs/SingleSource/Makefile.singlesrc Wed Sep 8 15:28:31 2004 @@ -11,6 +11,6 @@ %.raw.bc: %.class $(CLASS2LLVM) @$(ECHO) Compiling $< $(CLASS2LLVM) -cp $(CLASSPATH):Output $(subst /,.,$(*F)) | \ - $(LOPT) -simplifycfg -instcombine -mem2reg > $@ + $(LOPT) -simplifycfg -mem2reg -instcombine > $@ include $(LEVEL)/test/Makefile.test From brukman at cs.uiuc.edu Wed Sep 8 15:30:37 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 15:30:37 -0500 Subject: [llvm-commits] CVS: llvm/runtime/Makefile Message-ID: <200409082030.PAA13388@zion.cs.uiuc.edu> Changes in directory llvm/runtime: Makefile updated: 1.20 -> 1.21 --- Log message: Disable libprofile as it breaks the build on Sparc (autoconf issues). --- Diffs of the changes: (+6 -0) Index: llvm/runtime/Makefile diff -u llvm/runtime/Makefile:1.20 llvm/runtime/Makefile:1.21 --- llvm/runtime/Makefile:1.20 Fri Sep 3 18:19:53 2004 +++ llvm/runtime/Makefile Wed Sep 8 15:30:26 2004 @@ -21,6 +21,12 @@ @echo '********' Warning: and re-run configure if it does not. endif +# Disable libprofile: a faulty libtool is generated by autoconf which breaks the +# build on Sparc +ifeq ($(ARCH), Sparc) +PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS)) +endif + include $(LEVEL)/Makefile.common # Install target for libraries: Copy into $LLVMGCCDIR/bytecode-libs From gaeke at cs.uiuc.edu Wed Sep 8 15:32:22 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 15:32:22 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200409082032.PAA13776@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.110 -> 1.111 --- Log message: recognize MinGW --- Diffs of the changes: (+4 -0) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.110 llvm/autoconf/configure.ac:1.111 --- llvm/autoconf/configure.ac:1.110 Tue Sep 7 12:35:16 2004 +++ llvm/autoconf/configure.ac Wed Sep 8 15:32:11 2004 @@ -110,6 +110,10 @@ AC_SUBST(OS,[Win32]) platform_type="Win32" ;; + *-*-mingw*) + AC_SUBST(OS,[Win32]) + platform_type="Win32" + ;; *) AC_SUBST(OS,[Unknown]) platform_type="Unknown" From brukman at cs.uiuc.edu Wed Sep 8 15:35:41 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Wed, 8 Sep 2004 15:35:41 -0500 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200409082035.PAA14480@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.15 -> 1.16 --- Log message: Delete extraneous tag. --- Diffs of the changes: (+1 -1) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.15 llvm-www/testresults/index.html:1.16 --- llvm-www/testresults/index.html:1.15 Wed Sep 8 14:15:36 2004 +++ llvm-www/testresults/index.html Wed Sep 8 15:35:31 2004 @@ -32,5 +32,5 @@
    - + From gaeke at cs.uiuc.edu Wed Sep 8 15:38:16 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 15:38:16 -0500 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200409082038.PAA15238@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.114 -> 1.115 --- Log message: Regenerated, to recognize mingw. --- Diffs of the changes: (+1544 -2728) Index: llvm/configure diff -u llvm/configure:1.114 llvm/configure:1.115 --- llvm/configure:1.114 Tue Sep 7 13:04:45 2004 +++ llvm/configure Wed Sep 8 15:38:05 2004 @@ -1,10 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for LLVM 1.4. +# Generated by GNU Autoconf 2.57 for LLVM 1.4. # # Report bugs to . # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -21,10 +22,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -220,17 +220,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -393,9 +392,9 @@ -tagnames=${tagnames+${tagnames},}CXX +tagnames=`echo "$tagnames,CXX" | sed 's/^,//'` -tagnames=${tagnames+${tagnames},}F77 +tagnames=`echo "$tagnames,F77" | sed 's/^,//'` # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -833,7 +832,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -873,10 +872,10 @@ # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -988,9 +987,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1103,45 +1102,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. @@ -1152,7 +1118,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1166,9 +1132,10 @@ if $ac_init_version; then cat <<\_ACEOF LLVM configure 1.4 -generated by GNU Autoconf 2.59 +generated by GNU Autoconf 2.57 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1180,7 +1147,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by LLVM $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1257,19 +1224,19 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1303,12 +1270,12 @@ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1337,7 +1304,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1356,7 +1323,7 @@ echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && + rm -f core core.* *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1436,7 +1403,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1453,13 +1420,13 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1651,7 +1618,6 @@ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 @@ -1668,7 +1634,6 @@ case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1676,20 +1641,20 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $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. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $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. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -1857,6 +1822,11 @@ platform_type="Win32" ;; + *-*-mingw*) + OS=Win32 + + platform_type="Win32" + ;; *) OS=Unknown @@ -2024,6 +1994,7 @@ (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2043,8 +2014,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 +echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 @@ -2064,23 +2035,23 @@ test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done else @@ -2154,8 +2125,8 @@ case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -2180,6 +2151,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2230,6 +2202,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2249,21 +2222,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2276,7 +2239,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2292,6 +2255,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2308,21 +2272,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2335,7 +2289,7 @@ ac_cv_prog_cxx_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2355,7 +2309,8 @@ fi fi for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2363,13 +2318,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2380,21 +2336,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2407,8 +2353,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2425,21 +2372,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2451,7 +2388,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2590,6 +2527,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2609,21 +2547,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2636,7 +2564,7 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -2652,6 +2580,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2668,21 +2597,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2695,7 +2614,7 @@ ac_cv_prog_cc_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 @@ -2722,6 +2641,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2749,16 +2669,6 @@ va_end (v); return s; } - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2785,21 +2695,11 @@ CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2812,7 +2712,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext +rm -f conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2840,28 +2740,19 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - '' \ + ''\ + '#include ' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -2869,13 +2760,14 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration #include +$ac_declaration int main () { @@ -2886,21 +2778,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2913,8 +2795,9 @@ continue fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2931,21 +2814,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2957,7 +2830,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2971,7 +2844,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3006,6 +2879,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3016,7 +2890,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3028,7 +2902,6 @@ (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 @@ -3049,6 +2922,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3066,7 +2940,6 @@ (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 @@ -3113,6 +2986,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3123,7 +2997,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3135,7 +3009,6 @@ (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 @@ -3156,6 +3029,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3173,7 +3047,6 @@ (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 @@ -3324,6 +3197,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lfl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3347,21 +3221,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3374,8 +3238,7 @@ ac_cv_lib_fl_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3391,6 +3254,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3414,21 +3278,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3441,8 +3295,7 @@ ac_cv_lib_l_yywrap=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f 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 @@ -3504,21 +3357,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3530,8 +3373,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_save_LIBS rm -f "${LEX_OUTPUT_ROOT}.c" @@ -3787,7 +3629,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld + # Canonicalize the path of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -3856,7 +3698,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &1 &5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 @@ -3998,7 +3840,7 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -4060,7 +3902,7 @@ # This must be Linux ELF. linux*) case $host_cpu in - alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh*) + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM @@ -4083,7 +3925,7 @@ lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; -nto-qnx*) +nto-qnx) lt_cv_deplibs_check_method=unknown ;; @@ -4189,7 +4031,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4192 "configure"' > conftest.$ac_ext + echo '#line 4034 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4238,7 +4080,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + ppc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -4286,6 +4128,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4302,21 +4145,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4329,8 +4162,7 @@ lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4358,6 +4190,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4378,21 +4211,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4405,11 +4228,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4431,6 +4255,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4455,6 +4280,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4466,9 +4292,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -4479,7 +4305,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -4504,7 +4330,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -4529,7 +4355,7 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -4538,6 +4364,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4549,21 +4376,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4576,7 +4393,7 @@ eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -4594,98 +4411,62 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - #include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +ac_header_compiler=no fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 -done - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error +#include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4696,8 +4477,7 @@ 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 + ac_cpp_err=$ac_c_preproc_warn_flag else ac_cpp_err= fi @@ -4705,25 +4485,144 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - : + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + 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 - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; + no:yes ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + 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 + 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 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4735,7 +4634,6 @@ (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 @@ -4782,6 +4680,7 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4792,7 +4691,7 @@ #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -4804,7 +4703,6 @@ (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 @@ -4825,6 +4723,7 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4842,7 +4741,6 @@ (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 @@ -4887,7 +4785,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 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4929,7 +4827,7 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4974,7 +4872,7 @@ # Provide some information about the compiler. -echo "$as_me:4977:" \ +echo "$as_me:4875:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -4992,10 +4890,9 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -rm -f a.out # If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) +# input file. ac_save_ext=$ac_ext ac_ext=F echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 @@ -5013,21 +4910,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5040,13 +4927,14 @@ ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 ac_ext=$ac_save_ext +G77=`test $ac_compiler_gnu = yes && echo yes` ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= @@ -5063,21 +4951,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5090,7 +4968,7 @@ ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 @@ -5098,20 +4976,18 @@ if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-g -O2" else FFLAGS="-g" fi else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then + if test "$G77" = yes; then FFLAGS="-O2" else FFLAGS= fi fi - -G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5158,12 +5034,6 @@ lt_cv_sys_max_cmd_len=8192; ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -5442,6 +5312,9 @@ # double_quote_subst'ed string. delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to undo escaping of the cmd sep variable +unescape_variable_subst='s/\\\(${_S_}\)/\1/g' + # Sed substitution to avoid accidental globbing in evaled expressions no_glob_subst='s/\*/\\\*/g' @@ -5728,13 +5601,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib" fi # Only perform the check for file, if the check method requires it @@ -5989,8 +5862,7 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6008,11 +5880,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6011: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5883: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6015: \$? = $ac_status" >&5 + echo "$as_me:5887: \$? = $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 @@ -6155,12 +6027,12 @@ linux*) case $CC in - icc* | ecc*) + icc|ecc) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - ccc*) + ccc) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' @@ -6222,8 +6094,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6241,11 +6112,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6244: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6115: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6248: \$? = $ac_status" >&5 + echo "$as_me:6119: \$? = $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 @@ -6308,11 +6179,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6311: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6182: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6315: \$? = $ac_status" >&5 + echo "$as_me:6186: \$? = $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 @@ -6322,11 +6193,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -6436,7 +6304,7 @@ ;; amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes @@ -6478,7 +6346,7 @@ else echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; - fi~ + fi${_S_} $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no @@ -6550,7 +6418,7 @@ aix3*) allow_undefined_flag=unsupported always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes @@ -6651,6 +6519,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6667,21 +6536,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6698,8 +6557,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6712,6 +6570,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6728,21 +6587,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6759,8 +6608,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -6774,13 +6622,13 @@ whole_archive_flag_spec=' ' archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes # see comment about different semantics on the GNU ld section @@ -6803,7 +6651,7 @@ # Tell ltmain to make .dll files, not .so files. shrext=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -6813,52 +6661,57 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag='-undefined dynamic_lookup' - ;; - esac - fi + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + *) # Darwin 7.0 on + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in + 10.[012]) + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + *) # 10.3 on + if test -z ${LD_TWOLEVEL_NAMESPACE}; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + allow_undefined_flag='-undefined dynamic_lookup' + fi + ;; + esac ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - else - ld_shlibs=no fi ;; @@ -6892,7 +6745,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -6901,9 +6754,9 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_libdir_separator=: @@ -7023,7 +6876,7 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; @@ -7047,8 +6900,8 @@ else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -7068,12 +6921,12 @@ no_undefined_flag=' -z text' if test "$GCC" = yes; then archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' else archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' fi hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no @@ -7162,8 +7015,8 @@ # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' hardcode_libdir_flag_spec= hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' @@ -7200,7 +7053,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds in - *'~'*) + *"$_S_"*) # FIXME: we may have to deal with multi-command sequences. ;; '$CC '*) @@ -7252,6 +7105,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var " || \ + test "X$hardcode_automatic"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6 + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + NOT-darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -7345,7 +7264,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -7378,13 +7297,13 @@ yes,cygwin* | yes,mingw* | yes,pw32*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ + postinstall_cmds='base_file=`basename \${file}`${_S_} + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} + dldir=$destdir/`dirname \$dlpath`${_S_} + test -d \$dldir || mkdir -p \$dldir${_S_} $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} + dlpath=$dir/\$dldll${_S_} $rm \$dlpath' shlibpath_overrides_runpath=yes @@ -7392,7 +7311,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -7431,16 +7350,17 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -7458,18 +7378,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -7622,18 +7530,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -7659,7 +7555,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -7672,7 +7568,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -7790,72 +7686,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -7891,6 +7721,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7914,21 +7745,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7941,8 +7762,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -7966,28 +7786,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8018,21 +7831,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8045,8 +7848,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -8061,6 +7863,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8084,21 +7887,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8111,8 +7904,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -8126,28 +7918,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8178,21 +7963,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8205,8 +7980,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -8221,6 +7995,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8244,21 +8019,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8271,8 +8036,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -8288,6 +8052,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8311,21 +8076,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8338,8 +8093,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -8355,6 +8109,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8378,21 +8133,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8405,8 +8150,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -8461,7 +8205,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag='-undefined suppress' ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag='-undefined dynamic_lookup' - ;; - esac - fi + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + *) # Darwin 7.0 on + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in + 10.[012]) + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + ;; + *) # 10.3 on + if test -z ${LD_TWOLEVEL_NAMESPACE}; then + allow_undefined_flag='-flat_namespace -undefined suppress' + else + allow_undefined_flag='-undefined dynamic_lookup' + fi + ;; + esac ;; esac - output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported whole_archive_flag_spec='-all_load $convenience' link_all_deplibs=yes - else - ld_shlibs=no - fi + fi ;; esac echo "$as_me:$LINENO: result: $enable_shared" >&5 @@ -8750,7 +8499,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -8808,7 +8557,7 @@ old_postinstall_cmds | old_postuninstall_cmds | \ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\"" ;; *) eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" @@ -8877,6 +8626,9 @@ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Set the command separator (default: ~) +_S_=\${LIBTOOL_CMD_SEP-\~} + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -8928,7 +8680,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -9382,7 +9134,7 @@ # Accept absolute paths. [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld + # Canonicalize the path of ld ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` @@ -9451,7 +9203,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &1 conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9620,21 +9373,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9651,8 +9394,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9666,6 +9408,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9682,21 +9425,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9713,8 +9446,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -9728,7 +9460,7 @@ whole_archive_flag_spec_CXX=' ' archive_cmds_need_lc_CXX=yes # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; @@ -9758,7 +9490,7 @@ else echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; - fi~ + fi${_S_} $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs_CXX=no @@ -9766,54 +9498,55 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_CXX=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_CXX='-undefined suppress' ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_CXX='-undefined dynamic_lookup' - ;; - esac - fi + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + *) # Darwin 7.0 on + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in + 10.[012]) + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + ;; + *) # 10.3 on + if test -z ${LD_TWOLEVEL_NAMESPACE}; then + allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + else + allow_undefined_flag_CXX='-undefined dynamic_lookup' + fi + ;; + esac ;; esac - lt_int_apple_cc_single_mod=no - output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='-all_load $convenience' link_all_deplibs_CXX=yes - else - ld_shlibs_CXX=no - fi + fi ;; dgux*) @@ -9840,7 +9573,7 @@ freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu) + freebsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -9862,7 +9595,7 @@ ld_shlibs_CXX=no ;; aCC) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -9875,7 +9608,7 @@ ;; *) if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support ld_shlibs_CXX=no @@ -10164,9 +9897,9 @@ cxx) allow_undefined_flag_CXX=' -expect_unresolved \*' archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done${_S_} + echo "-hidden">> $lib.exp${_S_} + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib${_S_} $rm $lib.exp' hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -10243,8 +9976,8 @@ # Sun C++ 4.2, 5.x and Centerline C++ no_undefined_flag_CXX=' -zdefs' archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_shlibpath_var_CXX=no @@ -10289,8 +10022,8 @@ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' if $CC --version | grep -v '^2\.7' > /dev/null; then archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -10300,8 +10033,8 @@ # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -10547,7 +10280,7 @@ ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -10715,8 +10448,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10734,11 +10466,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10737: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10469: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10741: \$? = $ac_status" >&5 + echo "$as_me:10473: \$? = $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 @@ -10801,11 +10533,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10804: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10536: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10808: \$? = $ac_status" >&5 + echo "$as_me:10540: \$? = $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 @@ -10815,11 +10547,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -10895,7 +10624,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds_CXX in - *'~'*) + *"$_S_"*) # FIXME: we may have to deal with multi-command sequences. ;; '$CC '*) @@ -10947,6 +10676,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var CXX" || \ + test "X$hardcode_automatic_CXX"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6 + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + NOT-darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -11040,7 +10835,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -11073,13 +10868,13 @@ yes,cygwin* | yes,mingw* | yes,pw32*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ + postinstall_cmds='base_file=`basename \${file}`${_S_} + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} + dldir=$destdir/`dirname \$dlpath`${_S_} + test -d \$dldir || mkdir -p \$dldir${_S_} $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} + dlpath=$dir/\$dldll${_S_} $rm \$dlpath' shlibpath_overrides_runpath=yes @@ -11087,7 +10882,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -11126,16 +10921,17 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -11153,18 +10949,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -11317,18 +11101,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -11354,7 +11126,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -11367,7 +11139,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -11485,72 +11257,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown @@ -11586,6 +11292,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11609,21 +11316,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11636,8 +11333,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11661,28 +11357,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11713,21 +11402,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11740,8 +11419,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -11756,6 +11434,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11779,21 +11458,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11806,8 +11475,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -11821,28 +11489,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -11873,21 +11534,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11900,8 +11551,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -11916,6 +11566,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11939,21 +11590,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11966,8 +11607,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -11983,6 +11623,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12006,21 +11647,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12033,8 +11664,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -12050,6 +11680,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12073,21 +11704,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12100,8 +11721,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -12156,7 +11776,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null | sed 1q`: +# Set the command separator (default: ~) +_S_=\${LIBTOOL_CMD_SEP-\~} + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -12501,7 +12124,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -12847,7 +12470,7 @@ aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" + archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; @@ -12991,12 +12614,12 @@ linux*) case $CC in - icc* | ecc*) + icc|ecc) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; - ccc*) + ccc) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_F77='-non_shared' @@ -13058,8 +12681,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13077,11 +12699,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13080: $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:13084: \$? = $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 @@ -13144,11 +12766,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13147: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12769: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13151: \$? = $ac_status" >&5 + echo "$as_me:12773: \$? = $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 @@ -13158,11 +12780,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -13272,7 +12891,7 @@ ;; amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_minus_L_F77=yes @@ -13314,7 +12933,7 @@ else echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; - fi~ + fi${_S_} $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no @@ -13386,7 +13005,7 @@ aix3*) allow_undefined_flag_F77=unsupported always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_F77=yes @@ -13493,21 +13112,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13524,8 +13133,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13544,21 +13152,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13575,8 +13173,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -13590,13 +13187,13 @@ whole_archive_flag_spec_F77=' ' archive_cmds_need_lc_F77=yes # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_minus_L_F77=yes # see comment about different semantics on the GNU ld section @@ -13619,7 +13216,7 @@ # Tell ltmain to make .dll files, not .so files. shrext=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. @@ -13629,52 +13226,57 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_F77=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_F77='-undefined suppress' ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_F77='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_F77='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_F77='-undefined dynamic_lookup' - ;; - esac - fi + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + *) # Darwin 7.0 on + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in + 10.[012]) + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + ;; + *) # 10.3 on + if test -z ${LD_TWOLEVEL_NAMESPACE}; then + allow_undefined_flag_F77='-flat_namespace -undefined suppress' + else + allow_undefined_flag_F77='-undefined dynamic_lookup' + fi + ;; + esac ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds_F77='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds_F77='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_F77=no hardcode_automatic_F77=yes hardcode_shlibpath_var_F77=unsupported whole_archive_flag_spec_F77='-all_load $convenience' link_all_deplibs_F77=yes - else - ld_shlibs_F77=no fi ;; @@ -13708,7 +13310,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -13717,9 +13319,9 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_F77='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_F77='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' hardcode_libdir_separator_F77=: @@ -13839,7 +13441,7 @@ hardcode_libdir_flag_spec_F77='-L$libdir' hardcode_minus_L_F77=yes allow_undefined_flag_F77=unsupported - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; @@ -13863,8 +13465,8 @@ else allow_undefined_flag_F77=' -expect_unresolved \*' archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_F77='-rpath $libdir' @@ -13884,12 +13486,12 @@ no_undefined_flag_F77=' -z text' if test "$GCC" = yes; then archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' else archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' fi hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_shlibpath_var_F77=no @@ -13978,8 +13580,8 @@ # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' hardcode_libdir_flag_spec_F77= hardcode_shlibpath_var_F77=no runpath_var='LD_RUN_PATH' @@ -14016,7 +13618,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds_F77 in - *'~'*) + *"$_S_"*) # FIXME: we may have to deal with multi-command sequences. ;; '$CC '*) @@ -14068,6 +13670,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var F77" || \ + test "X$hardcode_automatic_F77"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6 + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + NOT-darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -14161,7 +13829,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -14194,13 +13862,13 @@ yes,cygwin* | yes,mingw* | yes,pw32*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ + postinstall_cmds='base_file=`basename \${file}`${_S_} + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} + dldir=$destdir/`dirname \$dlpath`${_S_} + test -d \$dldir || mkdir -p \$dldir${_S_} $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} + dlpath=$dir/\$dldll${_S_} $rm \$dlpath' shlibpath_overrides_runpath=yes @@ -14208,7 +13876,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -14247,16 +13915,17 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -14274,18 +13943,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -14438,18 +14095,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -14475,7 +14120,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -14488,7 +14133,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -14606,73 +14251,6 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - - # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -14687,7 +14265,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -14745,7 +14323,7 @@ old_postinstall_cmds | old_postuninstall_cmds | \ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\"" ;; *) eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" @@ -14766,6 +14344,9 @@ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Set the command separator (default: ~) +_S_=\${LIBTOOL_CMD_SEP-\~} + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -14817,7 +14398,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -15124,8 +14705,7 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15143,11 +14723,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15146: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14726: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15150: \$? = $ac_status" >&5 + echo "$as_me:14730: \$? = $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 @@ -15290,12 +14870,12 @@ linux*) case $CC in - icc* | ecc*) + icc|ecc) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; - ccc*) + ccc) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' @@ -15357,8 +14937,7 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15376,11 +14955,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15379: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14958: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15383: \$? = $ac_status" >&5 + echo "$as_me:14962: \$? = $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 @@ -15443,11 +15022,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15446: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15025: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15450: \$? = $ac_status" >&5 + echo "$as_me:15029: \$? = $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 @@ -15457,11 +15036,8 @@ fi fi chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out + $rm conftest* out/* + rmdir out cd .. rmdir conftest $rm conftest* @@ -15571,7 +15147,7 @@ ;; amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_minus_L_GCJ=yes @@ -15613,7 +15189,7 @@ else echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; - fi~ + fi${_S_} $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else ld_shlibs=no @@ -15685,7 +15261,7 @@ aix3*) allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L_GCJ=yes @@ -15786,6 +15362,7 @@ allow_undefined_flag_GCJ='-berok' # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15802,21 +15379,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15833,8 +15400,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15847,6 +15413,7 @@ else # Determine the default libpath from the value encoded in an empty executable. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15863,21 +15430,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15894,8 +15451,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -15909,13 +15465,13 @@ whole_archive_flag_spec_GCJ=' ' archive_cmds_need_lc_GCJ=yes # This is similar to how AIX traditionally builds it's shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_minus_L_GCJ=yes # see comment about different semantics on the GNU ld section @@ -15938,7 +15494,7 @@ # Tell ltmain to make .dll files, not .so files. shrext=".dll" # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. @@ -15948,52 +15504,57 @@ ;; darwin* | rhapsody*) - if test "$GXX" = yes ; then + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then archive_cmds_need_lc_GCJ=no case "$host_os" in rhapsody* | darwin1.[012]) allow_undefined_flag_GCJ='-undefined suppress' ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' - ;; - 10.*) - allow_undefined_flag_GCJ='-undefined dynamic_lookup' - ;; - esac - fi + darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0 + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + *) # Darwin 7.0 on + case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in + 10.[012]) + test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + ;; + *) # 10.3 on + if test -z ${LD_TWOLEVEL_NAMESPACE}; then + allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + else + allow_undefined_flag_GCJ='-undefined dynamic_lookup' + fi + ;; + esac ;; esac + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. Also zsh mangles + # `"' quotes if we put them in here... so don't! lt_int_apple_cc_single_mod=no output_verbose_link_cmd='echo' if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds_GCJ='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' else - archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' fi - module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + module_cmds_GCJ='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no hardcode_automatic_GCJ=yes hardcode_shlibpath_var_GCJ=unsupported whole_archive_flag_spec_GCJ='-all_load $convenience' link_all_deplibs_GCJ=yes - else - ld_shlibs_GCJ=no fi ;; @@ -16027,7 +15588,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -16036,9 +15597,9 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' hardcode_libdir_separator_GCJ=: @@ -16158,7 +15719,7 @@ hardcode_libdir_flag_spec_GCJ='-L$libdir' hardcode_minus_L_GCJ=yes allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; @@ -16182,8 +15743,8 @@ else allow_undefined_flag_GCJ=' -expect_unresolved \*' archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' + archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_} + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec_GCJ='-rpath $libdir' @@ -16203,12 +15764,12 @@ no_undefined_flag_GCJ=' -z text' if test "$GCC" = yes; then archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp' else archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' fi hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_shlibpath_var_GCJ=no @@ -16297,8 +15858,8 @@ # $CC -shared without GNU ld will not create a library from C++ # object files and a static libstdc++, better avoid it by now archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_} + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp' hardcode_libdir_flag_spec_GCJ= hardcode_shlibpath_var_GCJ=no runpath_var='LD_RUN_PATH' @@ -16335,7 +15896,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then case $archive_cmds_GCJ in - *'~'*) + *"$_S_"*) # FIXME: we may have to deal with multi-command sequences. ;; '$CC '*) @@ -16387,6 +15948,72 @@ ;; esac +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var GCJ" || \ + test "X$hardcode_automatic_GCJ"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6 + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + NOT-darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + ;; + *) + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac +fi + echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= @@ -16480,7 +16107,7 @@ amigaos*) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; beos*) @@ -16513,13 +16140,13 @@ yes,cygwin* | yes,mingw* | yes,pw32*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ + postinstall_cmds='base_file=`basename \${file}`${_S_} + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_} + dldir=$destdir/`dirname \$dlpath`${_S_} + test -d \$dldir || mkdir -p \$dldir${_S_} $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_} + dlpath=$dir/\$dldll${_S_} $rm \$dlpath' shlibpath_overrides_runpath=yes @@ -16527,7 +16154,7 @@ cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix @@ -16566,16 +16193,17 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext' soname_spec='${libname}${release}${major}$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext='$(test .$module = .yes && echo .so || echo .dylib)' # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` fi sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -16593,18 +16221,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat @@ -16757,18 +16373,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -16794,7 +16398,7 @@ shlibpath_overrides_runpath=yes ;; -nto-qnx*) +nto-qnx) version_type=linux need_lib_prefix=no need_version=no @@ -16807,7 +16411,7 @@ openbsd*) version_type=sunos need_lib_prefix=no - need_version=yes + need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH @@ -16925,79 +16529,13 @@ echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -hardcode_action_GCJ= -if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var GCJ" || \ - test "X$hardcode_automatic_GCJ"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && - test "$hardcode_minus_L_GCJ" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_GCJ=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_GCJ=immediate - fi +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_GCJ=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 - -if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -fi - -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= + lt_cv_dlopen=no + lt_cv_dlopen_libs= case $host_os in beos*) @@ -17026,6 +16564,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17049,21 +16588,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17076,8 +16605,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -17101,28 +16629,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shl_load - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -17153,21 +16674,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17180,8 +16691,7 @@ ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 @@ -17196,6 +16706,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17219,21 +16730,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17246,8 +16747,7 @@ ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 @@ -17261,28 +16761,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef dlopen - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -17313,21 +16806,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17340,8 +16823,7 @@ ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 @@ -17356,6 +16838,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17379,21 +16862,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17406,8 +16879,7 @@ ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 @@ -17423,6 +16895,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17446,21 +16919,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17473,8 +16936,7 @@ ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 @@ -17490,6 +16952,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17513,21 +16976,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -17540,8 +16993,7 @@ ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 @@ -17596,7 +17048,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null | sed 1q`: +# Set the command separator (default: ~) +_S_=\${LIBTOOL_CMD_SEP-\~} + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -17941,7 +17396,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -18252,7 +17707,7 @@ # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL STRIP \ + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ @@ -18310,7 +17765,7 @@ old_postinstall_cmds | old_postuninstall_cmds | \ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\"" ;; *) eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" @@ -18331,6 +17786,9 @@ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Set the command separator (default: ~) +_S_=\${LIBTOOL_CMD_SEP-\~} + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18382,7 +17840,7 @@ NM=$lt_NM # A symbol stripping program -STRIP=$lt_STRIP +STRIP=$STRIP # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD @@ -18910,6 +18368,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18933,21 +18392,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -18960,8 +18409,7 @@ ac_cv_lib_elf_elf_begin=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 @@ -18984,6 +18432,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_dlopen=no cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19007,21 +18456,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19033,12 +18472,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_dlopen" = no; then for ac_lib in dl; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19062,21 +18501,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19089,8 +18518,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -19118,6 +18546,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_mallinfo=no cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19141,21 +18570,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19167,12 +18586,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_mallinfo" = no; then for ac_lib in malloc; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19196,21 +18615,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19223,8 +18632,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -19249,6 +18657,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_pthread_mutex_lock=no cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19272,21 +18681,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19298,12 +18697,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_pthread_mutex_lock" = no; then for ac_lib in pthread; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19327,21 +18726,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19354,8 +18743,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -19377,6 +18765,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19397,21 +18786,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19424,11 +18803,12 @@ ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19450,6 +18830,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19474,6 +18855,7 @@ : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19485,9 +18867,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -19498,7 +18880,7 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -19523,7 +18905,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -19543,6 +18925,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19569,21 +18952,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19596,7 +18969,7 @@ ac_cv_header_sys_wait_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 @@ -19636,6 +19009,7 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19646,21 +19020,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19673,7 +19037,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19681,6 +19045,7 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19698,7 +19063,6 @@ (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 @@ -19718,32 +19082,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19754,7 +19119,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + eval "$as_ac_Header=$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -19783,6 +19148,7 @@ echo "$as_me:$LINENO: checking sys/types.h usability" >&5 echo $ECHO_N "checking sys/types.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19793,21 +19159,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19820,7 +19176,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19828,6 +19184,7 @@ echo "$as_me:$LINENO: checking sys/types.h presence" >&5 echo $ECHO_N "checking sys/types.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19845,7 +19202,6 @@ (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 @@ -19865,32 +19221,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/types.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/types.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: sys/types.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: sys/types.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/types.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/types.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/types.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/types.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/types.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/types.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/types.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/types.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: sys/types.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/types.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/types.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -19928,6 +19285,7 @@ echo "$as_me:$LINENO: checking inttypes.h usability" >&5 echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19938,21 +19296,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -19965,7 +19313,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -19973,6 +19321,7 @@ echo "$as_me:$LINENO: checking inttypes.h presence" >&5 echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19990,7 +19339,6 @@ (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 @@ -20010,32 +19358,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: inttypes.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20073,6 +19422,7 @@ echo "$as_me:$LINENO: checking stdint.h usability" >&5 echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20083,21 +19433,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20110,7 +19450,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -20118,6 +19458,7 @@ echo "$as_me:$LINENO: checking stdint.h presence" >&5 echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20135,7 +19476,6 @@ (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 @@ -20155,32 +19495,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: stdint.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -20213,6 +19554,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20232,21 +19574,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20259,7 +19591,7 @@ ac_cv_type_pid_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 @@ -20279,6 +19611,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20298,21 +19631,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20325,7 +19648,7 @@ ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 @@ -20345,6 +19668,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20364,21 +19688,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20391,7 +19705,7 @@ ac_cv_type_int64_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5 echo "${ECHO_T}$ac_cv_type_int64_t" >&6 @@ -20414,6 +19728,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20433,21 +19748,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20460,7 +19765,7 @@ ac_cv_type_uint64_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 echo "${ECHO_T}$ac_cv_type_uint64_t" >&6 @@ -20478,6 +19783,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20497,21 +19803,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20524,7 +19820,7 @@ ac_cv_type_u_int64_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6 @@ -20549,6 +19845,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20569,21 +19866,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20596,7 +19883,7 @@ ac_cv_header_time=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 @@ -20614,6 +19901,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20632,21 +19920,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20659,7 +19937,7 @@ ac_cv_struct_tm=sys/time.h fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 echo "${ECHO_T}$ac_cv_struct_tm" >&6 @@ -20691,6 +19969,7 @@ { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20737,7 +20016,7 @@ ( exit $ac_status ) ac_c_printf_a=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20763,6 +20042,7 @@ else # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20784,21 +20064,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20806,6 +20076,7 @@ (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20827,21 +20098,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20854,7 +20115,7 @@ ac_cv_c_bigendian=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -20864,6 +20125,7 @@ # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20885,21 +20147,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -20921,9 +20173,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20962,10 +20215,10 @@ ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 @@ -20999,6 +20252,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21015,21 +20269,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21042,7 +20286,7 @@ ac_cv_cxx_namespaces=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21076,6 +20320,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21095,21 +20340,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21122,7 +20357,7 @@ ac_cv_cxx_have_std_ext_hash_map=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21153,6 +20388,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21172,21 +20408,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21199,7 +20425,7 @@ ac_cv_cxx_have_gnu_ext_hash_map=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21230,6 +20456,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21246,21 +20473,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21273,7 +20490,7 @@ ac_cv_cxx_have_global_hash_map=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21304,6 +20521,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21323,21 +20541,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21350,7 +20558,7 @@ ac_cv_cxx_have_std_ext_hash_set=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21381,6 +20589,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21400,21 +20609,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21427,7 +20626,7 @@ ac_cv_cxx_have_gnu_ext_hash_set=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21458,6 +20657,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21471,24 +20671,14 @@ ; return 0; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21501,7 +20691,7 @@ ac_cv_cxx_have_global_hash_set=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21532,6 +20722,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21551,21 +20742,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21578,7 +20759,7 @@ ac_cv_cxx_have_std_iterator=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21610,6 +20791,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21629,21 +20811,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21656,7 +20828,7 @@ ac_cv_cxx_have_bi_iterator=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21688,6 +20860,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21707,21 +20880,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21734,7 +20897,7 @@ ac_cv_cxx_have_fwd_iterator=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21765,6 +20928,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21775,21 +20939,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21802,7 +20956,7 @@ ac_cv_func_isnan_in_math_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21832,6 +20986,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21842,21 +20997,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21869,7 +21014,7 @@ ac_cv_func_isnan_in_cmath=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21899,6 +21044,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21909,21 +21055,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -21936,7 +21072,7 @@ ac_cv_func_std_isnan_in_cmath=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -21968,6 +21104,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21978,21 +21115,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22005,7 +21132,7 @@ ac_cv_func_isinf_in_math_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -22035,6 +21162,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22045,21 +21173,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22072,7 +21190,7 @@ ac_cv_func_isinf_in_cmath=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -22102,6 +21220,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22112,21 +21231,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22139,7 +21248,7 @@ ac_cv_func_std_isinf_in_cmath=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -22169,6 +21278,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22179,21 +21289,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22206,7 +21306,7 @@ ac_cv_func_finite_in_ieeefp_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -22234,6 +21334,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22250,21 +21351,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22277,8 +21368,7 @@ ac_cv_working_alloca_h=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 @@ -22296,6 +21386,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22332,21 +21423,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22359,8 +21440,7 @@ ac_cv_func_alloca_works=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 @@ -22390,6 +21470,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22422,28 +21503,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef $ac_func - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -22474,21 +21548,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22501,8 +21565,7 @@ eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -22527,6 +21590,7 @@ ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22572,7 +21636,7 @@ ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 @@ -22603,6 +21667,7 @@ echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22613,21 +21678,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22640,7 +21695,7 @@ ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 @@ -22648,6 +21703,7 @@ echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22665,7 +21721,6 @@ (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 @@ -22685,32 +21740,33 @@ 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: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## +## ------------------------------------ ## +## Report this to bug-autoconf at gnu.org. ## +## ------------------------------------ ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -22721,7 +21777,7 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + eval "$as_ac_Header=$ac_header_preproc" fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 @@ -22746,28 +21802,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef $ac_func - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -22798,21 +21847,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22825,8 +21864,7 @@ eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -22847,6 +21885,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22954,9 +21993,9 @@ data2 = (char *) malloc (2 * pagesize); if (!data2) exit (1); - data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) + MAP_PRIVATE | MAP_FIXED, fd, 0L)) exit (1); for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data2 + i)) @@ -22999,7 +22038,7 @@ ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 @@ -23039,6 +22078,7 @@ { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23081,7 +22121,7 @@ ( exit $ac_status ) ac_cv_func_mmap_file=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -23122,6 +22162,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23140,21 +22181,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23167,7 +22198,7 @@ ac_cv_header_mmap_anon=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -23192,6 +22223,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23218,21 +22250,11 @@ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + (eval $ac_compile) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23245,7 +22267,7 @@ ac_cv_type_signal=int fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 @@ -23273,28 +22295,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef $ac_func - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -23325,21 +22340,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23352,8 +22357,7 @@ eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 @@ -23371,28 +22375,21 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define mprotect to an innocuous variant, in case declares mprotect. - For example, HP-UX 11i declares gettimeofday. */ -#define mprotect innocuous_mprotect - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mprotect (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef mprotect - /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -23423,21 +22420,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23450,8 +22437,7 @@ ac_cv_func_mprotect=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_func_mprotect" >&5 echo "${ECHO_T}$ac_cv_func_mprotect" >&6 @@ -23482,21 +22468,11 @@ _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 + (eval $ac_link) 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); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23509,8 +22485,7 @@ ac_cv_link_use_r=no fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS="$oldcflags" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -23739,13 +22714,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -23775,13 +22750,13 @@ # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -23792,7 +22767,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -23836,10 +22811,9 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -23858,7 +22832,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -24037,17 +23011,16 @@ if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS @@ -24074,7 +23047,7 @@ cat >&5 <<_CSEOF This file was extended by LLVM $as_me 1.4, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -24118,9 +23091,9 @@ -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -24140,10 +23113,11 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ LLVM config.status 1.4 -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir @@ -24484,9 +23458,9 @@ (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end @@ -24504,21 +23478,21 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24534,10 +23508,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24575,45 +23549,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` case $INSTALL in @@ -24635,7 +23576,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -24644,24 +23585,24 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -24703,12 +23644,12 @@ # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -24717,11 +23658,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -24735,29 +23676,28 @@ case $f in -) echo $tmp/stdin ;; [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; + echo $f;; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - fi;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -24780,9 +23720,9 @@ s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -24796,13 +23736,13 @@ # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -24811,7 +23751,7 @@ # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -24838,7 +23778,7 @@ # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -24872,10 +23812,10 @@ else ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24891,10 +23831,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24939,10 +23879,10 @@ # Make relative symlinks. ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24958,10 +23898,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -24999,45 +23939,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dest_dir";; -*) - case "$ac_dest_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dest_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dest_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dest_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dest_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dest_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dest_dir" && cd $ac_top_srcdir && pwd` case $srcdir in @@ -25064,41 +23971,16 @@ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_dir=`(dirname "$ac_dest") 2>/dev/null || $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_dest" : 'X\(//\)[^/]' \| \ + X"$ac_dest" : 'X\(//\)$' \| \ + X"$ac_dest" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_dest" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. if test "$ac_dir" != .; then @@ -25124,45 +24006,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 @@ -25270,10 +24119,10 @@ as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -25311,45 +24160,12 @@ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir @@ -25373,15 +24189,15 @@ case $cache_file in [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. - ac_sub_cache_file=$ac_top_builddir$cache_file ;; + ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || - { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi From gaeke at cs.uiuc.edu Wed Sep 8 16:30:50 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 16:30:50 -0500 (CDT) Subject: [llvm-commits] CVS: reopt/test/SkipTrace.sh run-big-tests Message-ID: <200409082130.QAA10761@seraph.cs.uiuc.edu> Changes in directory reopt/test: SkipTrace.sh added (r1.1) run-big-tests added (r1.1) --- Log message: more scripts I've been using --- Diffs of the changes: (+14 -0) Index: reopt/test/SkipTrace.sh diff -c /dev/null reopt/test/SkipTrace.sh:1.1 *** /dev/null Wed Sep 8 16:30:50 2004 --- reopt/test/SkipTrace.sh Wed Sep 8 16:30:39 2004 *************** *** 0 **** --- 1,7 ---- + #!/bin/sh + trnum=$1 + shift + LLVM_REOPT="$LLVM_REOPT --skip-trace=$trnum" + export LLVM_REOPT + echo "Set LLVM_REOPT to \"$LLVM_REOPT\"" + exec ${1+"$@"} Index: reopt/test/run-big-tests diff -c /dev/null reopt/test/run-big-tests:1.1 *** /dev/null Wed Sep 8 16:30:50 2004 --- reopt/test/run-big-tests Wed Sep 8 16:30:39 2004 *************** *** 0 **** --- 1,7 ---- + #!/bin/sh + for test in art equake gzip mcf parser gap vortex bzip2 go m88ksim compress li + do + ./run-tests -clean $test + ./run-tests $test ${1+"$@"} + done + exit 0 From gaeke at cs.uiuc.edu Wed Sep 8 16:34:07 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 16:34:07 -0500 (CDT) Subject: [llvm-commits] CVS: reopt/test/TTFTestCases/ Message-ID: <200409082134.QAA11466@seraph.cs.uiuc.edu> Changes in directory reopt/test/TTFTestCases: --- Log message: Directory /home/vadve/shared/InternalCVS/reopt/test/TTFTestCases added to the repository --- Diffs of the changes: (+0 -0) From gaeke at cs.uiuc.edu Wed Sep 8 16:34:39 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 16:34:39 -0500 (CDT) Subject: [llvm-commits] CVS: reopt/test/TTFTestCases/ary3.ll ary3.main.trace1.txt ary3.main.trace2.txt fib2.ll fib2.main.trace3.txt fib2.main.trace4.txt hash.ll hash.main.trace5.txt hash.main.trace6.txt hash.main.trace7.txt heapsort.ll heapsort.main.trace8.txt lists.list_equal.trace1.txt lists.ll lists.main.trace9.txt methcall.ll methcall.main.trace10.txt methcall.main.trace11.txt nestedloop.ll nestedloop.main.trace12.txt objinst.ll objinst.main.trace13.txt objinst.main.trace14.txt random.ll random.main.trace15.txt sieve.ll sieve.main.trace16.txt sieve.main.trace17.txt strcat.ll strcat.main.trace18.txt strcat.main.trace19.txt strcat.main.trace20.txt strcat.strcat.trace1.txt Message-ID: <200409082134.QAA11694@seraph.cs.uiuc.edu> Changes in directory reopt/test/TTFTestCases: ary3.ll added (r1.1) ary3.main.trace1.txt added (r1.1) ary3.main.trace2.txt added (r1.1) fib2.ll added (r1.1) fib2.main.trace3.txt added (r1.1) fib2.main.trace4.txt added (r1.1) hash.ll added (r1.1) hash.main.trace5.txt added (r1.1) hash.main.trace6.txt added (r1.1) hash.main.trace7.txt added (r1.1) heapsort.ll added (r1.1) heapsort.main.trace8.txt added (r1.1) lists.list_equal.trace1.txt added (r1.1) lists.ll added (r1.1) lists.main.trace9.txt added (r1.1) methcall.ll added (r1.1) methcall.main.trace10.txt added (r1.1) methcall.main.trace11.txt added (r1.1) nestedloop.ll added (r1.1) nestedloop.main.trace12.txt added (r1.1) objinst.ll added (r1.1) objinst.main.trace13.txt added (r1.1) objinst.main.trace14.txt added (r1.1) random.ll added (r1.1) random.main.trace15.txt added (r1.1) sieve.ll added (r1.1) sieve.main.trace16.txt added (r1.1) sieve.main.trace17.txt added (r1.1) strcat.ll added (r1.1) strcat.main.trace18.txt added (r1.1) strcat.main.trace19.txt added (r1.1) strcat.main.trace20.txt added (r1.1) strcat.strcat.trace1.txt added (r1.1) --- Log message: Canned traces used for TraceToFunction testing. --- Diffs of the changes: (+3639 -0) Index: reopt/test/TTFTestCases/ary3.ll diff -c /dev/null reopt/test/TTFTestCases/ary3.ll:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/ary3.ll Wed Sep 8 16:34:19 2004 *************** *** 0 **** --- 1,158 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [7 x sbyte] c"%d %d\0A\00" ; <[7 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (int, sbyte**)* } { int (int, sbyte**)* %main } ; <{ int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [1 x sbyte] zeroinitializer ; <[1 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 1 ; [#uses=0] + %main.regAllocState = internal constant { uint, [86 x { int, int, uint, int }] } { uint 86, [86 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 3 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 0 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int -1! , uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 1, int 8 }, { int, int, uint, int } { int 14, int -2, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 1, int 10 }, { int, int, uint, int } { int 16, int -1, uint 1, int 10 }, { int, int, uint, int } { int 17, int -1, uint 1, int 9 }, { int, int, uint, int } { int 18, int -1, uint 1, int 0 }, { int, int, uint, int } { int 19, int -1, uint 1, int 7 }, { int, int, uint, int } { int 20, int -1, uint 1, int 0 }, { int, int, uint, int } { int 21, int -1, uint 1, int 12 }, { int, int, uint, int } { int 22, int -1, uint 1, int 0 }, { int, int, uint, int } { int 23, int -1, uint 1, int 9 }, { int, int, uint, int } { int 24, int -1, uint 1, int 0 }, { int, int, uint, int } { int 25, int -1, uint 1, int 13 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, uint, int } { int 27, int -1, uint 0, int -1 }, { int, int, uint, ! int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { in t 29, int -1, uint 1, int 10 }, { int, int, uint, int } { int 29, int -2, uint 1, int 10 }, { int, int, uint, int } { int 30, int -1, uint 1, int 1 }, { int, int, uint, int } { int 31, int -1, uint 1, int 0 }, { int, int, uint, int } { int 32, int -1, uint 0, int -1 }, { int, int, uint, int } { int 33, int -1, uint 1, int 1 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 1, int 10 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 0, int -1 }, { int, int, uint, int } { int 39, int -1, uint 1, int 2 }, { int, int, uint, int } { int 40, int -1, uint 1, int 10 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, { int, int, uint, int } { int 42, int -1, uint 1, int 11 }, { int, int, uint, int } { int 42, int -2, uint 1, int 8 }, { int, int, uint, int } { int 43, int -1, uint 0, int -1 }, { ! int, int, uint, int } { int 44, int -1, uint 0, int -1 }, { int, int, uint, int } { int 45, int -1, uint 1, int 8 }, { int, int, uint, int } { int 45, int -2, uint 1, int 8 }, { int, int, uint, int } { int 46, int -1, uint 1, int 4 }, { int, int, uint, int } { int 47, int -1, uint 1, int 4 }, { int, int, uint, int } { int 48, int -1, uint 1, int 4 }, { int, int, uint, int } { int 49, int -1, uint 1, int 3 }, { int, int, uint, int } { int 50, int -1, uint 1, int 1 }, { int, int, uint, int } { int 51, int -1, uint 1, int 0 }, { int, int, uint, int } { int 52, int -1, uint 0, int -1 }, { int, int, uint, int } { int 53, int -1, uint 1, int 3 }, { int, int, uint, int } { int 54, int -1, uint 1, int 0 }, { int, int, uint, int } { int 55, int -1, uint 0, int -1 }, { int, int, uint, int } { int 56, int -1, uint 1, int 4 }, { int, int, uint, int } { int 57, int -1, uint 0, int -1 }, { int, int, uint, int } { int 58, int -1, uint 1, int 8 }, { int, int, uint, int } { int 59, int -1, ! uint 0, int -1 }, { int, int, uint, int } { int 60, int -1, uint 0, in t -1 }, { int, int, uint, int } { int 61, int -1, uint 1, int 8 }, { int, int, uint, int } { int 62, int -1, uint 0, int -1 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 1, int 1 }, { int, int, uint, int } { int 65, int -1, uint 1, int 2 }, { int, int, uint, int } { int 66, int -1, uint 0, int -1 }, { int, int, uint, int } { int 67, int -1, uint 1, int 2 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 1, int 0 }, { int, int, uint, int } { int 70, int -1, uint 1, int 0 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } { int 72, int -1, uint 0, int -1 }, { int, int, uint, int } { int 73, int -1, uint 0, int -1 }, { int, int, uint, int } { int 74, int -1, uint 0, int -1 }, { int, int, uint, int } { int 75, int -1, uint 0, int -1 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { i! nt 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 } ] } ; <{ uint, [86 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [1 x { uint, [0 x { int, int, uint, int }] }*] } { uint 1, [1 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [86 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [1 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [22 x sbyte*] } { uint 22, [22 x sbyte*] [ sbyte* cast ([7 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [86 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [22 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 1500000 to int ; [#uses=1] + br bool %tmp.1, label %cond_true, label %cond_continue + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=1] + br label %cond_continue + + cond_continue: ; preds = %__main.entry, %cond_true + %mem_tmp.0 = phi int [ %tmp.3, %cond_true ], [ %copyConst, %__main.entry ] ; [#uses=4] + %tmp.10 = cast int %mem_tmp.0 to ulong ; [#uses=1] + %tmp.3.i1 = shl ulong %tmp.10, ubyte 2 ; [#uses=3] + %MallocAmtCast.i2 = cast ulong %tmp.3.i1 to uint ; [#uses=2] + call sbyte* %malloc( uint %MallocAmtCast.i2 ) ; :0 [#uses=1] + cast sbyte* %0 to sbyte* ; :1 [#uses=3] + call sbyte* %memset( sbyte* %1, ubyte 0, ulong %tmp.3.i1 ) ; :2 [#uses=0] + %tmp.11 = cast sbyte* %1 to int* ; [#uses=2] + call sbyte* %malloc( uint %MallocAmtCast.i2 ) ; :3 [#uses=1] + cast sbyte* %3 to sbyte* ; :4 [#uses=3] + call sbyte* %memset( sbyte* %4, ubyte 0, ulong %tmp.3.i1 ) ; :5 [#uses=0] + %tmp.15 = cast sbyte* %4 to int* ; [#uses=3] + %tmp.185 = setgt int %mem_tmp.0, 0 ; [#uses=1] + br bool %tmp.185, label %no_exit.0.preheader, label %no_exit.1.preheader + + no_exit.0.preheader: ; preds = %cond_continue + br label %no_exit.0 + + no_exit.0: ; preds = %no_exit.0.preheader, %backEdgeInst + %indvar = phi uint [ %indvar.next, %backEdgeInst ], [ 0, %no_exit.0.preheader ] ; [#uses=2] + %i.2.0 = cast uint %indvar to int ; [#uses=2] + %v9 = cast int %i.2.0 to long ; [#uses=1] + %tmp.23 = getelementptr int* %tmp.11, long %v9 ; [#uses=1] + %tmp.25 = add int %i.2.0, 1 ; [#uses=2] + store int %tmp.25, int* %tmp.23 + %tmp.18 = setlt int %tmp.25, %mem_tmp.0 ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.18, label %backEdgeInst, label %no_exit.1.preheader.loopexit + + no_exit.1.preheader.loopexit: ; preds = %no_exit.0 + br label %no_exit.1.preheader + + no_exit.1.preheader: ; preds = %cond_continue, %no_exit.1.preheader.loopexit + %tmp.31 = add int %mem_tmp.0, -1 ; [#uses=3] + %tmp.3311 = setgt int %tmp.31, -1 ; [#uses=1] + br label %no_exit.1 + + no_exit.1: ; preds = %no_exit.1.preheader, %backEdgeInst1 + %indvar19 = phi uint [ 0, %no_exit.1.preheader ], [ %indvar.next20, %backEdgeInst1 ] ; [#uses=2] + br bool %tmp.3311, label %no_exit.2.preheader, label %loopexit.2 + + no_exit.2.preheader: ; preds = %no_exit.1 + br label %no_exit.2 + + no_exit.2: ; preds = %no_exit.2.preheader, %backEdgeInst2 + %indvar15 = phi uint [ %indvar.next16, %backEdgeInst2 ], [ 0, %no_exit.2.preheader ] ; [#uses=2] + %tmp.17 = sub uint 0, %indvar15 ; [#uses=1] + %tmp.17 = cast uint %tmp.17 to int ; [#uses=1] + %i.0.2 = add int %tmp.17, %tmp.31 ; [#uses=2] + %v92 = cast int %i.0.2 to long ; [#uses=2] + %tmp.38 = getelementptr int* %tmp.15, long %v92 ; [#uses=2] + %tmp.43 = load int* %tmp.38 ; [#uses=1] + %tmp.47 = getelementptr int* %tmp.11, long %v92 ; [#uses=1] + %tmp.48 = load int* %tmp.47 ; [#uses=1] + %tmp.49 = add int %tmp.43, %tmp.48 ; [#uses=1] + store int %tmp.49, int* %tmp.38 + %dec = add int %i.0.2, -1 ; [#uses=1] + %tmp.33 = setgt int %dec, -1 ; [#uses=1] + %indvar.next16 = add uint %indvar15, 1 ; [#uses=1] + br bool %tmp.33, label %backEdgeInst2, label %loopexit.2.loopexit + + loopexit.2.loopexit: ; preds = %no_exit.2 + br label %loopexit.2 + + loopexit.2: ; preds = %no_exit.1, %loopexit.2.loopexit + %indvar.next20 = add uint %indvar19, 1 ; [#uses=1] + %exitcond = seteq uint %indvar19, 999 ; [#uses=1] + br bool %exitcond, label %loopexit.1, label %backEdgeInst1 + + loopexit.1: ; preds = %loopexit.2 + %tmp.56 = load int* %tmp.15 ; [#uses=1] + %v94 = cast int %tmp.31 to long ; [#uses=1] + %tmp.61 = getelementptr int* %tmp.15, long %v94 ; [#uses=1] + %tmp.62 = load int* %tmp.61 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [7 x sbyte]* %.str_1, long 0 ; <[7 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [7 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + %tmp.52 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", int %tmp.56, int %tmp.62 ) ; [#uses=0] + call void %free( sbyte* %1 ) + call void %free( sbyte* %4 ) + ret int 0 + + backEdgeInst: ; preds = %no_exit.0 + call void %llvm_first_trigger( ) + br label %no_exit.0 + + backEdgeInst1: ; preds = %loopexit.2 + call void %llvm_first_trigger( ) + br label %no_exit.1 + + backEdgeInst2: ; preds = %no_exit.2 + call void %llvm_first_trigger( ) + br label %no_exit.2 + } + + declare int %atoi(sbyte*) + + declare void %llvm.memset(sbyte*, ubyte, ulong, uint) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) + + declare sbyte* %memset(sbyte*, ubyte, ulong) Index: reopt/test/TTFTestCases/ary3.main.trace1.txt diff -c /dev/null reopt/test/TTFTestCases/ary3.main.trace1.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/ary3.main.trace1.txt Wed Sep 8 16:34:19 2004 *************** *** 0 **** --- 1,2 ---- + main + 6 15 Index: reopt/test/TTFTestCases/ary3.main.trace2.txt diff -c /dev/null reopt/test/TTFTestCases/ary3.main.trace2.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/ary3.main.trace2.txt Wed Sep 8 16:34:19 2004 *************** *** 0 **** --- 1,2 ---- + main + 11 17 Index: reopt/test/TTFTestCases/fib2.ll diff -c /dev/null reopt/test/TTFTestCases/fib2.ll:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/fib2.ll Wed Sep 8 16:34:19 2004 *************** *** 0 **** --- 1,191 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [5 x sbyte] c"%ld\0A\00" ; <[5 x sbyte]*> [#uses=3] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { ulong (ulong)*, int (int, sbyte**)* } { ulong (ulong)* %fib, int (int, sbyte**)* %main } ; <{ ulong (ulong)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [2 x sbyte] zeroinitializer ; <[2 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 2 ; [#uses=0] + %fib.regAllocState = internal constant { uint, [18 x { int, int, uint, int }] } { uint 18, [18 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 7 }, { int, int, uint, int } { int 0, int -1, uint 0, int -1 }, { int, int, uint, int } { int 1, int -1, uint 1, int 8 }, { int, int, uint, int } { int 1, int -2, uint 1, int 8 }, { int, int, uint, int } { int 2, int -1, uint 1, int 15 }, { int, int, uint, int } { int 2, int -2, uint 1, int 15 }, { int, int, uint, int } { int 3, int -1, uint 1, int 0 }, { int, int, uint, int } { int 4, int -1, uint 1, int 0 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 1, int 0 }, { int, int, uint, int } { int 8, int -1, uint 1, int 0 }, { int, int, uint, int } { int 9, int -1, uint 1, int 0 }, { int, int, uint, int } { int 10, int -1, uint 1, int 8 }, { int, int, uint, int } { int 11, int -1, uin! t 0, int -1 }, { int, int, uint, int } { int 12, int -1, uint 0, int -1 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 } ] } ; <{ uint, [18 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [92 x { int, int, uint, int }] } { uint 92, [92 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 3 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int -1! , uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 1, int 13 }, { int, int, uint, int } { int 15, int -2, uint 1, int 0 }, { int, int, uint, int } { int 16, int -1, uint 1, int 10 }, { int, int, uint, int } { int 17, int -1, uint 0, int -1 }, { int, int, uint, int } { int 18, int -1, uint 1, int 9 }, { int, int, uint, int } { int 18, int -2, uint 1, int 9 }, { int, int, uint, int } { int 19, int -1, uint 1, int 8 }, { int, int, uint, int } { int 19, int -2, uint 1, int 12 }, { int, int, uint, int } { int 20, int -1, uint 1, int 7 }, { int, int, uint, int } { int 21, int -1, uint 1, int 7 }, { int, int, uint, int } { int 22, int -1, uint 0, int -1 }, { int, int, uint, int } { int 23, int -1, uint 0, int -1 }, { int, int, uint, int } { int 24, int -1, uint 1, int 7 }, { int, int, uint, int } { int 25, int -1, uint 0, int -1 }, { int, int, uint! , int } { int 26, int -1, uint 1, int 11 }, { int, int, uint, int } { int 26, int -2, uint 1, int 11 }, { int, int, uint, int } { int 27, int -1, uint 1, int 12 }, { int, int, uint, int } { int 27, int -2, uint 1, int 12 }, { int, int, uint, int } { int 28, int -1, uint 1, int 0 }, { int, int, uint, int } { int 29, int -1, uint 1, int 0 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 1, int 0 }, { int, int, uint, int } { int 33, int -1, uint 1, int 0 }, { int, int, uint, int } { int 34, int -1, uint 1, int 0 }, { int, int, uint, int } { int 35, int -1, uint 1, int 11 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 }, { int, int, uint, int } { int 37, int -1, uint 1, int 12 }, { int, int, uint, int } { int 38, int -1, uint 1, int 9 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 1, int 10 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, {! int, int, uint, int } { int 42, int -1, uint 1, int 12 }, { int, int, uint, int } { int 42, int -2, uint 1, int 12 }, { int, int, uint, int } { int 43, int -1, uint 1, int 1 }, { int, int, uint, int } { int 43, int -2, uint 1, int 7 }, { int, int, uint, int } { int 44, int -1, uint 1, int 9 }, { int, int, uint, int } { int 45, int -1, uint 1, int 9 }, { int, int, uint, int } { int 46, int -1, uint 0, int -1 }, { int, int, uint, int } { int 47, int -1, uint 0, int -1 }, { int, int, uint, int } { int 48, int -1, uint 1, int 9 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 1, int 11 }, { int, int, uint, int } { int 50, int -2, uint 1, int 11 }, { int, int, uint, int } { int 51, int -1, uint 1, int 7 }, { int, int, uint, int } { int 51, int -2, uint 1, int 7 }, { int, int, uint, int } { int 52, int -1, uint 1, int 0 }, { int, int, uint, int } { int 53, int -1, uint 1, int 0 }, { int, int, uint, int } { int 54, int ! -1, uint 0, int -1 }, { int, int, uint, int } { int 55, int -1, uint 0 , int -1 }, { int, int, uint, int } { int 56, int -1, uint 1, int 0 }, { int, int, uint, int } { int 57, int -1, uint 1, int 0 }, { int, int, uint, int } { int 58, int -1, uint 1, int 0 }, { int, int, uint, int } { int 59, int -1, uint 1, int 11 }, { int, int, uint, int } { int 60, int -1, uint 0, int -1 }, { int, int, uint, int } { int 61, int -1, uint 1, int 7 }, { int, int, uint, int } { int 62, int -1, uint 1, int 12 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 1, int 1 }, { int, int, uint, int } { int 65, int -1, uint 0, int -1 }, { int, int, uint, int } { int 66, int -1, uint 1, int 0 }, { int, int, uint, int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 0, int -1 }, { int, int, uint, int } { int 70, int -1, uint 1, int 0 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } ! { int 72, int -1, uint 0, int -1 }, { int, int, uint, int } { int 73, int -1, uint 0, int -1 }, { int, int, uint, int } { int 74, int -1, uint 0, int -1 }, { int, int, uint, int } { int 75, int -1, uint 0, int -1 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 }, { int, int, uint, int } { int 80, int -1, uint 0, int -1 } ] } ; <{ uint, [92 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [2 x { uint, [0 x { int, int, uint, int }] }*] } { uint 2, [2 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [18 x { int, int, uint, int }] }* %fib.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [92 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [2 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [22 x sbyte*] } { uint 22, [22 x sbyte*] [ sbyte* cast ([5 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [18 x { int, int, uint, int }] }* %fib.regAllocState to sbyte*), sbyte* cast ({ uint, [92 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* cast (ulong (ulong)* %fib to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [22 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + internal ulong %fib(ulong %n) { + entry: + br label %tailrecurse + + tailrecurse: ; preds = %entry, %backEdgeInst + %indvar = phi ulong [ 0, %entry ], [ %indvar.next, %backEdgeInst ] ; [#uses=2] + %accumulator.tr = phi ulong [ 1, %entry ], [ %tmp.9, %backEdgeInst ] ; [#uses=2] + %indvar.neg = sub ulong 0, %indvar ; [#uses=1] + %n.tr = add ulong %indvar.neg, %n ; [#uses=2] + %tmp.1 = setlt ulong %n.tr, 2 ; [#uses=1] + br bool %tmp.1, label %return, label %else + + else: ; preds = %tailrecurse + %tmp.5 = add ulong %n.tr, 18446744073709551614 ; [#uses=1] + %tmp.3 = call ulong %fib( ulong %tmp.5 ) ; [#uses=1] + %tmp.9 = add ulong %tmp.3, %accumulator.tr ; [#uses=1] + %indvar.next = add ulong %indvar, 1 ; [#uses=1] + br label %backEdgeInst + + return: ; preds = %tailrecurse + ret ulong %accumulator.tr + + backEdgeInst: ; preds = %else + call void %llvm_first_trigger( ) + br label %tailrecurse + } + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + br bool %tmp.1, label %cond_true, label %else.i + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=1] + %tmp.114 = cast int %tmp.3 to ulong ; [#uses=2] + %tmp.1.i6 = setlt ulong %tmp.114, 2 ; [#uses=1] + br bool %tmp.1.i6, label %fib.entry, label %else.i + + else.i: ; preds = %__main.entry, %cond_true + %tmp.11.0 = phi ulong [ %tmp.114, %cond_true ], [ 43, %__main.entry ] ; [#uses=2] + %tmp.5.i = add ulong %tmp.11.0, 18446744073709551614 ; [#uses=1] + br label %tailrecurse.i9 + + tailrecurse.i9: ; preds = %else.i, %backEdgeInst21 + %indvar.i10 = phi ulong [ 0, %else.i ], [ %indvar.next.i18, %backEdgeInst21 ] ; [#uses=2] + %accumulator.tr.i11 = phi ulong [ 1, %else.i ], [ %tmp.9.i17, %backEdgeInst21 ] ; [#uses=2] + %indvar.i10.neg = sub ulong 0, %indvar.i10 ; [#uses=1] + %n.tr.i12 = add ulong %indvar.i10.neg, %tmp.5.i ; [#uses=2] + %tmp.1.i13 = setlt ulong %n.tr.i12, 2 ; [#uses=1] + br bool %tmp.1.i13, label %fib.entry19, label %else.i14 + + else.i14: ; preds = %tailrecurse.i9 + %tmp.5.i15 = add ulong %n.tr.i12, 18446744073709551614 ; [#uses=1] + br label %tailrecurse.i1 + + tailrecurse.i1: ; preds = %else.i14, %backEdgeInst + %indvar.i = phi ulong [ 0, %else.i14 ], [ %indvar.next.i, %backEdgeInst ] ; [#uses=2] + %accumulator.tr.i2 = phi ulong [ 1, %else.i14 ], [ %tmp.9.i7, %backEdgeInst ] ; [#uses=2] + %indvar.i.neg = sub ulong 0, %indvar.i ; [#uses=1] + %n.tr.i3 = add ulong %indvar.i.neg, %tmp.5.i15 ; [#uses=2] + %tmp.1.i4 = setlt ulong %n.tr.i3, 2 ; [#uses=1] + br bool %tmp.1.i4, label %fib.entry9, label %else.i5 + + else.i5: ; preds = %tailrecurse.i1 + %tmp.5.i6 = add ulong %n.tr.i3, 18446744073709551614 ; [#uses=1] + %tmp.3.i = call ulong %fib( ulong %tmp.5.i6 ) ; [#uses=1] + %tmp.9.i7 = add ulong %tmp.3.i, %accumulator.tr.i2 ; [#uses=1] + %indvar.next.i = add ulong %indvar.i, 1 ; [#uses=1] + br label %backEdgeInst + + fib.entry9: ; preds = %tailrecurse.i1 + %tmp.9.i17 = add ulong %accumulator.tr.i2, %accumulator.tr.i11 ; [#uses=1] + %indvar.next.i18 = add ulong %indvar.i10, 1 ; [#uses=1] + br label %backEdgeInst21 + + fib.entry19: ; preds = %tailrecurse.i9 + %tmp.8.i = add ulong %tmp.11.0, 18446744073709551615 ; [#uses=1] + br label %tailrecurse.i + + tailrecurse.i: ; preds = %fib.entry19, %backEdgeInst23 + %indvar.i1 = phi ulong [ 0, %fib.entry19 ], [ %indvar.next.i7, %backEdgeInst23 ] ; [#uses=2] + %accumulator.tr.i = phi ulong [ 1, %fib.entry19 ], [ %tmp.9.i6, %backEdgeInst23 ] ; [#uses=2] + %indvar.i1.neg = sub ulong 0, %indvar.i1 ; [#uses=1] + %n.tr.i = add ulong %indvar.i1.neg, %tmp.8.i ; [#uses=2] + %tmp.1.i2 = setlt ulong %n.tr.i, 2 ; [#uses=1] + br bool %tmp.1.i2, label %fib.entry8, label %else.i3 + + else.i3: ; preds = %tailrecurse.i + %tmp.5.i4 = add ulong %n.tr.i, 18446744073709551614 ; [#uses=1] + br label %tailrecurse.i10 + + tailrecurse.i10: ; preds = %else.i3, %backEdgeInst22 + %indvar.i11 = phi ulong [ 0, %else.i3 ], [ %indvar.next.i19, %backEdgeInst22 ] ; [#uses=2] + %accumulator.tr.i12 = phi ulong [ 1, %else.i3 ], [ %tmp.9.i18, %backEdgeInst22 ] ; [#uses=2] + %indvar.i11.neg = sub ulong 0, %indvar.i11 ; [#uses=1] + %n.tr.i13 = add ulong %indvar.i11.neg, %tmp.5.i4 ; [#uses=2] + %tmp.1.i14 = setlt ulong %n.tr.i13, 2 ; [#uses=1] + br bool %tmp.1.i14, label %fib.entry20, label %else.i15 + + else.i15: ; preds = %tailrecurse.i10 + %tmp.5.i16 = add ulong %n.tr.i13, 18446744073709551614 ; [#uses=1] + %tmp.3.i17 = call ulong %fib( ulong %tmp.5.i16 ) ; [#uses=1] + %tmp.9.i18 = add ulong %tmp.3.i17, %accumulator.tr.i12 ; [#uses=1] + %indvar.next.i19 = add ulong %indvar.i11, 1 ; [#uses=1] + br label %backEdgeInst22 + + fib.entry20: ; preds = %tailrecurse.i10 + %tmp.9.i6 = add ulong %accumulator.tr.i12, %accumulator.tr.i ; [#uses=1] + %indvar.next.i7 = add ulong %indvar.i1, 1 ; [#uses=1] + br label %backEdgeInst23 + + fib.entry8: ; preds = %tailrecurse.i + %tmp.9.i = add ulong %accumulator.tr.i, %accumulator.tr.i11 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [5 x sbyte]* %.str_1, long 0 ; <[5 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [5 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + call void %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", ulong %tmp.9.i ) + ret int 0 + + fib.entry: ; preds = %cond_true + "addrOfGlobal:.str_12" = getelementptr [5 x sbyte]* %.str_1, long 0 ; <[5 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_12" = getelementptr [5 x sbyte]* "addrOfGlobal:.str_12", long 0, long 0 ; [#uses=1] + call void %printf( sbyte* "constantGEP:addrOfGlobal:.str_12", ulong 1 ) + ret int 0 + + backEdgeInst: ; preds = %else.i5 + call void %llvm_first_trigger( ) + br label %tailrecurse.i1 + + backEdgeInst21: ; preds = %fib.entry9 + call void %llvm_first_trigger( ) + br label %tailrecurse.i9 + + backEdgeInst22: ; preds = %else.i15 + call void %llvm_first_trigger( ) + br label %tailrecurse.i10 + + backEdgeInst23: ; preds = %fib.entry20 + call void %llvm_first_trigger( ) + br label %tailrecurse.i + } + + declare int %atoi(sbyte*) + + declare void %printf(sbyte*, ulong) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/fib2.main.trace3.txt diff -c /dev/null reopt/test/TTFTestCases/fib2.main.trace3.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/fib2.main.trace3.txt Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,2 ---- + main + 7 8 18 Index: reopt/test/TTFTestCases/fib2.main.trace4.txt diff -c /dev/null reopt/test/TTFTestCases/fib2.main.trace4.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/fib2.main.trace4.txt Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,2 ---- + main + 13 14 20 Index: reopt/test/TTFTestCases/hash.ll diff -c /dev/null reopt/test/TTFTestCases/hash.ll:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/hash.ll Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,669 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %struct.ht_ht = type { int, %struct.ht_node**, int, %struct.ht_node*, int } + %struct.ht_node = type { sbyte*, int, %struct.ht_node* } + %.ht_prime_list_1 = internal constant [28 x ulong] [ ulong 53, ulong 97, ulong 193, ulong 389, ulong 769, ulong 1543, ulong 3079, ulong 6151, ulong 12289, ulong 24593, ulong 49157, ulong 98317, ulong 196613, ulong 393241, ulong 786433, ulong 1572869, ulong 3145739, ulong 6291469, ulong 12582917, ulong 25165843, ulong 50331653, ulong 100663319, ulong 201326611, ulong 402653189, ulong 805306457, ulong 1610612741, ulong 3221225473, ulong 4294967291 ] ; <[28 x ulong]*> [#uses=4] + %.str_1 = internal constant [15 x sbyte] c"malloc ht_node\00" ; <[15 x sbyte]*> [#uses=2] + %.str_2 = internal constant [14 x sbyte] c"strdup newkey\00" ; <[14 x sbyte]*> [#uses=2] + %.str_3 = internal constant [3 x sbyte] c"%x\00" ; <[3 x sbyte]*> [#uses=2] + %.str_4 = internal constant [3 x sbyte] c"%d\00" ; <[3 x sbyte]*> [#uses=2] + %.str_5 = internal constant [4 x sbyte] c"%d\0A\00" ; <[4 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (sbyte*, sbyte*)*, int (int, sbyte**)* } { int (sbyte*, sbyte*)* %strcmp, int (int, sbyte**)* %main } ; <{ int (sbyte*, sbyte*)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [2 x sbyte] zeroinitializer ; <[2 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 2 ; [#uses=0] + %strcmp.regAllocState = internal constant { uint, [44 x { int, int, uint, int }] } { uint 44, [44 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 8 }, { int, int, uint, int } { int 1, int -1, uint 1, int 10 }, { int, int, uint, int } { int 2, int -1, uint 1, int 15 }, { int, int, uint, int } { int 3, int -1, uint 1, int 0 }, { int, int, uint, int } { int 4, int -1, uint 1, int 16 }, { int, int, uint, int } { int 5, int -1, uint 1, int 16 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 7 }, { int, int, uint, int } { int 9, int -1, uint 1, int 9 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 0, int -1 }, { int, int, uint, int } { int 12, in! t -1, uint 0, int -1 }, { int, int, uint, int } { int 13, int -1, uint 1, int 7 }, { int, int, uint, int } { int 13, int -2, uint 1, int 7 }, { int, int, uint, int } { int 14, int -1, uint 1, int 9 }, { int, int, uint, int } { int 14, int -2, uint 1, int 9 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 0, int -1 }, { int, int, uint, int } { int 17, int -1, uint 1, int 9 }, { int, int, uint, int } { int 18, int -1, uint 1, int 9 }, { int, int, uint, int } { int 19, int -1, uint 0, int -1 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 1, int 11 }, { int, int, uint, int } { int 21, int -2, uint 1, int 11 }, { int, int, uint, int } { int 22, int -1, uint 1, int 0 }, { int, int, uint, int } { int 22, int -2, uint 1, int 0 }, { int, int, uint, int } { int 23, int -1, uint 1, int 16 }, { int, int, uint, int } { int 23, int -2, uint 1, int 16 }, { int, int, ! uint, int } { int 24, int -1, uint 1, int 11 }, { int, int, uint, int } { int 25, int -1, uint 1, int 7 }, { int, int, uint, int } { int 26, int -1, uint 1, int 9 }, { int, int, uint, int } { int 27, int -1, uint 1, int 7 }, { int, int, uint, int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 1, int 16 }, { int, int, uint, int } { int 33, int -1, uint 1, int 0 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 } ] } ; <{ uint, [44 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [430 x { int, int, uint, int }] } { uint 430, [430 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 17 }, { int, int, uint, int } { int 1, int -1, uint 1, int 0 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 1, int 2 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 1, int 2 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, in! t -1, uint 1, int 10 }, { int, int, uint, int } { int 13, int -1, uint 1, int 0 }, { int, int, uint, int } { int 14, int -1, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 1, int 0 }, { int, int, uint, int } { int 16, int -1, uint 1, int 8 }, { int, int, uint, int } { int 17, int -1, uint 1, int 7 }, { int, int, uint, int } { int 18, int -1, uint 0, int -1 }, { int, int, uint, int } { int 19, int -1, uint 0, int -1 }, { int, int, uint, int } { int 20, int -1, uint 1, int 11 }, { int, int, uint, int } { int 21, int -1, uint 0, int -1 }, { int, int, uint, int } { int 22, int -1, uint 1, int 9 }, { int, int, uint, int } { int 22, int -2, uint 1, int 9 }, { int, int, uint, int } { int 23, int -1, uint 1, int 1 }, { int, int, uint, int } { int 24, int -1, uint 1, int 1 }, { int, int, uint, int } { int 25, int -1, uint 1, int 0 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, uint, int } { int 27, int -1, uint 1, int 0 }, { int, int, uin! t, int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { int 29, int -1, uint 1, int 9 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 1, int 1 }, { int, int, uint, int } { int 32, int -2, uint 1, int 1 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 1, int 1 }, { int, int, uint, int } { int 35, int -1, uint 1, int 2 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 }, { int, int, uint, int } { int 37, int -1, uint 1, int 2 }, { int, int, uint, int } { int 38, int -1, uint 1, int 2 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 0, int -1 }, { int, int, uint, int } { int 41, int -1, uint 1, int 2 }, { int, int, uint, int } { int 42, int -1, uint 1, int 2 }, { int, int, uint, int } { int 43, int -1, uint 1, int 0 }, { int, int, uint, int } { int 44, int -1, uint 1, int 0 }, { int! , int, uint, int } { int 45, int -1, uint 1, int 7 }, { int, int, uint, int } { int 46, int -1, uint 1, int 0 }, { int, int, uint, int } { int 47, int -1, uint 0, int -1 }, { int, int, uint, int } { int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 }, { int, int, uint, int } { int 51, int -1, uint 0, int -1 }, { int, int, uint, int } { int 52, int -1, uint 0, int -1 }, { int, int, uint, int } { int 53, int -1, uint 0, int -1 }, { int, int, uint, int } { int 54, int -1, uint 0, int -1 }, { int, int, uint, int } { int 55, int -1, uint 0, int -1 }, { int, int, uint, int } { int 56, int -1, uint 0, int -1 }, { int, int, uint, int } { int 57, int -1, uint 1, int 0 }, { int, int, uint, int } { int 58, int -1, uint 1, int 0 }, { int, int, uint, int } { int 59, int -1, uint 1, int 0 }, { int, int, uint, int } { int 60, int -1, uint 1, int 9 }, { int, int, uint, int } { int 61, int -! 1, uint 1, int 10 }, { int, int, uint, int } { int 62, int -1, uint 1, int 7 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 1, int 8 }, { int, int, uint, int } { int 64, int -2, uint 1, int 8 }, { int, int, uint, int } { int 65, int -1, uint 1, int 2 }, { int, int, uint, int } { int 66, int -1, uint 1, int 2 }, { int, int, uint, int } { int 67, int -1, uint 1, int 2 }, { int, int, uint, int } { int 68, int -1, uint 1, int 2 }, { int, int, uint, int } { int 69, int -1, uint 1, int 0 }, { int, int, uint, int } { int 70, int -1, uint 0, int -1 }, { int, int, uint, int } { int 71, int -1, uint 1, int 8 }, { int, int, uint, int } { int 72, int -1, uint 0, int -1 }, { int, int, uint, int } { int 73, int -1, uint 0, int -1 }, { int, int, uint, int } { int 74, int -1, uint 1, int 2 }, { int, int, uint, int } { int 75, int -1, uint 1, int 2 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int! 78, int -1, uint 1, int 2 }, { int, int, uint, int } { int 79, int -1, uint 1, int 2 }, { int, int, uint, int } { int 80, int -1, uint 1, int 0 }, { int, int, uint, int } { int 81, int -1, uint 1, int 0 }, { int, int, uint, int } { int 82, int -1, uint 1, int 7 }, { int, int, uint, int } { int 83, int -1, uint 1, int 0 }, { int, int, uint, int } { int 84, int -1, uint 0, int -1 }, { int, int, uint, int } { int 85, int -1, uint 0, int -1 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 0, int -1 }, { int, int, uint, int } { int 88, int -1, uint 0, int -1 }, { int, int, uint, int } { int 89, int -1, uint 0, int -1 }, { int, int, uint, int } { int 90, int -1, uint 0, int -1 }, { int, int, uint, int } { int 91, int -1, uint 0, int -1 }, { int, int, uint, int } { int 92, int -1, uint 1, int 3 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, int } { int 94, int -1, uint 1, int 10 }, { in! t, int, uint, int } { int 94, int -2, uint 1, int 10 }, { int, int, ui nt, int } { int 95, int -1, uint 0, int -1 }, { int, int, uint, int } { int 96, int -1, uint 0, int -1 }, { int, int, uint, int } { int 97, int -1, uint 1, int 15 }, { int, int, uint, int } { int 97, int -2, uint 1, int 3 }, { int, int, uint, int } { int 98, int -1, uint 1, int 20 }, { int, int, uint, int } { int 98, int -2, uint 1, int 1 }, { int, int, uint, int } { int 99, int -1, uint 1, int 11 }, { int, int, uint, int } { int 100, int -1, uint 1, int 9 }, { int, int, uint, int } { int 101, int -1, uint 1, int 8 }, { int, int, uint, int } { int 102, int -1, uint 1, int 19 }, { int, int, uint, int } { int 103, int -1, uint 0, int -1 }, { int, int, uint, int } { int 104, int -1, uint 1, int 3 }, { int, int, uint, int } { int 105, int -1, uint 1, int 0 }, { int, int, uint, int } { int 106, int -1, uint 1, int 16 }, { int, int, uint, int } { int 107, int -1, uint 1, int 14 }, { int, int, uint, int } { int 108, int -1, uint 0, int -1 }, { int, int, uint, int } { int 109, int -! 1, uint 1, int 7 }, { int, int, uint, int } { int 110, int -1, uint 1, int 18 }, { int, int, uint, int } { int 111, int -1, uint 0, int -1 }, { int, int, uint, int } { int 112, int -1, uint 1, int 13 }, { int, int, uint, int } { int 113, int -1, uint 0, int -1 }, { int, int, uint, int } { int 114, int -1, uint 1, int 10 }, { int, int, uint, int } { int 114, int -2, uint 1, int 10 }, { int, int, uint, int } { int 115, int -1, uint 1, int 0 }, { int, int, uint, int } { int 116, int -1, uint 1, int 0 }, { int, int, uint, int } { int 117, int -1, uint 0, int -1 }, { int, int, uint, int } { int 118, int -1, uint 0, int -1 }, { int, int, uint, int } { int 119, int -1, uint 0, int -1 }, { int, int, uint, int } { int 120, int -1, uint 1, int 12 }, { int, int, uint, int } { int 120, int -2, uint 1, int 12 }, { int, int, uint, int } { int 121, int -1, uint 1, int 1 }, { int, int, uint, int } { int 121, int -2, uint 1, int 1 }, { int, int, uint, int } { int 122, int -1, uint 1, int 2 ! }, { int, int, uint, int } { int 123, int -1, uint 0, int -1 }, { int, int, uint, int } { int 124, int -1, uint 1, int 1 }, { int, int, uint, int } { int 125, int -1, uint 1, int 0 }, { int, int, uint, int } { int 126, int -1, uint 1, int 0 }, { int, int, uint, int } { int 127, int -1, uint 1, int 1 }, { int, int, uint, int } { int 128, int -1, uint 1, int 2 }, { int, int, uint, int } { int 129, int -1, uint 0, int -1 }, { int, int, uint, int } { int 130, int -1, uint 1, int 2 }, { int, int, uint, int } { int 131, int -1, uint 0, int -1 }, { int, int, uint, int } { int 132, int -1, uint 1, int 12 }, { int, int, uint, int } { int 133, int -1, uint 0, int -1 }, { int, int, uint, int } { int 134, int -1, uint 0, int -1 }, { int, int, uint, int } { int 135, int -1, uint 1, int 2 }, { int, int, uint, int } { int 135, int -2, uint 1, int 1 }, { int, int, uint, int } { int 136, int -1, uint 1, int 1 }, { int, int, uint, int } { int 137, int -1, uint 1, int 1 }, { int, int, uint, int } { int 138, int -1, uint 1, int 2 }, { int, int, uint, int } { int ! 139, int -1, uint 1, int 2 }, { int, int, uint, int } { int 140, int -1, uint 1, int 0 }, { int, int, uint, int } { int 141, int -1, uint 1, int 2 }, { int, int, uint, int } { int 142, int -1, uint 1, int 12 }, { int, int, uint, int } { int 143, int -1, uint 1, int 0 }, { int, int, uint, int } { int 144, int -1, uint 0, int -1 }, { int, int, uint, int } { int 145, int -1, uint 0, int -1 }, { int, int, uint, int } { int 146, int -1, uint 0, int -1 }, { int, int, uint, int } { int 147, int -1, uint 1, int 2 }, { int, int, uint, int } { int 147, int -2, uint 1, int 0 }, { int, int, uint, int } { int 148, int -1, uint 0, int -1 }, { int, int, uint, int } { int 149, int -1, uint 1, int 1 }, { int, int, uint, int } { int 150, int -1, uint 1, int 0 }, { int, int, uint, int } { int 151, int -1, uint 0, int -1 }, { int, int, uint, int } { int 152, int -1, uint 0, int -1 }, { int, int, uint, int } { int 153, int -1, uint 0, int -1 }, { int, int, uint, int } { int 154, int -1, uint 1,! int 0 }, { int, int, uint, int } { int 155, int -1, uint 0, int -1 }, { int, int, uint, int } { int 156, int -1, uint 0, int -1 }, { int, int, uint, int } { int 157, int -1, uint 0, int -1 }, { int, int, uint, int } { int 158, int -1, uint 1, int 1 }, { int, int, uint, int } { int 158, int -2, uint 1, int 1 }, { int, int, uint, int } { int 159, int -1, uint 1, int 0 }, { int, int, uint, int } { int 160, int -1, uint 1, int 0 }, { int, int, uint, int } { int 161, int -1, uint 0, int -1 }, { int, int, uint, int } { int 162, int -1, uint 0, int -1 }, { int, int, uint, int } { int 163, int -1, uint 0, int -1 }, { int, int, uint, int } { int 164, int -1, uint 1, int 12 }, { int, int, uint, int } { int 165, int -1, uint 1, int 0 }, { int, int, uint, int } { int 166, int -1, uint 1, int 0 }, { int, int, uint, int } { int 167, int -1, uint 1, int 1 }, { int, int, uint, int } { int 168, int -1, uint 1, int 1 }, { int, int, uint, int } { int 169, int -1, uint 1, int 4 }, { int, int, uint, int } { int 170, int -1, uint 0, int -1 }, { int, int, uint, int! } { int 171, int -1, uint 0, int -1 }, { int, int, uint, int } { int 172, int -1, uint 0, int -1 }, { int, int, uint, int } { int 173, int -1, uint 0, int -1 }, { int, int, uint, int } { int 174, int -1, uint 0, int -1 }, { int, int, uint, int } { int 175, int -1, uint 0, int -1 }, { int, int, uint, int } { int 176, int -1, uint 1, int 10 }, { int, int, uint, int } { int 177, int -1, uint 0, int -1 }, { int, int, uint, int } { int 178, int -1, uint 1, int 0 }, { int, int, uint, int } { int 179, int -1, uint 0, int -1 }, { int, int, uint, int } { int 180, int -1, uint 0, int -1 }, { int, int, uint, int } { int 181, int -1, uint 0, int -1 }, { int, int, uint, int } { int 182, int -1, uint 1, int 0 }, { int, int, uint, int } { int 182, int -2, uint 1, int 0 }, { int, int, uint, int } { int 183, int -1, uint 0, int -1 }, { int, int, uint, int } { int 184, int -1, uint 1, int 1 }, { int, int, uint, int } { int 185, int -1, uint 1, int 0 }, { int, int, uint, int } { int 186, int! -1, uint 0, int -1 }, { int, int, uint, int } { int 187, int -1, uint 1, int 0 }, { int, int, uint, int } { int 188, int -1, uint 0, int -1 }, { int, int, uint, int } { int 189, int -1, uint 0, int -1 }, { int, int, uint, int } { int 190, int -1, uint 0, int -1 }, { int, int, uint, int } { int 191, int -1, uint 1, int 1 }, { int, int, uint, int } { int 191, int -2, uint 1, int 1 }, { int, int, uint, int } { int 192, int -1, uint 1, int 0 }, { int, int, uint, int } { int 193, int -1, uint 1, int 0 }, { int, int, uint, int } { int 194, int -1, uint 1, int 0 }, { int, int, uint, int } { int 195, int -1, uint 1, int 5 }, { int, int, uint, int } { int 196, int -1, uint 1, int 2 }, { int, int, uint, int } { int 197, int -1, uint 1, int 0 }, { int, int, uint, int } { int 198, int -1, uint 0, int -1 }, { int, int, uint, int } { int 199, int -1, uint 0, int -1 }, { int, int, uint, int } { int 200, int -1, uint 0, int -1 }, { int, int, uint, int } { int 201, int -1, uint 0, int -1 }, { int, int, uint, int } { int 202, int -1, uint 0, int -1 }, { int, i! nt, uint, int } { int 203, int -1, uint 0, int -1 }, { int, int, uint, int } { int 204, int -1, uint 0, int -1 }, { int, int, uint, int } { int 205, int -1, uint 0, int -1 }, { int, int, uint, int } { int 206, int -1, uint 0, int -1 }, { int, int, uint, int } { int 207, int -1, uint 0, int -1 }, { int, int, uint, int } { int 208, int -1, uint 0, int -1 }, { int, int, uint, int } { int 209, int -1, uint 0, int -1 }, { int, int, uint, int } { int 210, int -1, uint 0, int -1 }, { int, int, uint, int } { int 211, int -1, uint 0, int -1 }, { int, int, uint, int } { int 212, int -1, uint 1, int 0 }, { int, int, uint, int } { int 213, int -1, uint 1, int 0 }, { int, int, uint, int } { int 214, int -1, uint 1, int 2 }, { int, int, uint, int } { int 215, int -1, uint 1, int 2 }, { int, int, uint, int } { int 216, int -1, uint 1, int 5 }, { int, int, uint, int } { int 217, int -1, uint 0, int -1 }, { int, int, uint, int } { int 218, int -1, uint 0, int -1 }, { int, int, uint, int } {! int 219, int -1, uint 0, int -1 }, { int, int, uint, int } { int 220, int -1, uint 0, int -1 }, { int, int, uint, int } { int 221, int -1, uint 0, int -1 }, { int, int, uint, int } { int 222, int -1, uint 0, int -1 }, { int, int, uint, int } { int 223, int -1, uint 1, int 0 }, { int, int, uint, int } { int 224, int -1, uint 0, int -1 }, { int, int, uint, int } { int 225, int -1, uint 0, int -1 }, { int, int, uint, int } { int 226, int -1, uint 0, int -1 }, { int, int, uint, int } { int 227, int -1, uint 1, int 0 }, { int, int, uint, int } { int 227, int -2, uint 1, int 0 }, { int, int, uint, int } { int 228, int -1, uint 0, int -1 }, { int, int, uint, int } { int 229, int -1, uint 1, int 1 }, { int, int, uint, int } { int 230, int -1, uint 1, int 0 }, { int, int, uint, int } { int 231, int -1, uint 0, int -1 }, { int, int, uint, int } { int 232, int -1, uint 1, int 0 }, { int, int, uint, int } { int 233, int -1, uint 0, int -1 }, { int, int, uint, int } { int 234, int -1, uint 0, int -1 }, { int, int, uint, int } { int 235, int -1, uint 0, in! t -1 }, { int, int, uint, int } { int 236, int -1, uint 1, int 1 }, { int, int, uint, int } { int 236, int -2, uint 1, int 1 }, { int, int, uint, int } { int 237, int -1, uint 1, int 0 }, { int, int, uint, int } { int 238, int -1, uint 1, int 0 }, { int, int, uint, int } { int 239, int -1, uint 1, int 0 }, { int, int, uint, int } { int 240, int -1, uint 1, int 4 }, { int, int, uint, int } { int 241, int -1, uint 1, int 2 }, { int, int, uint, int } { int 242, int -1, uint 1, int 0 }, { int, int, uint, int } { int 243, int -1, uint 0, int -1 }, { int, int, uint, int } { int 244, int -1, uint 0, int -1 }, { int, int, uint, int } { int 245, int -1, uint 0, int -1 }, { int, int, uint, int } { int 246, int -1, uint 0, int -1 }, { int, int, uint, int } { int 247, int -1, uint 0, int -1 }, { int, int, uint, int } { int 248, int -1, uint 0, int -1 }, { int, int, uint, int } { int 249, int -1, uint 0, int -1 }, { int, int, uint, int } { int 250, int -1, uint 0, int -1 }, { int, int, ! uint, int } { int 251, int -1, uint 0, int -1 }, { int, int, uint, int } { int 252, int -1, uint 0, int -1 }, { int, int, uint, int } { int 253, int -1, uint 0, int -1 }, { int, int, uint, int } { int 254, int -1, uint 0, int -1 }, { int, int, uint, int } { int 255, int -1, uint 0, int -1 }, { int, int, uint, int } { int 256, int -1, uint 0, int -1 }, { int, int, uint, int } { int 257, int -1, uint 0, int -1 }, { int, int, uint, int } { int 258, int -1, uint 1, int 0 }, { int, int, uint, int } { int 258, int -2, uint 1, int 0 }, { int, int, uint, int } { int 259, int -1, uint 0, int -1 }, { int, int, uint, int } { int 260, int -1, uint 0, int -1 }, { int, int, uint, int } { int 261, int -1, uint 1, int 10 }, { int, int, uint, int } { int 262, int -1, uint 0, int -1 }, { int, int, uint, int } { int 263, int -1, uint 0, int -1 }, { int, int, uint, int } { int 264, int -1, uint 1, int 12 }, { int, int, uint, int } { int 264, int -2, uint 1, int 2 }, { int, int, uint, int } { int 265, int -1, uint 1, int 10 }, { int, int, uint, int } { int 265, in! t -2, uint 1, int 0 }, { int, int, uint, int } { int 266, int -1, uint 0, int -1 }, { int, int, uint, int } { int 267, int -1, uint 0, int -1 }, { int, int, uint, int } { int 268, int -1, uint 1, int 11 }, { int, int, uint, int } { int 269, int -1, uint 1, int 9 }, { int, int, uint, int } { int 270, int -1, uint 1, int 8 }, { int, int, uint, int } { int 271, int -1, uint 0, int -1 }, { int, int, uint, int } { int 272, int -1, uint 1, int 13 }, { int, int, uint, int } { int 273, int -1, uint 0, int -1 }, { int, int, uint, int } { int 274, int -1, uint 1, int 14 }, { int, int, uint, int } { int 274, int -2, uint 1, int 14 }, { int, int, uint, int } { int 275, int -1, uint 1, int 7 }, { int, int, uint, int } { int 275, int -2, uint 1, int 16 }, { int, int, uint, int } { int 276, int -1, uint 1, int 0 }, { int, int, uint, int } { int 277, int -1, uint 1, int 0 }, { int, int, uint, int } { int 278, int -1, uint 1, int 15 }, { int, int, uint, int } { int 279, int -1, uint 1, int ! 0 }, { int, int, uint, int } { int 280, int -1, uint 1, int 0 }, { int , int, uint, int } { int 281, int -1, uint 0, int -1 }, { int, int, uint, int } { int 282, int -1, uint 0, int -1 }, { int, int, uint, int } { int 283, int -1, uint 0, int -1 }, { int, int, uint, int } { int 284, int -1, uint 1, int 18 }, { int, int, uint, int } { int 284, int -2, uint 1, int 18 }, { int, int, uint, int } { int 285, int -1, uint 1, int 1 }, { int, int, uint, int } { int 285, int -2, uint 1, int 1 }, { int, int, uint, int } { int 286, int -1, uint 1, int 0 }, { int, int, uint, int } { int 287, int -1, uint 0, int -1 }, { int, int, uint, int } { int 288, int -1, uint 1, int 1 }, { int, int, uint, int } { int 289, int -1, uint 1, int 16 }, { int, int, uint, int } { int 290, int -1, uint 1, int 16 }, { int, int, uint, int } { int 291, int -1, uint 1, int 16 }, { int, int, uint, int } { int 292, int -1, uint 1, int 0 }, { int, int, uint, int } { int 293, int -1, uint 0, int -1 }, { int, int, uint, int } { int 294, int -1, uint 1, int 0 }, { int, int, uint, int } ! { int 295, int -1, uint 0, int -1 }, { int, int, uint, int } { int 296, int -1, uint 1, int 18 }, { int, int, uint, int } { int 297, int -1, uint 0, int -1 }, { int, int, uint, int } { int 298, int -1, uint 0, int -1 }, { int, int, uint, int } { int 299, int -1, uint 1, int 16 }, { int, int, uint, int } { int 299, int -2, uint 1, int 16 }, { int, int, uint, int } { int 300, int -1, uint 1, int 0 }, { int, int, uint, int } { int 301, int -1, uint 1, int 0 }, { int, int, uint, int } { int 302, int -1, uint 1, int 16 }, { int, int, uint, int } { int 303, int -1, uint 1, int 16 }, { int, int, uint, int } { int 304, int -1, uint 1, int 18 }, { int, int, uint, int } { int 305, int -1, uint 1, int 16 }, { int, int, uint, int } { int 306, int -1, uint 0, int -1 }, { int, int, uint, int } { int 307, int -1, uint 1, int 18 }, { int, int, uint, int } { int 308, int -1, uint 0, int -1 }, { int, int, uint, int } { int 309, int -1, uint 0, int -1 }, { int, int, uint, int } { int 310, int! -1, uint 0, int -1 }, { int, int, uint, int } { int 311, int -1, uint 1, int 18 }, { int, int, uint, int } { int 311, int -2, uint 1, int 18 }, { int, int, uint, int } { int 312, int -1, uint 0, int -1 }, { int, int, uint, int } { int 313, int -1, uint 1, int 1 }, { int, int, uint, int } { int 314, int -1, uint 1, int 0 }, { int, int, uint, int } { int 315, int -1, uint 0, int -1 }, { int, int, uint, int } { int 316, int -1, uint 0, int -1 }, { int, int, uint, int } { int 317, int -1, uint 0, int -1 }, { int, int, uint, int } { int 318, int -1, uint 1, int 18 }, { int, int, uint, int } { int 319, int -1, uint 0, int -1 }, { int, int, uint, int } { int 320, int -1, uint 0, int -1 }, { int, int, uint, int } { int 321, int -1, uint 1, int 1 }, { int, int, uint, int } { int 321, int -2, uint 1, int 1 }, { int, int, uint, int } { int 322, int -1, uint 0, int -1 }, { int, int, uint, int } { int 323, int -1, uint 1, int 1 }, { int, int, uint, int } { int 323, int -2, uint 1, int 1 }, { int, int, uint, int } { int 324, int -1, uint 1, int 16 }, { int! , int, uint, int } { int 325, int -1, uint 0, int -1 }, { int, int, uint, int } { int 326, int -1, uint 1, int 16 }, { int, int, uint, int } { int 327, int -1, uint 1, int 0 }, { int, int, uint, int } { int 328, int -1, uint 0, int -1 }, { int, int, uint, int } { int 329, int -1, uint 1, int 14 }, { int, int, uint, int } { int 330, int -1, uint 0, int -1 }, { int, int, uint, int } { int 331, int -1, uint 0, int -1 }, { int, int, uint, int } { int 332, int -1, uint 1, int 1 }, { int, int, uint, int } { int 332, int -2, uint 1, int 16 }, { int, int, uint, int } { int 333, int -1, uint 0, int -1 }, { int, int, uint, int } { int 334, int -1, uint 1, int 13 }, { int, int, uint, int } { int 335, int -1, uint 0, int -1 }, { int, int, uint, int } { int 336, int -1, uint 0, int -1 }, { int, int, uint, int } { int 337, int -1, uint 1, int 9 }, { int, int, uint, int } { int 338, int -1, uint 0, int -1 }, { int, int, uint, int } { int 339, int -1, uint 1, int 10 }, { int, int, uint, in! t } { int 339, int -2, uint 1, int 10 }, { int, int, uint, int } { int 340, int -1, uint 1, int 11 }, { int, int, uint, int } { int 341, int -1, uint 1, int 7 }, { int, int, uint, int } { int 342, int -1, uint 1, int 0 }, { int, int, uint, int } { int 343, int -1, uint 0, int -1 }, { int, int, uint, int } { int 344, int -1, uint 1, int 7 }, { int, int, uint, int } { int 345, int -1, uint 0, int -1 }, { int, int, uint, int } { int 346, int -1, uint 0, int -1 }, { int, int, uint, int } { int 347, int -1, uint 0, int -1 }, { int, int, uint, int } { int 348, int -1, uint 1, int 7 }, { int, int, uint, int } { int 348, int -2, uint 1, int 7 }, { int, int, uint, int } { int 349, int -1, uint 0, int -1 }, { int, int, uint, int } { int 350, int -1, uint 1, int 8 }, { int, int, uint, int } { int 351, int -1, uint 0, int -1 }, { int, int, uint, int } { int 352, int -1, uint 1, int 0 }, { int, int, uint, int } { int 353, int -1, uint 0, int -1 }, { int, int, uint, int } { int 354, int -1, uint 1, int 7 }, { int, int, uint, int } { int 355, int -1, uint 0,! int -1 }, { int, int, uint, int } { int 356, int -1, uint 0, int -1 }, { int, int, uint, int } { int 357, int -1, uint 0, int -1 }, { int, int, uint, int } { int 358, int -1, uint 0, int -1 }, { int, int, uint, int } { int 359, int -1, uint 1, int 11 }, { int, int, uint, int } { int 360, int -1, uint 0, int -1 }, { int, int, uint, int } { int 361, int -1, uint 1, int 10 }, { int, int, uint, int } { int 362, int -1, uint 0, int -1 }, { int, int, uint, int } { int 363, int -1, uint 0, int -1 }, { int, int, uint, int } { int 364, int -1, uint 0, int -1 }, { int, int, uint, int } { int 365, int -1, uint 1, int 0 }, { int, int, uint, int } { int 366, int -1, uint 1, int 0 }, { int, int, uint, int } { int 367, int -1, uint 0, int -1 }, { int, int, uint, int } { int 368, int -1, uint 1, int 0 }, { int, int, uint, int } { int 369, int -1, uint 0, int -1 }, { int, int, uint, int } { int 370, int -1, uint 0, int -1 }, { int, int, uint, int } { int 371, int -1, uint 1, int 0 }, { int! , int, uint, int } { int 372, int -1, uint 1, int 0 }, { int, int, uin t, int } { int 373, int -1, uint 0, int -1 }, { int, int, uint, int } { int 374, int -1, uint 0, int -1 }, { int, int, uint, int } { int 375, int -1, uint 0, int -1 }, { int, int, uint, int } { int 376, int -1, uint 0, int -1 }, { int, int, uint, int } { int 377, int -1, uint 0, int -1 }, { int, int, uint, int } { int 378, int -1, uint 0, int -1 }, { int, int, uint, int } { int 379, int -1, uint 0, int -1 }, { int, int, uint, int } { int 380, int -1, uint 0, int -1 }, { int, int, uint, int } { int 381, int -1, uint 0, int -1 }, { int, int, uint, int } { int 382, int -1, uint 0, int -1 }, { int, int, uint, int } { int 383, int -1, uint 0, int -1 }, { int, int, uint, int } { int 384, int -1, uint 0, int -1 }, { int, int, uint, int } { int 385, int -1, uint 0, int -1 }, { int, int, uint, int } { int 386, int -1, uint 0, int -1 }, { int, int, uint, int } { int 387, int -1, uint 0, int -1 }, { int, int, uint, int } { int 388, int -1, uint 0, int -1 }, { int, int, uint, int } { in! t 389, int -1, uint 0, int -1 }, { int, int, uint, int } { int 390, int -1, uint 0, int -1 }, { int, int, uint, int } { int 391, int -1, uint 0, int -1 }, { int, int, uint, int } { int 392, int -1, uint 0, int -1 }, { int, int, uint, int } { int 393, int -1, uint 0, int -1 }, { int, int, uint, int } { int 394, int -1, uint 0, int -1 }, { int, int, uint, int } { int 395, int -1, uint 0, int -1 }, { int, int, uint, int } { int 396, int -1, uint 0, int -1 }, { int, int, uint, int } { int 397, int -1, uint 0, int -1 } ] } ; <{ uint, [430 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [2 x { uint, [0 x { int, int, uint, int }] }*] } { uint 2, [2 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [44 x { int, int, uint, int }] }* %strcmp.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [430 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [2 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [34 x sbyte*] } { uint 34, [34 x sbyte*] [ sbyte* cast ([28 x ulong]* %.ht_prime_list_1 to sbyte*), sbyte* cast ([15 x sbyte]* %.str_1 to sbyte*), sbyte* cast ([14 x sbyte]* %.str_2 to sbyte*), sbyte* cast ([3 x sbyte]* %.str_3 to sbyte*), sbyte* cast ([3 x sbyte]* %.str_4 to sbyte*), sbyte* cast ([4 x sbyte]* %.str_5 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [44 x { int, int, uint, int }] }* %strcmp.regAllocState to sbyte*), sbyte* cast ({ uint, [430 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* cast (int (sbyte*, sbyte*)* %strcmp to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [34 x ! sbyte*] }*> [#uses=0] + + implementation ; Functions: + + internal int %strcmp(sbyte* %p1, sbyte* %p2) { + entry: + %tmp.1 = cast sbyte* %p1 to ubyte* ; [#uses=1] + %tmp.3 = cast sbyte* %p2 to ubyte* ; [#uses=1] + %tmp.1 = load sbyte* %p1 ; [#uses=2] + %tmp.57 = cast sbyte %tmp.1 to ubyte ; [#uses=2] + %tmp.3 = load sbyte* %p2 ; [#uses=1] + %tmp.79 = cast sbyte %tmp.3 to ubyte ; [#uses=2] + %tmp.911 = seteq sbyte %tmp.1, 0 ; [#uses=1] + br bool %tmp.911, label %then, label %endif.preheader + + loopentry: ; preds = %endif + %tmp.5 = load ubyte* %inc.0.1 ; [#uses=3] + %tmp.7 = load ubyte* %inc.1.1 ; [#uses=2] + %tmp.9 = seteq ubyte %tmp.5, 0 ; [#uses=1] + br bool %tmp.9, label %then.loopexit, label %backEdgeInst + + then.loopexit: ; preds = %loopentry + br label %then + + then: ; preds = %entry, %then.loopexit + %tmp.5.0 = phi ubyte [ %tmp.57, %entry ], [ %tmp.5, %then.loopexit ] ; [#uses=1] + %tmp.7.0 = phi ubyte [ %tmp.79, %entry ], [ %tmp.7, %then.loopexit ] ; [#uses=1] + %tmp.12 = cast ubyte %tmp.5.0 to int ; [#uses=1] + %tmp.14 = cast ubyte %tmp.7.0 to int ; [#uses=1] + %tmp.14.neg = sub int 0, %tmp.14 ; [#uses=1] + %tmp.15 = add int %tmp.14.neg, %tmp.12 ; [#uses=1] + ret int %tmp.15 + + endif.preheader: ; preds = %entry + br label %endif + + endif: ; preds = %endif.preheader, %backEdgeInst + %indvar = phi ulong [ %inc.18.sum, %backEdgeInst ], [ 0, %endif.preheader ] ; [#uses=1] + %tmp.5.1 = phi ubyte [ %tmp.5, %backEdgeInst ], [ %tmp.57, %endif.preheader ] ; [#uses=2] + %tmp.7.1 = phi ubyte [ %tmp.7, %backEdgeInst ], [ %tmp.79, %endif.preheader ] ; [#uses=2] + %inc.18.sum = add ulong %indvar, 1 ; [#uses=2] + %v9 = cast ulong %inc.18.sum to long ; [#uses=2] + %inc.1.1 = getelementptr ubyte* %tmp.3, long %v9 ; [#uses=1] + %inc.0.1 = getelementptr ubyte* %tmp.1, long %v9 ; [#uses=1] + %tmp.18 = seteq ubyte %tmp.5.1, %tmp.7.1 ; [#uses=1] + br bool %tmp.18, label %loopentry, label %loopexit + + loopexit: ; preds = %endif + %tmp.21 = cast ubyte %tmp.5.1 to int ; [#uses=1] + %tmp.23 = cast ubyte %tmp.7.1 to int ; [#uses=1] + %tmp.23.neg = sub int 0, %tmp.23 ; [#uses=1] + %tmp.24 = add int %tmp.23.neg, %tmp.21 ; [#uses=1] + ret int %tmp.24 + + backEdgeInst: ; preds = %loopentry + call void %llvm_first_trigger( ) + br label %endif + } + + declare int %printf(sbyte*, ...) + + declare int %sprintf(sbyte*, sbyte*, ...) + + declare void %exit(int) + + declare void %perror(sbyte*) + + int %main(int %argc, sbyte** %argv) { + entry: + %buf = alloca [32 x sbyte] ; <[32 x sbyte]*> [#uses=8] + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i1 + + endif.0.i1: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i1 + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + br bool %tmp.1, label %cond_true, label %cond_continue + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=4] + "constantGEP:" = getelementptr %struct.ht_ht* null, uint 1 ; <%struct.ht_ht*> [#uses=1] + %constantCast = cast %struct.ht_ht* "constantGEP:" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :0 [#uses=1] + cast sbyte* %0 to %struct.ht_ht* ; <%struct.ht_ht*>:0 [#uses=7] + %tmp.76.i35 = cast int %tmp.3 to ulong ; [#uses=2] + %tmp.87.i36 = setgt ulong %tmp.76.i35, 53 ; [#uses=1] + br bool %tmp.87.i36, label %no_exit.i37.preheader, label %ht_create.entry60 + + no_exit.i37.preheader: ; preds = %cond_true + "addrOfGlobal:.ht_prime_list_1" = getelementptr [28 x ulong]* %.ht_prime_list_1, long 0 ; <[28 x ulong]*> [#uses=1] + br label %no_exit.i37 + + no_exit.i37: ; preds = %no_exit.i37.preheader, %backEdgeInst + %indvar.i38 = phi uint [ %indvar.next.i44, %backEdgeInst ], [ 0, %no_exit.i37.preheader ] ; [#uses=2] + %i.0.0.i39 = cast uint %indvar.i38 to int ; [#uses=1] + %inc.i40 = add int %i.0.0.i39, 1 ; [#uses=2] + %v9 = cast int %inc.i40 to long ; [#uses=1] + %tmp.4.i41 = getelementptr [28 x ulong]* "addrOfGlobal:.ht_prime_list_1", long 0, long %v9 ; [#uses=1] + %tmp.5.i42 = load ulong* %tmp.4.i41 ; [#uses=1] + %tmp.8.i43 = setlt ulong %tmp.5.i42, %tmp.76.i35 ; [#uses=1] + %indvar.next.i44 = add uint %indvar.i38, 1 ; [#uses=1] + br bool %tmp.8.i43, label %backEdgeInst, label %ht_create.entry60.loopexit + + ht_create.entry60.loopexit: ; preds = %no_exit.i37 + br label %ht_create.entry60 + + ht_create.entry60: ; preds = %cond_true, %ht_create.entry60.loopexit + %i.0.1.i46 = phi int [ 0, %cond_true ], [ %inc.i40, %ht_create.entry60.loopexit ] ; [#uses=1] + %tmp.12.i47 = getelementptr %struct.ht_ht* %0, long 0, uint 0 ; [#uses=1] + %v92 = cast int %i.0.1.i46 to long ; [#uses=1] + "addrOfGlobal:.ht_prime_list_13" = getelementptr [28 x ulong]* %.ht_prime_list_1, long 0 ; <[28 x ulong]*> [#uses=1] + %tmp.15.i48 = getelementptr [28 x ulong]* "addrOfGlobal:.ht_prime_list_13", long 0, long %v92 ; [#uses=1] + %tmp.16.i49 = load ulong* %tmp.15.i48 ; [#uses=1] + %tmp.17.i50 = cast ulong %tmp.16.i49 to int ; [#uses=2] + store int %tmp.17.i50, int* %tmp.12.i47 + %tmp.19.i51 = getelementptr %struct.ht_ht* %0, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + %tmp.24.i52 = cast int %tmp.17.i50 to ulong ; [#uses=1] + %tmp.3.i.i53 = shl ulong %tmp.24.i52, ubyte 3 ; [#uses=2] + %MallocAmtCast.i.i54 = cast ulong %tmp.3.i.i53 to uint ; [#uses=1] + call sbyte* %malloc( uint %MallocAmtCast.i.i54 ) ; :1 [#uses=1] + cast sbyte* %1 to sbyte* ; :2 [#uses=2] + call sbyte* %memset( sbyte* %2, ubyte 0, ulong %tmp.3.i.i53 ) ; :3 [#uses=0] + %tmp.25.i56 = cast sbyte* %2 to %struct.ht_node** ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node** %tmp.25.i56, %struct.ht_node*** %tmp.19.i51 + %tmp.27.i57 = getelementptr %struct.ht_ht* %0, long 0, uint 2 ; [#uses=1] + store int 0, int* %tmp.27.i57 + %tmp.29.i58 = getelementptr %struct.ht_ht* %0, long 0, uint 3 ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node* null, %struct.ht_node** %tmp.29.i58 + %tmp.32.i59 = getelementptr %struct.ht_ht* %0, long 0, uint 4 ; [#uses=1] + store int 0, int* %tmp.32.i59 + %tmp.1238 = setlt int %tmp.3, 1 ; [#uses=1] + br bool %tmp.1238, label %loopentry.1, label %no_exit.0.preheader + + cond_continue: ; preds = %__main.entry + "constantGEP:4" = getelementptr %struct.ht_ht* null, uint 1 ; <%struct.ht_ht*> [#uses=1] + %constantCast5 = cast %struct.ht_ht* "constantGEP:4" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast5 ) ; :4 [#uses=1] + cast sbyte* %4 to %struct.ht_ht* ; <%struct.ht_ht*>:1 [#uses=6] + "addrOfGlobal:.ht_prime_list_17" = getelementptr [28 x ulong]* %.ht_prime_list_1, long 0 ; <[28 x ulong]*> [#uses=1] + %copyConst = cast ulong 3500000 to ulong ; [#uses=1] + br label %no_exit.i7 + + no_exit.i7: ; preds = %cond_continue, %backEdgeInst1 + %indvar.i8 = phi uint [ %indvar.next.i11, %backEdgeInst1 ], [ 0, %cond_continue ] ; [#uses=2] + %i.0.0.i9 = cast uint %indvar.i8 to int ; [#uses=1] + %inc.i10 = add int %i.0.0.i9, 1 ; [#uses=1] + %v96 = cast int %inc.i10 to long ; [#uses=1] + %tmp.4.i = getelementptr [28 x ulong]* "addrOfGlobal:.ht_prime_list_17", long 0, long %v96 ; [#uses=2] + %tmp.5.i = load ulong* %tmp.4.i ; [#uses=1] + %tmp.8.i = setlt ulong %tmp.5.i, %copyConst ; [#uses=1] + %indvar.next.i11 = add uint %indvar.i8, 1 ; [#uses=1] + br bool %tmp.8.i, label %backEdgeInst1, label %ht_create.entry + + ht_create.entry: ; preds = %no_exit.i7 + %tmp.12.i = getelementptr %struct.ht_ht* %1, long 0, uint 0 ; [#uses=1] + %tmp.16.i = load ulong* %tmp.4.i ; [#uses=1] + %tmp.17.i = cast ulong %tmp.16.i to int ; [#uses=2] + store int %tmp.17.i, int* %tmp.12.i + %tmp.19.i = getelementptr %struct.ht_ht* %1, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + %tmp.24.i = cast int %tmp.17.i to ulong ; [#uses=1] + %tmp.3.i.i = shl ulong %tmp.24.i, ubyte 3 ; [#uses=2] + %MallocAmtCast.i.i = cast ulong %tmp.3.i.i to uint ; [#uses=1] + call sbyte* %malloc( uint %MallocAmtCast.i.i ) ; :5 [#uses=1] + cast sbyte* %5 to sbyte* ; :6 [#uses=2] + call sbyte* %memset( sbyte* %6, ubyte 0, ulong %tmp.3.i.i ) ; :7 [#uses=0] + %tmp.25.i = cast sbyte* %6 to %struct.ht_node** ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node** %tmp.25.i, %struct.ht_node*** %tmp.19.i + %tmp.27.i13 = getelementptr %struct.ht_ht* %1, long 0, uint 2 ; [#uses=1] + store int 0, int* %tmp.27.i13 + %tmp.29.i = getelementptr %struct.ht_ht* %1, long 0, uint 3 ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node* null, %struct.ht_node** %tmp.29.i + %tmp.32.i = getelementptr %struct.ht_ht* %1, long 0, uint 4 ; [#uses=1] + store int 0, int* %tmp.32.i + %copyConst = cast int 3500000 to int ; [#uses=1] + br label %no_exit.0.preheader + + loopentry.0: ; preds = %then.0.i7.i, %.ht_find_new_6.entry + %inc.0.0 = phi int [ %inc.0, %.ht_find_new_6.entry ], [ %inc.060, %then.0.i7.i ] ; [#uses=2] + %tmp.12 = setgt int %inc.0.0, %mem_tmp.0.0.ph ; [#uses=1] + br bool %tmp.12, label %loopentry.1.loopexit, label %backEdgeInst2 + + no_exit.0.preheader: ; preds = %ht_create.entry60, %ht_create.entry + %mem_tmp.0.0.ph = phi int [ %tmp.3, %ht_create.entry60 ], [ %copyConst, %ht_create.entry ] ; [#uses=2] + %tmp.8.0.ph = phi %struct.ht_ht* [ %0, %ht_create.entry60 ], [ %1, %ht_create.entry ] ; <%struct.ht_ht*> [#uses=4] + %tmp.15 = getelementptr [32 x sbyte]* %buf, long 0, long 0 ; [#uses=7] + %tmp.13.i.i = getelementptr %struct.ht_ht* %tmp.8.0.ph, long 0, uint 0 ; [#uses=1] + %tmp.5.i = getelementptr %struct.ht_ht* %tmp.8.0.ph, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + %tmp.27.i = getelementptr %struct.ht_ht* %tmp.8.0.ph, long 0, uint 4 ; [#uses=2] + "addrOfGlobal:.str_3" = getelementptr [3 x sbyte]* %.str_3, long 0 ; <[3 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_3" = getelementptr [3 x sbyte]* "addrOfGlobal:.str_3", long 0, long 0 ; [#uses=1] + "constantGEP:" = getelementptr [24 x sbyte]* null, uint 1 ; <[24 x sbyte]*> [#uses=1] + %constantCast12 = cast [24 x sbyte]* "constantGEP:" to uint ; [#uses=2] + %v913 = cast int 0 to long ; [#uses=4] + "addrOfGlobal:.str_1" = getelementptr [15 x sbyte]* %.str_1, long 0 ; <[15 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [15 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=2] + "constantGEP:" = getelementptr %struct.ht_node* null, long 0, uint 1 ; [#uses=1] + "addrOfGlobal:.str_2" = getelementptr [14 x sbyte]* %.str_2, long 0 ; <[14 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_2" = getelementptr [14 x sbyte]* "addrOfGlobal:.str_2", long 0, long 0 ; [#uses=2] + br label %no_exit.0 + + no_exit.0: ; preds = %no_exit.0.preheader, %backEdgeInst2 + %i.1.0 = phi int [ %inc.0.0, %backEdgeInst2 ], [ 1, %no_exit.0.preheader ] ; [#uses=5] + %tmp.14 = call int (sbyte*, sbyte*, ...)* %sprintf( sbyte* %tmp.15, sbyte* "constantGEP:addrOfGlobal:.str_3", int %i.1.0 ) ; [#uses=0] + %tmp.1.i.i48 = load sbyte* %tmp.15 ; [#uses=1] + %tmp.2.i.i49 = seteq sbyte %tmp.1.i.i48, 0 ; [#uses=1] + br bool %tmp.2.i.i49, label %.ht_hashcode_4.entry.i, label %no_exit.i.i.preheader + + no_exit.i.i.preheader: ; preds = %no_exit.0 + br label %no_exit.i.i + + no_exit.i.i: ; preds = %no_exit.i.i.preheader, %backEdgeInst3 + %indvar79 = phi ulong [ %indvar.next80, %backEdgeInst3 ], [ 0, %no_exit.i.i.preheader ] ; [#uses=2] + %val.0.i.i.2 = phi ulong [ %tmp.9.i.i, %backEdgeInst3 ], [ 0, %no_exit.i.i.preheader ] ; [#uses=1] + %key_addr.0.i.i.2.rec = cast ulong %indvar79 to long ; [#uses=2] + %key_addr.0.i.i.2 = getelementptr [32 x sbyte]* %buf, long 0, long %key_addr.0.i.i.2.rec ; [#uses=1] + %tmp.5.i.i = mul ulong %val.0.i.i.2, 5 ; [#uses=1] + %tmp.7.i.i = load sbyte* %key_addr.0.i.i.2 ; [#uses=1] + %tmp.8.i.i = cast sbyte %tmp.7.i.i to ulong ; [#uses=1] + %tmp.9.i.i = add ulong %tmp.8.i.i, %tmp.5.i.i ; [#uses=2] + %inc.i.i.rec = add long %key_addr.0.i.i.2.rec, 1 ; [#uses=1] + %inc.i.i = getelementptr [32 x sbyte]* %buf, long 0, long %inc.i.i.rec ; [#uses=1] + %tmp.1.i.i = load sbyte* %inc.i.i ; [#uses=1] + %tmp.2.i.i = seteq sbyte %tmp.1.i.i, 0 ; [#uses=1] + %indvar.next80 = add ulong %indvar79, 1 ; [#uses=1] + br bool %tmp.2.i.i, label %.ht_hashcode_4.entry.i.loopexit, label %backEdgeInst3 + + .ht_hashcode_4.entry.i.loopexit: ; preds = %no_exit.i.i + br label %.ht_hashcode_4.entry.i + + .ht_hashcode_4.entry.i: ; preds = %no_exit.0, %.ht_hashcode_4.entry.i.loopexit + %val.0.i.i.3 = phi ulong [ 0, %no_exit.0 ], [ %tmp.9.i.i, %.ht_hashcode_4.entry.i.loopexit ] ; [#uses=1] + %tmp.14.i.i = load int* %tmp.13.i.i ; [#uses=1] + %tmp.15.i.i = cast int %tmp.14.i.i to ulong ; [#uses=1] + %tmp.16.i.i = rem ulong %val.0.i.i.3, %tmp.15.i.i ; [#uses=1] + %tmp.17.i.i = cast ulong %tmp.16.i.i to int ; [#uses=1] + %tmp.6.i = load %struct.ht_node*** %tmp.5.i ; <%struct.ht_node**> [#uses=1] + %v911 = cast int %tmp.17.i.i to long ; [#uses=1] + %tmp.9.i = getelementptr %struct.ht_node** %tmp.6.i, long %v911 ; <%struct.ht_node**> [#uses=4] + %tmp.10.i = load %struct.ht_node** %tmp.9.i ; <%struct.ht_node*> [#uses=2] + %tmp.12.i56 = seteq %struct.ht_node* %tmp.10.i, null ; [#uses=1] + br bool %tmp.12.i56, label %loopexit.i, label %no_exit.i.preheader + + no_exit.i.preheader: ; preds = %.ht_hashcode_4.entry.i + br label %no_exit.i + + no_exit.i: ; preds = %no_exit.i.preheader, %backEdgeInst4 + %node.0.i.2 = phi %struct.ht_node* [ %tmp.25.i, %backEdgeInst4 ], [ %tmp.10.i, %no_exit.i.preheader ] ; <%struct.ht_node*> [#uses=4] + %tmp.17.i = getelementptr %struct.ht_node* %node.0.i.2, long 0, uint 0 ; [#uses=1] + %tmp.18.i = load sbyte** %tmp.17.i ; [#uses=1] + %tmp.14.i = call int %strcmp( sbyte* %tmp.15, sbyte* %tmp.18.i ) ; [#uses=1] + %tmp.19.i = seteq int %tmp.14.i, 0 ; [#uses=1] + br bool %tmp.19.i, label %.ht_find_new_6.entry.loopexit, label %endif.0.i + + endif.0.i: ; preds = %no_exit.i + %tmp.24.i = getelementptr %struct.ht_node* %node.0.i.2, long 0, uint 2 ; <%struct.ht_node**> [#uses=1] + %tmp.25.i = load %struct.ht_node** %tmp.24.i ; <%struct.ht_node*> [#uses=2] + %tmp.12.i = seteq %struct.ht_node* %tmp.25.i, null ; [#uses=1] + br bool %tmp.12.i, label %loopexit.i.loopexit, label %backEdgeInst4 + + loopexit.i.loopexit: ; preds = %endif.0.i + br label %loopexit.i + + loopexit.i: ; preds = %.ht_hashcode_4.entry.i, %loopexit.i.loopexit + %prev.0.i.3 = phi %struct.ht_node* [ null, %.ht_hashcode_4.entry.i ], [ %node.0.i.2, %loopexit.i.loopexit ] ; <%struct.ht_node*> [#uses=2] + %tmp.28.i = load int* %tmp.27.i ; [#uses=1] + %inc.i = add int %tmp.28.i, 1 ; [#uses=1] + store int %inc.i, int* %tmp.27.i + %tmp.30.i = seteq %struct.ht_node* %prev.0.i.3, null ; [#uses=1] + br bool %tmp.30.i, label %else.i, label %then.1.i + + then.1.i: ; preds = %loopexit.i + %tmp.33.i = getelementptr %struct.ht_node* %prev.0.i.3, long 0, uint 2 ; <%struct.ht_node**> [#uses=3] + call sbyte* %malloc( uint %constantCast12 ) ; :8 [#uses=1] + cast sbyte* %8 to [24 x sbyte]* ; <[24 x sbyte]*>:0 [#uses=2] + %ptr1 = getelementptr [24 x sbyte]* %0, long %v913 ; <[24 x sbyte]*> [#uses=1] + %tmp.0.sub.i4.i15 = getelementptr [24 x sbyte]* %ptr1, long 0, long %v913 ; [#uses=1] + %tmp.1.i5.i = cast [24 x sbyte]* %0 to %struct.ht_node* ; <%struct.ht_node*> [#uses=5] + %tmp.2.i6.i = seteq sbyte* %tmp.0.sub.i4.i15, null ; [#uses=1] + br bool %tmp.2.i6.i, label %then.0.i7.i, label %endif.0.i8.i + + then.0.i7.i: ; preds = %then.1.i + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_1" ) + call void %exit( int 1 ) + store %struct.ht_node* null, %struct.ht_node** %tmp.33.i + store int %i.1.0, int* "constantGEP:" + %inc.060 = add int %i.1.0, 1 ; [#uses=1] + br label %loopentry.0 + + endif.0.i8.i: ; preds = %then.1.i + %tmp.1.i5.i18 = load sbyte* %tmp.15 ; [#uses=1] + %tmp.2.i6.i19 = seteq sbyte %tmp.1.i5.i18, 0 ; [#uses=1] + br bool %tmp.2.i6.i19, label %strdup.entry33, label %no_exit.i.i20.preheader + + no_exit.i.i20.preheader: ; preds = %endif.0.i8.i + br label %no_exit.i.i20 + + no_exit.i.i20: ; preds = %no_exit.i.i20.preheader, %backEdgeInst5 + %Count.0.i.0.i21 = phi ulong [ %inc.0.i.i23, %backEdgeInst5 ], [ 0, %no_exit.i.i20.preheader ] ; [#uses=2] + %Str_addr.0.i.0.rec.i22 = cast ulong %Count.0.i.0.i21 to long ; [#uses=1] + %inc.0.i.i23 = add ulong %Count.0.i.0.i21, 1 ; [#uses=2] + %inc.1.i.rec.i24 = add long %Str_addr.0.i.0.rec.i22, 1 ; [#uses=1] + %inc.1.i.i25 = getelementptr [32 x sbyte]* %buf, long 0, long %inc.1.i.rec.i24 ; [#uses=1] + %tmp.1.i.i26 = load sbyte* %inc.1.i.i25 ; [#uses=1] + %tmp.2.i.i27 = seteq sbyte %tmp.1.i.i26, 0 ; [#uses=1] + br bool %tmp.2.i.i27, label %strdup.entry33.loopexit, label %backEdgeInst5 + + strdup.entry33.loopexit: ; preds = %no_exit.i.i20 + br label %strdup.entry33 + + strdup.entry33: ; preds = %endif.0.i8.i, %strdup.entry33.loopexit + %Count.0.i.1.i28 = phi ulong [ 0, %endif.0.i8.i ], [ %inc.0.i.i23, %strdup.entry33.loopexit ] ; [#uses=2] + %tmp.0.i29 = cast ulong %Count.0.i.1.i28 to uint ; [#uses=1] + %MallocAmtCast.i30 = add uint %tmp.0.i29, 1 ; [#uses=1] + call sbyte* %malloc( uint %MallocAmtCast.i30 ) ; :9 [#uses=1] + cast sbyte* %9 to sbyte* ; :10 [#uses=3] + %tmp.8.i32 = add ulong %Count.0.i.1.i28, 1 ; [#uses=1] + call sbyte* %memcpy( sbyte* %10, sbyte* %tmp.15, ulong %tmp.8.i32 ) ; :11 [#uses=0] + %tmp.7.i10.i = seteq sbyte* %10, null ; [#uses=1] + br bool %tmp.7.i10.i, label %then.1.i11.i, label %endif.1.i12.i + + then.1.i11.i: ; preds = %strdup.entry33 + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_2" ) + call void %exit( int 1 ) + store %struct.ht_node* null, %struct.ht_node** %tmp.33.i + br label %.ht_find_new_6.entry + + endif.1.i12.i: ; preds = %strdup.entry33 + %tmp.11.i13.i = getelementptr %struct.ht_node* %tmp.1.i5.i, long 0, uint 0 ; [#uses=1] + store sbyte* %10, sbyte** %tmp.11.i13.i + %tmp.14.i14.i = getelementptr %struct.ht_node* %tmp.1.i5.i, long 0, uint 1 ; [#uses=1] + store int 0, int* %tmp.14.i14.i + %tmp.16.i15.i = getelementptr %struct.ht_node* %tmp.1.i5.i, long 0, uint 2 ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node* null, %struct.ht_node** %tmp.16.i15.i + store %struct.ht_node* %tmp.1.i5.i, %struct.ht_node** %tmp.33.i + br label %.ht_find_new_6.entry + + else.i: ; preds = %loopexit.i + call sbyte* %malloc( uint %constantCast12 ) ; :12 [#uses=1] + cast sbyte* %12 to [24 x sbyte]* ; <[24 x sbyte]*>:1 [#uses=2] + %ptr120 = getelementptr [24 x sbyte]* %1, long %v913 ; <[24 x sbyte]*> [#uses=1] + %tmp.0.sub.i.i21 = getelementptr [24 x sbyte]* %ptr120, long 0, long %v913 ; [#uses=1] + %tmp.1.i.i = cast [24 x sbyte]* %1 to %struct.ht_node* ; <%struct.ht_node*> [#uses=5] + %tmp.2.i1.i = seteq sbyte* %tmp.0.sub.i.i21, null ; [#uses=1] + br bool %tmp.2.i1.i, label %then.0.i.i, label %endif.0.i.i + + then.0.i.i: ; preds = %else.i + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_1" ) + call void %exit( int 1 ) + store %struct.ht_node* null, %struct.ht_node** %tmp.9.i + br label %.ht_find_new_6.entry + + endif.0.i.i: ; preds = %else.i + %tmp.1.i5.i = load sbyte* %tmp.15 ; [#uses=1] + %tmp.2.i6.i14 = seteq sbyte %tmp.1.i5.i, 0 ; [#uses=1] + br bool %tmp.2.i6.i14, label %strdup.entry, label %no_exit.i.i15.preheader + + no_exit.i.i15.preheader: ; preds = %endif.0.i.i + br label %no_exit.i.i15 + + no_exit.i.i15: ; preds = %no_exit.i.i15.preheader, %backEdgeInst6 + %Count.0.i.0.i = phi ulong [ %inc.0.i.i, %backEdgeInst6 ], [ 0, %no_exit.i.i15.preheader ] ; [#uses=2] + %Str_addr.0.i.0.rec.i = cast ulong %Count.0.i.0.i to long ; [#uses=1] + %inc.0.i.i = add ulong %Count.0.i.0.i, 1 ; [#uses=2] + %inc.1.i.rec.i = add long %Str_addr.0.i.0.rec.i, 1 ; [#uses=1] + %inc.1.i.i = getelementptr [32 x sbyte]* %buf, long 0, long %inc.1.i.rec.i ; [#uses=1] + %tmp.1.i.i16 = load sbyte* %inc.1.i.i ; [#uses=1] + %tmp.2.i.i17 = seteq sbyte %tmp.1.i.i16, 0 ; [#uses=1] + br bool %tmp.2.i.i17, label %strdup.entry.loopexit, label %backEdgeInst6 + + strdup.entry.loopexit: ; preds = %no_exit.i.i15 + br label %strdup.entry + + strdup.entry: ; preds = %endif.0.i.i, %strdup.entry.loopexit + %Count.0.i.1.i = phi ulong [ 0, %endif.0.i.i ], [ %inc.0.i.i, %strdup.entry.loopexit ] ; [#uses=2] + %tmp.0.i = cast ulong %Count.0.i.1.i to uint ; [#uses=1] + %MallocAmtCast.i = add uint %tmp.0.i, 1 ; [#uses=1] + call sbyte* %malloc( uint %MallocAmtCast.i ) ; :13 [#uses=1] + cast sbyte* %13 to sbyte* ; :14 [#uses=3] + %tmp.8.i = add ulong %Count.0.i.1.i, 1 ; [#uses=1] + call sbyte* %memcpy( sbyte* %14, sbyte* %tmp.15, ulong %tmp.8.i ) ; :15 [#uses=0] + %tmp.7.i.i = seteq sbyte* %14, null ; [#uses=1] + br bool %tmp.7.i.i, label %then.1.i.i, label %endif.1.i.i + + then.1.i.i: ; preds = %strdup.entry + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_2" ) + call void %exit( int 1 ) + store %struct.ht_node* null, %struct.ht_node** %tmp.9.i + br label %.ht_find_new_6.entry + + endif.1.i.i: ; preds = %strdup.entry + %tmp.11.i.i = getelementptr %struct.ht_node* %tmp.1.i.i, long 0, uint 0 ; [#uses=1] + store sbyte* %14, sbyte** %tmp.11.i.i + %tmp.14.i.i = getelementptr %struct.ht_node* %tmp.1.i.i, long 0, uint 1 ; [#uses=1] + store int 0, int* %tmp.14.i.i + %tmp.16.i.i = getelementptr %struct.ht_node* %tmp.1.i.i, long 0, uint 2 ; <%struct.ht_node**> [#uses=1] + store %struct.ht_node* null, %struct.ht_node** %tmp.16.i.i + store %struct.ht_node* %tmp.1.i.i, %struct.ht_node** %tmp.9.i + br label %.ht_find_new_6.entry + + .ht_find_new_6.entry.loopexit: ; preds = %no_exit.i + br label %.ht_find_new_6.entry + + .ht_find_new_6.entry: ; preds = %then.1.i11.i, %endif.1.i12.i, %then.0.i.i, %then.1.i.i, %endif.1.i.i, %.ht_find_new_6.entry.loopexit + %tmp.181 = phi %struct.ht_node* [ %tmp.1.i5.i, %endif.1.i12.i ], [ %tmp.1.i.i, %endif.1.i.i ], [ null, %then.1.i11.i ], [ null, %then.0.i.i ], [ null, %then.1.i.i ], [ %node.0.i.2, %.ht_find_new_6.entry.loopexit ] ; <%struct.ht_node*> [#uses=1] + %tmp.21 = getelementptr %struct.ht_node* %tmp.181, long 0, uint 1 ; [#uses=1] + store int %i.1.0, int* %tmp.21 + %inc.0 = add int %i.1.0, 1 ; [#uses=1] + br label %loopentry.0 + + loopentry.1.loopexit: ; preds = %loopentry.0 + br label %loopentry.1 + + loopentry.1: ; preds = %ht_create.entry60, %loopentry.1.loopexit + %tmp.8.1 = phi %struct.ht_ht* [ %0, %ht_create.entry60 ], [ %tmp.8.0.ph, %loopentry.1.loopexit ] ; <%struct.ht_ht*> [#uses=6] + %i.0 = phi int [ %tmp.3, %ht_create.entry60 ], [ %mem_tmp.0.0.ph, %loopentry.1.loopexit ] ; [#uses=2] + %tmp.26 = setgt int %i.0, 0 ; [#uses=1] + br bool %tmp.26, label %no_exit.1.preheader, label %loopexit.1 + + no_exit.1.preheader: ; preds = %loopentry.1 + %tmp.29 = getelementptr [32 x sbyte]* %buf, long 0, long 0 ; [#uses=3] + %tmp.13.i.i14 = getelementptr %struct.ht_ht* %tmp.8.1, long 0, uint 0 ; [#uses=1] + %tmp.4.i = getelementptr %struct.ht_ht* %tmp.8.1, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + "addrOfGlobal:.str_4" = getelementptr [3 x sbyte]* %.str_4, long 0 ; <[3 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_4" = getelementptr [3 x sbyte]* "addrOfGlobal:.str_4", long 0, long 0 ; [#uses=1] + br label %no_exit.1 + + no_exit.1: ; preds = %no_exit.1.preheader, %backEdgeInst7 + %indvar = phi uint [ 0, %no_exit.1.preheader ], [ %indvar.next, %backEdgeInst7 ] ; [#uses=2] + %c.1.0 = phi int [ %c.0, %backEdgeInst7 ], [ 0, %no_exit.1.preheader ] ; [#uses=1] + %indvar = cast uint %indvar to int ; [#uses=1] + %indvar.neg = sub int 0, %indvar ; [#uses=1] + %i.0.0 = add int %indvar.neg, %i.0 ; [#uses=2] + %tmp.28 = call int (sbyte*, sbyte*, ...)* %sprintf( sbyte* %tmp.29, sbyte* "constantGEP:addrOfGlobal:.str_4", int %i.0.0 ) ; [#uses=0] + %tmp.1.i.i565 = load sbyte* %tmp.29 ; [#uses=1] + %tmp.2.i.i666 = seteq sbyte %tmp.1.i.i565, 0 ; [#uses=1] + br bool %tmp.2.i.i666, label %.ht_hashcode_4.entry.i13, label %no_exit.i.i7.preheader + + no_exit.i.i7.preheader: ; preds = %no_exit.1 + br label %no_exit.i.i7 + + no_exit.i.i7: ; preds = %no_exit.i.i7.preheader, %backEdgeInst8 + %indvar = phi ulong [ %indvar.next, %backEdgeInst8 ], [ 0, %no_exit.i.i7.preheader ] ; [#uses=2] + %val.0.i.i3.2 = phi ulong [ %tmp.9.i.i11, %backEdgeInst8 ], [ 0, %no_exit.i.i7.preheader ] ; [#uses=1] + %key_addr.0.i.i4.2.rec = cast ulong %indvar to long ; [#uses=2] + %key_addr.0.i.i4.2 = getelementptr [32 x sbyte]* %buf, long 0, long %key_addr.0.i.i4.2.rec ; [#uses=1] + %tmp.5.i.i8 = mul ulong %val.0.i.i3.2, 5 ; [#uses=1] + %tmp.7.i.i9 = load sbyte* %key_addr.0.i.i4.2 ; [#uses=1] + %tmp.8.i.i10 = cast sbyte %tmp.7.i.i9 to ulong ; [#uses=1] + %tmp.9.i.i11 = add ulong %tmp.8.i.i10, %tmp.5.i.i8 ; [#uses=2] + %inc.i.i12.rec = add long %key_addr.0.i.i4.2.rec, 1 ; [#uses=1] + %inc.i.i12 = getelementptr [32 x sbyte]* %buf, long 0, long %inc.i.i12.rec ; [#uses=1] + %tmp.1.i.i5 = load sbyte* %inc.i.i12 ; [#uses=1] + %tmp.2.i.i6 = seteq sbyte %tmp.1.i.i5, 0 ; [#uses=1] + %indvar.next = add ulong %indvar, 1 ; [#uses=1] + br bool %tmp.2.i.i6, label %.ht_hashcode_4.entry.i13.loopexit, label %backEdgeInst8 + + .ht_hashcode_4.entry.i13.loopexit: ; preds = %no_exit.i.i7 + br label %.ht_hashcode_4.entry.i13 + + .ht_hashcode_4.entry.i13: ; preds = %no_exit.1, %.ht_hashcode_4.entry.i13.loopexit + %val.0.i.i3.3 = phi ulong [ 0, %no_exit.1 ], [ %tmp.9.i.i11, %.ht_hashcode_4.entry.i13.loopexit ] ; [#uses=1] + %tmp.14.i.i15 = load int* %tmp.13.i.i14 ; [#uses=1] + %tmp.15.i.i16 = cast int %tmp.14.i.i15 to ulong ; [#uses=1] + %tmp.16.i.i17 = rem ulong %val.0.i.i3.3, %tmp.15.i.i16 ; [#uses=1] + %tmp.17.i.i18 = cast ulong %tmp.16.i.i17 to int ; [#uses=1] + %tmp.5.i = load %struct.ht_node*** %tmp.4.i ; <%struct.ht_node**> [#uses=1] + %v925 = cast int %tmp.17.i.i18 to long ; [#uses=1] + %tmp.8.i = getelementptr %struct.ht_node** %tmp.5.i, long %v925 ; <%struct.ht_node**> [#uses=1] + %tmp.9.i = load %struct.ht_node** %tmp.8.i ; <%struct.ht_node*> [#uses=2] + %tmp.11.i71 = seteq %struct.ht_node* %tmp.9.i, null ; [#uses=1] + br bool %tmp.11.i71, label %.ht_find_5.entry, label %no_exit.i21.preheader + + no_exit.i21.preheader: ; preds = %.ht_hashcode_4.entry.i13 + br label %no_exit.i21 + + no_exit.i21: ; preds = %no_exit.i21.preheader, %backEdgeInst9 + %node.0.i20.2 = phi %struct.ht_node* [ %tmp.23.i, %backEdgeInst9 ], [ %tmp.9.i, %no_exit.i21.preheader ] ; <%struct.ht_node*> [#uses=3] + %tmp.16.i = getelementptr %struct.ht_node* %node.0.i20.2, long 0, uint 0 ; [#uses=1] + %tmp.17.i = load sbyte** %tmp.16.i ; [#uses=1] + %tmp.13.i = call int %strcmp( sbyte* %tmp.29, sbyte* %tmp.17.i ) ; [#uses=1] + %tmp.18.i = seteq int %tmp.13.i, 0 ; [#uses=1] + br bool %tmp.18.i, label %.ht_find_5.entry.loopexit, label %endif.i + + endif.i: ; preds = %no_exit.i21 + %tmp.22.i = getelementptr %struct.ht_node* %node.0.i20.2, long 0, uint 2 ; <%struct.ht_node**> [#uses=1] + %tmp.23.i = load %struct.ht_node** %tmp.22.i ; <%struct.ht_node*> [#uses=2] + %tmp.11.i = seteq %struct.ht_node* %tmp.23.i, null ; [#uses=1] + br bool %tmp.11.i, label %.ht_find_5.entry.loopexit, label %backEdgeInst9 + + .ht_find_5.entry.loopexit: ; preds = %no_exit.i21, %endif.i + %result.0.i.ph = phi %struct.ht_node* [ %node.0.i20.2, %no_exit.i21 ], [ null, %endif.i ] ; <%struct.ht_node*> [#uses=1] + br label %.ht_find_5.entry + + .ht_find_5.entry: ; preds = %.ht_hashcode_4.entry.i13, %.ht_find_5.entry.loopexit + %result.0.i = phi %struct.ht_node* [ null, %.ht_hashcode_4.entry.i13 ], [ %result.0.i.ph, %.ht_find_5.entry.loopexit ] ; <%struct.ht_node*> [#uses=1] + %tmp.35 = setne %struct.ht_node* %result.0.i, null ; [#uses=1] + %inc.1 = cast bool %tmp.35 to int ; [#uses=1] + %c.0 = add int %inc.1, %c.1.0 ; [#uses=2] + %dec = add int %i.0.0, -1 ; [#uses=1] + %tmp.2677 = setgt int %dec, 0 ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.2677, label %backEdgeInst7, label %loopexit.1.loopexit + + loopexit.1.loopexit: ; preds = %.ht_find_5.entry + br label %loopexit.1 + + loopexit.1: ; preds = %loopentry.1, %loopexit.1.loopexit + %c.1.1 = phi int [ 0, %loopentry.1 ], [ %c.0, %loopexit.1.loopexit ] ; [#uses=1] + %tmp.13.i = getelementptr %struct.ht_ht* %tmp.8.1, long 0, uint 0 ; [#uses=1] + %tmp.24.i = load int* %tmp.13.i ; [#uses=2] + %tmp.46.i = setgt int %tmp.24.i, 0 ; [#uses=1] + br bool %tmp.46.i, label %no_exit.0.preheader.i, label %ht_destroy.entry + + no_exit.0.preheader.i: ; preds = %loopexit.1 + %tmp.7.i = getelementptr %struct.ht_ht* %tmp.8.1, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + br label %no_exit.0.i + + no_exit.0.i: ; preds = %no_exit.0.preheader.i, %backEdgeInst10 + %indvar.i = phi uint [ 0, %no_exit.0.preheader.i ], [ %indvar.next.i, %backEdgeInst10 ] ; [#uses=2] + %i.0.0.i = cast uint %indvar.i to int ; [#uses=2] + %tmp.8.i5 = load %struct.ht_node*** %tmp.7.i ; <%struct.ht_node**> [#uses=1] + %v926 = cast int %i.0.0.i to long ; [#uses=1] + %tmp.11.i = getelementptr %struct.ht_node** %tmp.8.i5, long %v926 ; <%struct.ht_node**> [#uses=1] + %tmp.12.i = load %struct.ht_node** %tmp.11.i ; <%struct.ht_node*> [#uses=2] + %tmp.1411.i = seteq %struct.ht_node* %tmp.12.i, null ; [#uses=1] + br bool %tmp.1411.i, label %loopexit.1.i, label %no_exit.1.i.preheader + + no_exit.1.i.preheader: ; preds = %no_exit.0.i + br label %no_exit.1.i + + no_exit.1.i: ; preds = %no_exit.1.i.preheader, %backEdgeInst11 + %next.0.2.i = phi %struct.ht_node* [ %tmp.19.i, %backEdgeInst11 ], [ %tmp.12.i, %no_exit.1.i.preheader ] ; <%struct.ht_node*> [#uses=3] + %tmp.18.i = getelementptr %struct.ht_node* %next.0.2.i, long 0, uint 2 ; <%struct.ht_node**> [#uses=1] + %tmp.19.i = load %struct.ht_node** %tmp.18.i ; <%struct.ht_node*> [#uses=2] + %tmp.21.i = getelementptr %struct.ht_node* %next.0.2.i, long 0, uint 0 ; [#uses=1] + %tmp.22.i = load sbyte** %tmp.21.i ; [#uses=1] + call void %free( sbyte* %tmp.22.i ) + cast %struct.ht_node* %next.0.2.i to sbyte* ; :16 [#uses=1] + call void %free( sbyte* %16 ) + %tmp.14.i = seteq %struct.ht_node* %tmp.19.i, null ; [#uses=1] + br bool %tmp.14.i, label %loopexit.1.i.loopexit, label %backEdgeInst11 + + loopexit.1.i.loopexit: ; preds = %no_exit.1.i + br label %loopexit.1.i + + loopexit.1.i: ; preds = %no_exit.0.i, %loopexit.1.i.loopexit + %inc.i6 = add int %i.0.0.i, 1 ; [#uses=1] + %tmp.4.i = setgt int %tmp.24.i, %inc.i6 ; [#uses=1] + %indvar.next.i = add uint %indvar.i, 1 ; [#uses=1] + br bool %tmp.4.i, label %backEdgeInst10, label %ht_destroy.entry.loopexit + + ht_destroy.entry.loopexit: ; preds = %loopexit.1.i + br label %ht_destroy.entry + + ht_destroy.entry: ; preds = %loopexit.1, %ht_destroy.entry.loopexit + %tmp.27.i = getelementptr %struct.ht_ht* %tmp.8.1, long 0, uint 1 ; <%struct.ht_node***> [#uses=1] + %tmp.28.i = load %struct.ht_node*** %tmp.27.i ; <%struct.ht_node**> [#uses=1] + cast %struct.ht_node** %tmp.28.i to sbyte* ; :17 [#uses=1] + call void %free( sbyte* %17 ) + cast %struct.ht_ht* %tmp.8.1 to sbyte* ; :18 [#uses=1] + call void %free( sbyte* %18 ) + "addrOfGlobal:.str_5" = getelementptr [4 x sbyte]* %.str_5, long 0 ; <[4 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_5" = getelementptr [4 x sbyte]* "addrOfGlobal:.str_5", long 0, long 0 ; [#uses=1] + %tmp.40 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_5", int %c.1.1 ) ; [#uses=0] + ret int 0 + + backEdgeInst: ; preds = %no_exit.i37 + call void %llvm_first_trigger( ) + br label %no_exit.i37 + + backEdgeInst1: ; preds = %no_exit.i7 + call void %llvm_first_trigger( ) + br label %no_exit.i7 + + backEdgeInst2: ; preds = %loopentry.0 + call void %llvm_first_trigger( ) + br label %no_exit.0 + + backEdgeInst3: ; preds = %no_exit.i.i + call void %llvm_first_trigger( ) + br label %no_exit.i.i + + backEdgeInst4: ; preds = %endif.0.i + call void %llvm_first_trigger( ) + br label %no_exit.i + + backEdgeInst5: ; preds = %no_exit.i.i20 + call void %llvm_first_trigger( ) + br label %no_exit.i.i20 + + backEdgeInst6: ; preds = %no_exit.i.i15 + call void %llvm_first_trigger( ) + br label %no_exit.i.i15 + + backEdgeInst7: ; preds = %.ht_find_5.entry + call void %llvm_first_trigger( ) + br label %no_exit.1 + + backEdgeInst8: ; preds = %no_exit.i.i7 + call void %llvm_first_trigger( ) + br label %no_exit.i.i7 + + backEdgeInst9: ; preds = %endif.i + call void %llvm_first_trigger( ) + br label %no_exit.i21 + + backEdgeInst10: ; preds = %loopexit.1.i + call void %llvm_first_trigger( ) + br label %no_exit.0.i + + backEdgeInst11: ; preds = %no_exit.1.i + call void %llvm_first_trigger( ) + br label %no_exit.1.i + } + + declare int %atoi(sbyte*) + + declare void %llvm.memset(sbyte*, ubyte, ulong, uint) + + declare void %llvm.memcpy(sbyte*, sbyte*, ulong, uint) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) + + declare sbyte* %memset(sbyte*, ubyte, ulong) + + declare sbyte* %memcpy(sbyte*, sbyte*, ulong) Index: reopt/test/TTFTestCases/hash.main.trace5.txt diff -c /dev/null reopt/test/TTFTestCases/hash.main.trace5.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/hash.main.trace5.txt Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,2 ---- + main + 48 74 Index: reopt/test/TTFTestCases/hash.main.trace6.txt diff -c /dev/null reopt/test/TTFTestCases/hash.main.trace6.txt:1.1 *** /dev/null Wed Sep 8 16:34:36 2004 --- reopt/test/TTFTestCases/hash.main.trace6.txt Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,2 ---- + main + 52 53 75 Index: reopt/test/TTFTestCases/hash.main.trace7.txt diff -c /dev/null reopt/test/TTFTestCases/hash.main.trace7.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/hash.main.trace7.txt Wed Sep 8 16:34:20 2004 *************** *** 0 **** --- 1,2 ---- + main + 59 63 76 Index: reopt/test/TTFTestCases/heapsort.ll diff -c /dev/null reopt/test/TTFTestCases/heapsort.ll:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/heapsort.ll Wed Sep 8 16:34:21 2004 *************** *** 0 **** --- 1,245 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %last.0__ = internal global long 42 ; [#uses=2] + %.str_1 = internal constant [4 x sbyte] c"%f\0A\00" ; <[4 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (int, sbyte**)* } { int (int, sbyte**)* %main } ; <{ int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [1 x sbyte] zeroinitializer ; <[1 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 1 ; [#uses=0] + %main.regAllocState = internal constant { uint, [178 x { int, int, uint, int }] } { uint 178, [178 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 1, int 8 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 1, int 0 }, { int, int, uint, int } { int 14, int -1, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 1, int 9 }, { int, int, uint, int } { int 16, int -1, uint 1, int 9 }, { int, int, uint, int } { int 17, int -1, uint 0, int -1 }, { int, int, uint, int } { int 18, int -1, uint 0, int -1 }, { int, int, uint, int } { int 19, int -1, uint 1, int 0 }, { int, int, uint, int } { int 20, int -1, uint 1, int 0 }, { int, int, uint, int } { int 21, int -1, uint 1, int 0 }, { int, int, uint, int } { int 22, int -1, uint 0, int -1 }, { int, int, uint, int } { int 23, int -1, uint 1, int 1 }, { int, int, uint, int } { int 24, int -1, uint 1, int 0 }, { int, int, uint, int } { int 25, int -1, uint 1, int 0 }, { int, int, uint, int } { int 26, int -1, uint 1, int 1 }, { int, int, uint, int } { int 27, int -1, uint 0, int -1 }, { int, int, uint, int } { int 28, int -1, uint 1, int 9 }, { int, int, uint, ! int } { int 28, int -2, uint 1, int 0 }, { int, int, uint, int } { int 29, int -1, uint 1, int 10 }, { int, int, uint, int } { int 29, int -2, uint 1, int 1 }, { int, int, uint, int } { int 30, int -1, uint 1, int 13 }, { int, int, uint, int } { int 31, int -1, uint 1, int 12 }, { int, int, uint, int } { int 32, int -1, uint 1, int 8 }, { int, int, uint, int } { int 33, int -1, uint 1, int 7 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 1, int 12 }, { int, int, uint, int } { int 35, int -2, uint 1, int 12 }, { int, int, uint, int } { int 36, int -1, uint 1, int 11 }, { int, int, uint, int } { int 36, int -2, uint 1, int 11 }, { int, int, uint, int } { int 37, int -1, uint 1, int 0 }, { int, int, uint, int } { int 38, int -1, uint 1, int 2 }, { int, int, uint, int } { int 39, int -1, uint 1, int 2 }, { int, int, uint, int } { int 40, int -1, uint 0, int -1 }, { int, int, uint, int } { int 41, int -1, uint 1, int 12 }, { int, int, uint, int } { int 42, int -1, uint 1, int 12 }, { in! t, int, uint, int } { int 43, int -1, uint 1, int 12 }, { int, int, uint, int } { int 44, int -1, uint 1, int 64 }, { int, int, uint, int } { int 45, int -1, uint 1, int 64 }, { int, int, uint, int } { int 46, int -1, uint 0, int -1 }, { int, int, uint, int } { int 47, int -1, uint 1, int 0 }, { int, int, uint, int } { int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, int -1, uint 1, int 11 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 }, { int, int, uint, int } { int 51, int -1, uint 0, int -1 }, { int, int, uint, int } { int 52, int -1, uint 0, int -1 }, { int, int, uint, int } { int 53, int -1, uint 1, int 9 }, { int, int, uint, int } { int 53, int -2, uint 1, int 8 }, { int, int, uint, int } { int 54, int -1, uint 1, int 7 }, { int, int, uint, int } { int 54, int -2, uint 1, int 9 }, { int, int, uint, int } { int 55, int -1, uint 1, int 12 }, { int, int, uint, int } { int 56, int -1, uint 1, int 12 }, { int, int, uint, int } { int 57, int! -1, uint 0, int -1 }, { int, int, uint, int } { int 58, int -1, uint 0, int -1 }, { int, int, uint, int } { int 59, int -1, uint 1, int 8 }, { int, int, uint, int } { int 59, int -2, uint 1, int 8 }, { int, int, uint, int } { int 60, int -1, uint 1, int 10 }, { int, int, uint, int } { int 60, int -2, uint 1, int 10 }, { int, int, uint, int } { int 61, int -1, uint 1, int 8 }, { int, int, uint, int } { int 62, int -1, uint 1, int 0 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 1, int 64 }, { int, int, uint, int } { int 65, int -1, uint 1, int 11 }, { int, int, uint, int } { int 66, int -1, uint 0, int -1 }, { int, int, uint, int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 1, int 12 }, { int, int, uint, int } { int 68, int -2, uint 1, int 12 }, { int, int, uint, int } { int 69, int -1, uint 1, int 1 }, { int, int, uint, int } { int 69, int -2, uint 1, int 1 }, { int, int, uint, int } { int 70, int -1, uint 1, int 0 }, { int, int, uint, int }! { int 71, int -1, uint 1, int 0 }, { int, int, uint, int } { int 72, int -1, uint 1, int 64 }, { int, int, uint, int } { int 73, int -1, uint 1, int 2 }, { int, int, uint, int } { int 74, int -1, uint 1, int 66 }, { int, int, uint, int } { int 75, int -1, uint 0, int -1 }, { int, int, uint, int } { int 76, int -1, uint 1, int 10 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 1, int 11 }, { int, int, uint, int } { int 80, int -1, uint 0, int -1 }, { int, int, uint, int } { int 81, int -1, uint 0, int -1 }, { int, int, uint, int } { int 82, int -1, uint 1, int 15 }, { int, int, uint, int } { int 82, int -2, uint 1, int 0 }, { int, int, uint, int } { int 83, int -1, uint 1, int 12 }, { int, int, uint, int } { int 83, int -2, uint 1, int 1 }, { int, int, uint, int } { int 84, int -1, uint 1, int 66 }, { int, int, uint, int } { int 84, int -2, uint 1, int 6! 6 }, { int, int, uint, int } { int 85, int -1, uint 1, int 11 }, { int , int, uint, int } { int 85, int -2, uint 1, int 11 }, { int, int, uint, int } { int 86, int -1, uint 1, int 13 }, { int, int, uint, int } { int 86, int -2, uint 1, int 13 }, { int, int, uint, int } { int 87, int -1, uint 1, int 10 }, { int, int, uint, int } { int 88, int -1, uint 1, int 14 }, { int, int, uint, int } { int 89, int -1, uint 0, int -1 }, { int, int, uint, int } { int 90, int -1, uint 1, int 16 }, { int, int, uint, int } { int 90, int -2, uint 1, int 13 }, { int, int, uint, int } { int 91, int -1, uint 1, int 1 }, { int, int, uint, int } { int 91, int -2, uint 1, int 11 }, { int, int, uint, int } { int 92, int -1, uint 0, int -1 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, int } { int 94, int -1, uint 1, int 0 }, { int, int, uint, int } { int 95, int -1, uint 0, int -1 }, { int, int, uint, int } { int 96, int -1, uint 1, int 64 }, { int, int, uint, int } { int 97, int -1, uint 1, int 0 }, { int, int, uint, int } { int 98, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 99, int -1, uint 0, int -1 }, { int, int, uint, int } { int 100, int -1, uint 1, int 68 }, { int, int, uint, int } { int 101, int -1, uint 1, int 8 }, { int, int, uint, int } { int 102, int -1, uint 0, int -1 }, { int, int, uint, int } { int 103, int -1, uint 1, int 8 }, { int, int, uint, int } { int 103, int -2, uint 1, int 8 }, { int, int, uint, int } { int 104, int -1, uint 0, int -1 }, { int, int, uint, int } { int 105, int -1, uint 1, int 8 }, { int, int, uint, int } { int 106, int -1, uint 1, int 0 }, { int, int, uint, int } { int 107, int -1, uint 0, int -1 }, { int, int, uint, int } { int 108, int -1, uint 1, int 64 }, { int, int, uint, int } { int 109, int -1, uint 0, int -1 }, { int, int, uint, int } { int 110, int -1, uint 0, int -1 }, { int, int, uint, int } { int 111, int -1, uint 1, int 16 }, { int, int, uint, int } { int 112, int -1, uint 0, int -1 }, { int, int, uint, int } { int 113, int -1, uint 0, int -1! }, { int, int, uint, int } { int 114, int -1, uint 1, int 11 }, { int , int, uint, int } { int 115, int -1, uint 0, int -1 }, { int, int, uint, int } { int 116, int -1, uint 0, int -1 }, { int, int, uint, int } { int 117, int -1, uint 0, int -1 }, { int, int, uint, int } { int 118, int -1, uint 1, int 14 }, { int, int, uint, int } { int 118, int -2, uint 1, int 14 }, { int, int, uint, int } { int 119, int -1, uint 1, int 10 }, { int, int, uint, int } { int 119, int -2, uint 1, int 10 }, { int, int, uint, int } { int 120, int -1, uint 1, int 64 }, { int, int, uint, int } { int 120, int -2, uint 1, int 64 }, { int, int, uint, int } { int 121, int -1, uint 1, int 8 }, { int, int, uint, int } { int 121, int -2, uint 1, int 8 }, { int, int, uint, int } { int 122, int -1, uint 1, int 8 }, { int, int, uint, int } { int 123, int -1, uint 0, int -1 }, { int, int, uint, int } { int 124, int -1, uint 0, int -1 }, { int, int, uint, int } { int 125, int -1, uint 0, int -1 }, { int, int, uint, int } { int 126, int -1, uint 0, int -1 }, { int, int, uint, int! } { int 127, int -1, uint 0, int -1 }, { int, int, uint, int } { int 128, int -1, uint 1, int 0 }, { int, int, uint, int } { int 129, int -1, uint 0, int -1 }, { int, int, uint, int } { int 130, int -1, uint 1, int 34 }, { int, int, uint, int } { int 131, int -1, uint 0, int -1 }, { int, int, uint, int } { int 132, int -1, uint 1, int 0 }, { int, int, uint, int } { int 133, int -1, uint 1, int 0 }, { int, int, uint, int } { int 134, int -1, uint 1, int 0 }, { int, int, uint, int } { int 135, int -1, uint 0, int -1 }, { int, int, uint, int } { int 136, int -1, uint 0, int -1 }, { int, int, uint, int } { int 137, int -1, uint 1, int 13 }, { int, int, uint, int } { int 137, int -2, uint 1, int 13 }, { int, int, uint, int } { int 138, int -1, uint 1, int 11 }, { int, int, uint, int } { int 138, int -2, uint 1, int 11 }, { int, int, uint, int } { int 139, int -1, uint 0, int -1 }, { int, int, uint, int } { int 140, int -1, uint 0, int -1 }, { int, int, uint, int } { int 141, in! t -1, uint 0, int -1 }, { int, int, uint, int } { int 142, int -1, uin t 0, int -1 }, { int, int, uint, int } { int 143, int -1, uint 0, int -1 }, { int, int, uint, int } { int 144, int -1, uint 0, int -1 }, { int, int, uint, int } { int 145, int -1, uint 0, int -1 }, { int, int, uint, int } { int 146, int -1, uint 0, int -1 }, { int, int, uint, int } { int 147, int -1, uint 0, int -1 }, { int, int, uint, int } { int 148, int -1, uint 0, int -1 }, { int, int, uint, int } { int 149, int -1, uint 0, int -1 }, { int, int, uint, int } { int 150, int -1, uint 0, int -1 }, { int, int, uint, int } { int 151, int -1, uint 0, int -1 } ] } ; <{ uint, [178 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [1 x { uint, [0 x { int, int, uint, int }] }*] } { uint 1, [1 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [178 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [1 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [21 x sbyte*] } { uint 21, [21 x sbyte*] [ sbyte* cast (long* %last.0__ to sbyte*), sbyte* cast ([4 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [178 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [21 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + br bool %tmp.1, label %cond_true, label %cond_continue + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=4] + %mem_tmp.0-uint8 = cast int %tmp.3 to uint ; [#uses=1] + %mem_tmp.0-uint-off9 = add uint %mem_tmp.0-uint8, 1 ; [#uses=1] + mul uint %mem_tmp.0-uint-off9, 8 ; :0 [#uses=1] + call sbyte* %malloc( uint %0 ) ; :0 [#uses=1] + cast sbyte* %0 to double* ; :0 [#uses=2] + %tmp.1615 = setlt int %tmp.3, 1 ; [#uses=1] + br bool %tmp.1615, label %loopexit, label %no_exit.preheader + + cond_continue: ; preds = %__main.entry + "constantGEP:" = getelementptr [8000001 x double]* null, uint 1 ; <[8000001 x double]*> [#uses=1] + %constantCast = cast [8000001 x double]* "constantGEP:" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :1 [#uses=1] + cast sbyte* %1 to [8000001 x double]* ; <[8000001 x double]*>:0 [#uses=1] + %v9 = cast int 0 to long ; [#uses=2] + %ptr1 = getelementptr [8000001 x double]* %0, long %v9 ; <[8000001 x double]*> [#uses=1] + %tmp.8.sub3 = getelementptr [8000001 x double]* %ptr1, long 0, long %v9 ; [#uses=1] + %copyConst = cast int 8000000 to int ; [#uses=1] + br label %no_exit.preheader + + no_exit.preheader: ; preds = %cond_true, %cond_continue + %tmp.8.0.ph.ph = phi double* [ %0, %cond_true ], [ %tmp.8.sub3, %cond_continue ] ; [#uses=2] + %mem_tmp.0.0.ph.ph = phi int [ %tmp.3, %cond_true ], [ %copyConst, %cond_continue ] ; [#uses=2] + "addrOfGlobal:last.0__" = getelementptr long* %last.0__, long 0 ; [#uses=2] + %last.0__.promoted = load long* "addrOfGlobal:last.0__" ; [#uses=1] + %copyConst = cast long 29573 to long ; [#uses=1] + %copyConst5 = cast long 139968 to long ; [#uses=1] + br label %no_exit + + no_exit: ; preds = %no_exit.preheader, %backEdgeInst + %last.0__.tmp.0 = phi long [ %last.0__.promoted, %no_exit.preheader ], [ %tmp.3.i, %backEdgeInst ] ; [#uses=1] + %indvar = phi uint [ %indvar.next, %backEdgeInst ], [ 0, %no_exit.preheader ] ; [#uses=2] + %indvar = cast uint %indvar to int ; [#uses=2] + %i.0.0 = add int %indvar, 1 ; [#uses=1] + %v94 = cast int %i.0.0 to long ; [#uses=1] + %tmp.21 = getelementptr double* %tmp.8.0.ph.ph, long %v94 ; [#uses=1] + %tmp.1.i = mul long %last.0__.tmp.0, 3877 ; [#uses=1] + %tmp.2.i = add long %tmp.1.i, %copyConst ; [#uses=1] + %tmp.3.i = rem long %tmp.2.i, %copyConst5 ; [#uses=3] + %tmp.4.i = cast long %tmp.3.i to double ; [#uses=1] + %tmp.7.i = div double %tmp.4.i, 0x4101160000000000 ; [#uses=1] + store double %tmp.7.i, double* %tmp.21 + %inc = add int %indvar, 2 ; [#uses=1] + %tmp.16 = setgt int %inc, %mem_tmp.0.0.ph.ph ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.16, label %loopexit.loopexit, label %backEdgeInst + + loopexit.loopexit: ; preds = %no_exit + store long %tmp.3.i, long* "addrOfGlobal:last.0__" + br label %loopexit + + loopexit: ; preds = %cond_true, %loopexit.loopexit + %mem_tmp.0.1 = phi int [ %tmp.3, %cond_true ], [ %mem_tmp.0.0.ph.ph, %loopexit.loopexit ] ; [#uses=4] + %tmp.8.1 = phi double* [ %0, %cond_true ], [ %tmp.8.0.ph.ph, %loopexit.loopexit ] ; [#uses=10] + %tmp.3.i = shr int %mem_tmp.0.1, ubyte 1 ; [#uses=1] + %tmp.4.i = add int %tmp.3.i, 1 ; [#uses=3] + %tmp.68.i = setgt int %tmp.4.i, 1 ; [#uses=1] + br bool %tmp.68.i, label %then.0.i, label %else.0.i + + then.0.i: ; preds = %loopexit, %backEdgeInst2 + %l.1.0.i = phi int [ %tmp.4.i, %loopexit ], [ %l.0.1.i, %backEdgeInst2 ] ; [#uses=1] + %ir.1.0.i = phi int [ %mem_tmp.0.1, %loopexit ], [ %ir.0.1.i, %backEdgeInst2 ] ; [#uses=3] + %dec.0.i = add int %l.1.0.i, -1 ; [#uses=6] + %v97 = cast int %dec.0.i to long ; [#uses=1] + %tmp.11.i = getelementptr double* %tmp.8.1, long %v97 ; [#uses=1] + %tmp.12.i = load double* %tmp.11.i ; [#uses=2] + %tmp.3416.i = shl int %dec.0.i, ubyte 1 ; [#uses=2] + %tmp.3727.i = setgt int %tmp.3416.i, %ir.1.0.i ; [#uses=1] + br bool %tmp.3727.i, label %loopexit.1.i, label %no_exit.preheader.i + + else.0.i: ; preds = %loopexit, %loopexit.1.i + %l.1.1.i = phi int [ %l.0.1.i, %loopexit.1.i ], [ %tmp.4.i, %loopexit ] ; [#uses=5] + %ir.1.1.i = phi int [ %ir.0.1.i, %loopexit.1.i ], [ %mem_tmp.0.1, %loopexit ] ; [#uses=3] + %v98 = cast int %ir.1.1.i to long ; [#uses=1] + %tmp.16.i = getelementptr double* %tmp.8.1, long %v98 ; [#uses=2] + %tmp.17.i = load double* %tmp.16.i ; [#uses=3] + %tmp.23.i = getelementptr double* %tmp.8.1, long 1 ; [#uses=2] + %tmp.24.i = load double* %tmp.23.i ; [#uses=1] + store double %tmp.24.i, double* %tmp.16.i + %dec.1.i = add int %ir.1.1.i, -1 ; [#uses=3] + %tmp.26.i = seteq int %ir.1.1.i, 2 ; [#uses=1] + br bool %tmp.26.i, label %benchmark_heapsort.entry, label %endif.0.i2 + + endif.0.i2: ; preds = %else.0.i + %tmp.34.i = shl int %l.1.1.i, ubyte 1 ; [#uses=2] + %tmp.3730.i = setgt int %tmp.34.i, %dec.1.i ; [#uses=1] + br bool %tmp.3730.i, label %backEdgeInst3, label %no_exit.preheader.i + + no_exit.preheader.i: ; preds = %then.0.i, %endif.0.i2 + %l.0.0.ph.i = phi int [ %l.1.1.i, %endif.0.i2 ], [ %dec.0.i, %then.0.i ] ; [#uses=2] + %ir.0.0.ph.i = phi int [ %dec.1.i, %endif.0.i2 ], [ %ir.1.0.i, %then.0.i ] ; [#uses=6] + %rra.0.0.ph.i = phi double [ %tmp.17.i, %endif.0.i2 ], [ %tmp.12.i, %then.0.i ] ; [#uses=3] + %j.0.0.ph.i = phi int [ %tmp.34.i, %endif.0.i2 ], [ %tmp.3416.i, %then.0.i ] ; [#uses=1] + %i.0.0.ph.i = phi int [ %l.1.1.i, %endif.0.i2 ], [ %dec.0.i, %then.0.i ] ; [#uses=1] + %tmp.79.i = add int %ir.0.0.ph.i, 1 ; [#uses=2] + %tmp.37.i = setgt int %tmp.79.i, %ir.0.0.ph.i ; [#uses=1] + br label %no_exit.i3 + + no_exit.i3: ; preds = %no_exit.preheader.i, %backEdgeInst6 + %i.0.0.ph35.i.ph = phi int [ %i.0.0.ph.i, %no_exit.preheader.i ], [ %phi, %backEdgeInst6 ] ; [#uses=3] + %j.0.0.i = phi int [ %j.0.0.ph.i, %no_exit.preheader.i ], [ %phi1, %backEdgeInst6 ] ; [#uses=4] + %tmp.41.i = setlt int %j.0.0.i, %ir.0.0.ph.i ; [#uses=1] + br bool %tmp.41.i, label %shortcirc_next.i, label %shortcirc_done.i + + shortcirc_next.i: ; preds = %no_exit.i3 + %v99 = cast int %j.0.0.i to long ; [#uses=1] + %tmp.46.i = getelementptr double* %tmp.8.1, long %v99 ; [#uses=1] + %tmp.47.i = load double* %tmp.46.i ; [#uses=1] + %tmp.50.i = add int %j.0.0.i, 1 ; [#uses=1] + %v910 = cast int %tmp.50.i to long ; [#uses=1] + %tmp.52.i = getelementptr double* %tmp.8.1, long %v910 ; [#uses=1] + %tmp.53.i = load double* %tmp.52.i ; [#uses=1] + %tmp.54.i = setlt double %tmp.47.i, %tmp.53.i ; [#uses=1] + br label %shortcirc_done.i + + shortcirc_done.i: ; preds = %no_exit.i3, %shortcirc_next.i + %shortcirc_val.i = phi bool [ false, %no_exit.i3 ], [ %tmp.54.i, %shortcirc_next.i ] ; [#uses=1] + %inc.i = cast bool %shortcirc_val.i to int ; [#uses=1] + %j.2.i = add int %inc.i, %j.0.0.i ; [#uses=4] + %v911 = cast int %j.2.i to long ; [#uses=1] + %tmp.61.i = getelementptr double* %tmp.8.1, long %v911 ; [#uses=1] + %tmp.62.i = load double* %tmp.61.i ; [#uses=2] + %tmp.64.i = setgt double %tmp.62.i, %rra.0.0.ph.i ; [#uses=1] + br bool %tmp.64.i, label %then.3.i, label %else.1.i + + then.3.i: ; preds = %shortcirc_done.i + %v912 = cast int %i.0.0.ph35.i.ph to long ; [#uses=1] + %tmp.69.i = getelementptr double* %tmp.8.1, long %v912 ; [#uses=1] + store double %tmp.62.i, double* %tmp.69.i + %tmp.77.i = shl int %j.2.i, ubyte 1 ; [#uses=2] + %tmp.3733.i = setgt int %tmp.77.i, %ir.0.0.ph.i ; [#uses=1] + br bool %tmp.3733.i, label %backEdgeInst4, label %newCommon + + else.1.i: ; preds = %shortcirc_done.i + br bool %tmp.37.i, label %backEdgeInst5, label %newCommon + + loopexit.1.i: ; preds = %then.0.i, %backEdgeInst3, %backEdgeInst4, %backEdgeInst5 + %l.0.1.i = phi int [ %l.1.1.i, %backEdgeInst3 ], [ %dec.0.i, %then.0.i ], [ %l.0.0.ph.i, %backEdgeInst4 ], [ %l.0.0.ph.i, %backEdgeInst5 ] ; [#uses=3] + %ir.0.1.i = phi int [ %dec.1.i, %backEdgeInst3 ], [ %ir.1.0.i, %then.0.i ], [ %ir.0.0.ph.i, %backEdgeInst4 ], [ %ir.0.0.ph.i, %backEdgeInst5 ] ; [#uses=2] + %rra.0.1.i = phi double [ %tmp.17.i, %backEdgeInst3 ], [ %tmp.12.i, %then.0.i ], [ %rra.0.0.ph.i, %backEdgeInst4 ], [ %rra.0.0.ph.i, %backEdgeInst5 ] ; [#uses=1] + %i.0.1.i = phi int [ %l.1.1.i, %backEdgeInst3 ], [ %dec.0.i, %then.0.i ], [ %j.2.i, %backEdgeInst4 ], [ %i.0.0.ph35.i.ph, %backEdgeInst5 ] ; [#uses=1] + %v913 = cast int %i.0.1.i to long ; [#uses=1] + %tmp.83.i = getelementptr double* %tmp.8.1, long %v913 ; [#uses=1] + store double %rra.0.1.i, double* %tmp.83.i + %tmp.6.i = setgt int %l.0.1.i, 1 ; [#uses=1] + br bool %tmp.6.i, label %backEdgeInst2, label %else.0.i + + benchmark_heapsort.entry: ; preds = %else.0.i + store double %tmp.17.i, double* %tmp.23.i + %v914 = cast int %mem_tmp.0.1 to long ; [#uses=1] + %tmp.31 = getelementptr double* %tmp.8.1, long %v914 ; [#uses=1] + %tmp.32 = load double* %tmp.31 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [4 x sbyte]* %.str_1, long 0 ; <[4 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [4 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + %tmp.26 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", double %tmp.32 ) ; [#uses=0] + cast double* %tmp.8.1 to sbyte* ; :2 [#uses=1] + call void %free( sbyte* %2 ) + ret int 0 + + newCommon: ; preds = %then.3.i, %else.1.i + %phi = phi int [ %i.0.0.ph35.i.ph, %else.1.i ], [ %j.2.i, %then.3.i ] ; [#uses=1] + %phi1 = phi int [ %tmp.79.i, %else.1.i ], [ %tmp.77.i, %then.3.i ] ; [#uses=1] + br label %backEdgeInst6 + + backEdgeInst: ; preds = %no_exit + call void %llvm_first_trigger( ) + br label %no_exit + + backEdgeInst2: ; preds = %loopexit.1.i + call void %llvm_first_trigger( ) + br label %then.0.i + + backEdgeInst3: ; preds = %endif.0.i2 + call void %llvm_first_trigger( ) + br label %loopexit.1.i + + backEdgeInst4: ; preds = %then.3.i + call void %llvm_first_trigger( ) + br label %loopexit.1.i + + backEdgeInst5: ; preds = %else.1.i + call void %llvm_first_trigger( ) + br label %loopexit.1.i + + backEdgeInst6: ; preds = %newCommon + call void %llvm_first_trigger( ) + br label %no_exit.i3 + } + + declare int %atoi(sbyte*) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/heapsort.main.trace8.txt diff -c /dev/null reopt/test/TTFTestCases/heapsort.main.trace8.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/heapsort.main.trace8.txt Wed Sep 8 16:34:21 2004 *************** *** 0 **** --- 1,2 ---- + main + 6 21 Index: reopt/test/TTFTestCases/lists.list_equal.trace1.txt diff -c /dev/null reopt/test/TTFTestCases/lists.list_equal.trace1.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/lists.list_equal.trace1.txt Wed Sep 8 16:34:21 2004 *************** *** 0 **** --- 1,2 ---- + list_equal + 2 3 9 Index: reopt/test/TTFTestCases/lists.ll diff -c /dev/null reopt/test/TTFTestCases/lists.ll:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/lists.ll Wed Sep 8 16:34:21 2004 *************** *** 0 **** --- 1,493 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.DLL = type { int, %struct.DLL*, %struct.DLL* } + %struct.TorRec = type { int, void ()* } + %.str_5 = internal constant [27 x sbyte] c"li2 and li1 are not equal\0A\00" ; <[27 x sbyte]*> [#uses=2] + %.str_6 = internal constant [25 x sbyte] c"li2 should be empty now\0A\00" ; <[25 x sbyte]*> [#uses=2] + %.str_7 = internal constant [25 x sbyte] c"li3 should be empty now\0A\00" ; <[25 x sbyte]*> [#uses=2] + %.str_8 = internal constant [42 x sbyte] c"li1 first value wrong, wanted %d, got %d\0A\00" ; <[42 x sbyte]*> [#uses=2] + %.str_9 = internal constant [37 x sbyte] c"last value wrong, wanted %d, got %d\0A\00" ; <[37 x sbyte]*> [#uses=2] + %.str_10 = internal constant [42 x sbyte] c"li2 first value wrong, wanted %d, got %d\0A\00" ; <[42 x sbyte]*> [#uses=2] + %.str_12 = internal constant [35 x sbyte] c"li1 size wrong, wanted %d, got %d\0A\00" ; <[35 x sbyte]*> [#uses=2] + %.str_13 = internal constant [27 x sbyte] c"li1 and li2 are not equal\0A\00" ; <[27 x sbyte]*> [#uses=2] + %.str_14 = internal constant [4 x sbyte] c"%d\0A\00" ; <[4 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (%struct.DLL*, %struct.DLL*)*, int (int, sbyte**)* } { int (%struct.DLL*, %struct.DLL*)* %list_equal, int (int, sbyte**)* %main } ; <{ int (%struct.DLL*, %struct.DLL*)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [2 x sbyte] zeroinitializer ; <[2 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 2 ; [#uses=0] + %list_equal.regAllocState = internal constant { uint, [45 x { int, int, uint, int }] } { uint 45, [45 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 0, int -1 }, { int, int, uint, int } { int 1, int -1, uint 1, int 0 }, { int, int, uint, int } { int 2, int -1, uint 0, int -1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 1, int 7 }, { int, int, uint, int } { int 5, int -2, uint 1, int 7 }, { int, int, uint, int } { int 6, int -1, uint 1, int 8 }, { int, int, uint, int } { int 6, int -2, uint 1, int 8 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, in! t -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 0, int -1 }, { int, int, uint, int } { int 12, int -1, uint 0, int -1 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 1, int 8 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 7 }, { int, int, uint, int } { int 17, int -1, uint 0, int -1 }, { int, int, uint, int } { int 18, int -1, uint 1, int 0 }, { int, int, uint, int } { int 19, int -1, uint 0, int -1 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 0, int -1 }, { int, int, uint, int } { int 22, int -1, uint 1, int 7 }, { int, int, uint, int } { int 22, int -2, uint 1, int 7 }, { int, int, uint, int } { int 23, int -1, uint 1, int 8 }, { int, int, uint, int } { int 23, int -2, uint 1, int 8 }, { int, int, uint, int } { int 24, int -1, uint 0, int -1 }, { int, int, ! uint, int } { int 25, int -1, uint 1, int 8 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, uint, int } { int 27, int -1, uint 1, int 0 }, { int, int, uint, int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 1, int 7 }, { int, int, uint, int } { int 32, int -1, uint 1, int 15 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 0, int -1 } ] } ; <{ uint, [45 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [302 x { int, int, uint, int }] } { uint 302, [302 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 1 }, { int, int, uint, int } { int 2, int -1, uint 1, int 2 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 3 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 2 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 1, int 2 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 2 }, { int, int, uint, int } { int 16, int -2, uint 1, int 2 }, { int, int, uint, int } { int 17, int -1, uint 1, int 2 }, { int, int, uint, int } { int 18, int -1, uint 2, int 1951 }, { int, int, uint, int } { int 19, int -1, uint 1, int 0 }, { int, int, uint, int } { int 20, int -1, uint 1, int 17 }, { int, int, uint, int } { int 21, int -1, uint 1, int 9 }, { int, int, uint, int } { int 22, int -1, uint 1, int 14 }, { int, int, uint, int } { int 23, int -1, uint 1, int 18 }, { int, int, uint, int } { int 24, int -1, uint 2, int 1943 }, { int, int, uint, int } { int 25, int -1, uint 1, int 0 }, { int, int, uint, int } { int 26, int -1, uint 2, int 2023 }, { int, int, uint, int } { int 27, int -1, uint 0, int -1 }, { int, ! int, uint, int } { int 28, int -1, uint 2, int 1975 }, { int, int, uin t, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 2, int 2007 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 2, int 1959 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 2, int 1991 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 1, int 20 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 2, int 1983 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 2, int 1967 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, { int, int, uint, int } { int 42, int -1, uint 2, int 1999 }, { int, int, uint, int } { int 43, int -1, uint 0, int -1 }, { int, int, uint, int } { int 44, int -1, uint 1, int 19 }, { int, int, uint, int } { int 44! , int -2, uint 1, int 0 }, { int, int, uint, int } { int 45, int -1, uint 1, int 0 }, { int, int, uint, int } { int 46, int -1, uint 1, int 12 }, { int, int, uint, int } { int 47, int -1, uint 1, int 7 }, { int, int, uint, int } { int 48, int -1, uint 1, int 11 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 1, int 1 }, { int, int, uint, int } { int 50, int -2, uint 1, int 8 }, { int, int, uint, int } { int 51, int -1, uint 1, int 3 }, { int, int, uint, int } { int 52, int -1, uint 1, int 0 }, { int, int, uint, int } { int 53, int -1, uint 1, int 4 }, { int, int, uint, int } { int 54, int -1, uint 1, int 6 }, { int, int, uint, int } { int 55, int -1, uint 0, int -1 }, { int, int, uint, int } { int 56, int -1, uint 1, int 2 }, { int, int, uint, int } { int 57, int -1, uint 1, int 5 }, { int, int, uint, int } { int 58, int -1, uint 0, int -1 }, { int, int, uint, int } { int 59, int -1, uint 1, int 2 }, { int, int, ! uint, int } { int 60, int -1, uint 0, int -1 }, { int, int, uint, int } { int 61, int -1, uint 1, int 4 }, { int, int, uint, int } { int 62, int -1, uint 0, int -1 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 0, int -1 }, { int, int, uint, int } { int 65, int -1, uint 0, int -1 }, { int, int, uint, int } { int 66, int -1, uint 1, int 8 }, { int, int, uint, int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 1, int 8 }, { int, int, uint, int } { int 69, int -1, uint 1, int 10 }, { int, int, uint, int } { int 70, int -1, uint 1, int 1 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } { int 72, int -1, uint 1, int 2 }, { int, int, uint, int } { int 73, int -1, uint 0, int -1 }, { int, int, uint, int } { int 74, int -1, uint 0, int -1 }, { int, int, uint, int } { int 75, int -1, uint 0, int -1 }, { int, int, uint, int } { int 76, int -1, uint 1, int 1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 ! }, { int, int, uint, int } { int 78, int -1, uint 1, int 12 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 }, { int, int, uint, int } { int 80, int -1, uint 1, int 7 }, { int, int, uint, int } { int 81, int -1, uint 0, int -1 }, { int, int, uint, int } { int 82, int -1, uint 1, int 0 }, { int, int, uint, int } { int 83, int -1, uint 1, int 2 }, { int, int, uint, int } { int 84, int -1, uint 1, int 3 }, { int, int, uint, int } { int 85, int -1, uint 1, int 13 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 1, int 16 }, { int, int, uint, int } { int 87, int -2, uint 1, int 0 }, { int, int, uint, int } { int 88, int -1, uint 1, int 5 }, { int, int, uint, int } { int 88, int -2, uint 1, int 1 }, { int, int, uint, int } { int 89, int -1, uint 1, int 1 }, { int, int, uint, int } { int 90, int -1, uint 1, int 0 }, { int, int, uint, int } { int 91, int -1, uint 1, int 1 }, { int, int, uint, int } { int 92, i! nt -1, uint 1, int 6 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, int } { int 94, int -1, uint 1, int 4 }, { int, int, uint, int } { int 95, int -1, uint 1, int 15 }, { int, int, uint, int } { int 96, int -1, uint 0, int -1 }, { int, int, uint, int } { int 97, int -1, uint 1, int 4 }, { int, int, uint, int } { int 98, int -1, uint 0, int -1 }, { int, int, uint, int } { int 99, int -1, uint 1, int 1 }, { int, int, uint, int } { int 100, int -1, uint 0, int -1 }, { int, int, uint, int } { int 101, int -1, uint 0, int -1 }, { int, int, uint, int } { int 102, int -1, uint 0, int -1 }, { int, int, uint, int } { int 103, int -1, uint 1, int 1 }, { int, int, uint, int } { int 104, int -1, uint 0, int -1 }, { int, int, uint, int } { int 105, int -1, uint 0, int -1 }, { int, int, uint, int } { int 106, int -1, uint 1, int 1 }, { int, int, uint, int } { int 107, int -1, uint 0, int -1 }, { int, int, uint, int } { int 108, int -1, uint 1, int 0 }, { int, int, uint, int } { int 109, int -1, uint 0, int -1 }, { int, int,! uint, int } { int 110, int -1, uint 1, int 15 }, { int, int, uint, int } { int 111, int -1, uint 1, int 16 }, { int, int, uint, int } { int 112, int -1, uint 1, int 0 }, { int, int, uint, int } { int 113, int -1, uint 0, int -1 }, { int, int, uint, int } { int 114, int -1, uint 1, int 0 }, { int, int, uint, int } { int 115, int -1, uint 0, int -1 }, { int, int, uint, int } { int 116, int -1, uint 0, int -1 }, { int, int, uint, int } { int 117, int -1, uint 0, int -1 }, { int, int, uint, int } { int 118, int -1, uint 1, int 1 }, { int, int, uint, int } { int 119, int -1, uint 0, int -1 }, { int, int, uint, int } { int 120, int -1, uint 1, int 0 }, { int, int, uint, int } { int 121, int -1, uint 1, int 12 }, { int, int, uint, int } { int 122, int -1, uint 0, int -1 }, { int, int, uint, int } { int 123, int -1, uint 0, int -1 }, { int, int, uint, int } { int 124, int -1, uint 2, int 2015 }, { int, int, uint, int } { int 125, int -1, uint 0, int -1 }, { int, int, uint, int } {! int 126, int -1, uint 1, int 4 }, { int, int, uint, int } { int 127, int -1, uint 0, int -1 }, { int, int, uint, int } { int 128, int -1, uint 1, int 0 }, { int, int, uint, int } { int 129, int -1, uint 0, int -1 }, { int, int, uint, int } { int 130, int -1, uint 0, int -1 }, { int, int, uint, int } { int 131, int -1, uint 1, int 0 }, { int, int, uint, int } { int 132, int -1, uint 0, int -1 }, { int, int, uint, int } { int 133, int -1, uint 0, int -1 }, { int, int, uint, int } { int 134, int -1, uint 1, int 5 }, { int, int, uint, int } { int 135, int -1, uint 1, int 0 }, { int, int, uint, int } { int 136, int -1, uint 0, int -1 }, { int, int, uint, int } { int 137, int -1, uint 0, int -1 }, { int, int, uint, int } { int 138, int -1, uint 1, int 3 }, { int, int, uint, int } { int 139, int -1, uint 0, int -1 }, { int, int, uint, int } { int 140, int -1, uint 1, int 1 }, { int, int, uint, int } { int 141, int -1, uint 0, int -1 }, { int, int, uint, int } { int 142, int -1, uint 0, int -1 }, { int, int, uint, int } { int 143, int -1, uint 1, int! 1 }, { int, int, uint, int } { int 144, int -1, uint 1, int 2 }, { int, int, uint, int } { int 145, int -1, uint 1, int 0 }, { int, int, uint, int } { int 146, int -1, uint 0, int -1 }, { int, int, uint, int } { int 147, int -1, uint 1, int 0 }, { int, int, uint, int } { int 148, int -1, uint 0, int -1 }, { int, int, uint, int } { int 149, int -1, uint 0, int -1 }, { int, int, uint, int } { int 150, int -1, uint 1, int 0 }, { int, int, uint, int } { int 151, int -1, uint 1, int 0 }, { int, int, uint, int } { int 152, int -1, uint 0, int -1 }, { int, int, uint, int } { int 153, int -1, uint 0, int -1 }, { int, int, uint, int } { int 154, int -1, uint 1, int 1 }, { int, int, uint, int } { int 154, int -2, uint 1, int 0 }, { int, int, uint, int } { int 155, int -1, uint 1, int 0 }, { int, int, uint, int } { int 156, int -1, uint 0, int -1 }, { int, int, uint, int } { int 157, int -1, uint 0, int -1 }, { int, int, uint, int } { int 158, int -1, uint 0, int -1 }, { int, int, ui! nt, int } { int 159, int -1, uint 0, int -1 }, { int, int, uint, int } { int 160, int -1, uint 0, int -1 }, { int, int, uint, int } { int 161, int -1, uint 0, int -1 }, { int, int, uint, int } { int 162, int -1, uint 0, int -1 }, { int, int, uint, int } { int 163, int -1, uint 1, int 0 }, { int, int, uint, int } { int 164, int -1, uint 1, int 0 }, { int, int, uint, int } { int 165, int -1, uint 0, int -1 }, { int, int, uint, int } { int 166, int -1, uint 1, int 0 }, { int, int, uint, int } { int 167, int -1, uint 0, int -1 }, { int, int, uint, int } { int 168, int -1, uint 0, int -1 }, { int, int, uint, int } { int 169, int -1, uint 0, int -1 }, { int, int, uint, int } { int 170, int -1, uint 1, int 0 }, { int, int, uint, int } { int 171, int -1, uint 0, int -1 }, { int, int, uint, int } { int 172, int -1, uint 0, int -1 }, { int, int, uint, int } { int 173, int -1, uint 1, int 0 }, { int, int, uint, int } { int 174, int -1, uint 0, int -1 }, { int, int, uint, int } { int 175, int -1, uint 0, int -1 }, { int, int, uint, int } { int 176, int -1! , uint 1, int 0 }, { int, int, uint, int } { int 177, int -1, uint 0, int -1 }, { int, int, uint, int } { int 178, int -1, uint 0, int -1 }, { int, int, uint, int } { int 179, int -1, uint 0, int -1 }, { int, int, uint, int } { int 180, int -1, uint 1, int 0 }, { int, int, uint, int } { int 181, int -1, uint 0, int -1 }, { int, int, uint, int } { int 182, int -1, uint 0, int -1 }, { int, int, uint, int } { int 183, int -1, uint 1, int 0 }, { int, int, uint, int } { int 184, int -1, uint 0, int -1 }, { int, int, uint, int } { int 185, int -1, uint 1, int 1 }, { int, int, uint, int } { int 186, int -1, uint 0, int -1 }, { int, int, uint, int } { int 187, int -1, uint 0, int -1 }, { int, int, uint, int } { int 188, int -1, uint 0, int -1 }, { int, int, uint, int } { int 189, int -1, uint 1, int 1 }, { int, int, uint, int } { int 190, int -1, uint 1, int 1 }, { int, int, uint, int } { int 191, int -1, uint 0, int -1 }, { int, int, uint, int } { int 192, int -1, uint 0, int -1 }! , { int, int, uint, int } { int 193, int -1, uint 1, int 0 }, { int, i nt, uint, int } { int 193, int -2, uint 1, int 1 }, { int, int, uint, int } { int 194, int -1, uint 1, int 1 }, { int, int, uint, int } { int 195, int -1, uint 0, int -1 }, { int, int, uint, int } { int 196, int -1, uint 0, int -1 }, { int, int, uint, int } { int 197, int -1, uint 0, int -1 }, { int, int, uint, int } { int 198, int -1, uint 0, int -1 }, { int, int, uint, int } { int 199, int -1, uint 0, int -1 }, { int, int, uint, int } { int 200, int -1, uint 0, int -1 }, { int, int, uint, int } { int 201, int -1, uint 0, int -1 }, { int, int, uint, int } { int 202, int -1, uint 1, int 0 }, { int, int, uint, int } { int 203, int -1, uint 1, int 0 }, { int, int, uint, int } { int 204, int -1, uint 0, int -1 }, { int, int, uint, int } { int 205, int -1, uint 1, int 0 }, { int, int, uint, int } { int 206, int -1, uint 0, int -1 }, { int, int, uint, int } { int 207, int -1, uint 0, int -1 }, { int, int, uint, int } { int 208, int -1, uint 0, int -1 }, { int, int, uint, int } { ! int 209, int -1, uint 1, int 0 }, { int, int, uint, int } { int 210, int -1, uint 0, int -1 }, { int, int, uint, int } { int 211, int -1, uint 0, int -1 }, { int, int, uint, int } { int 212, int -1, uint 1, int 0 }, { int, int, uint, int } { int 213, int -1, uint 0, int -1 }, { int, int, uint, int } { int 214, int -1, uint 0, int -1 }, { int, int, uint, int } { int 215, int -1, uint 0, int -1 }, { int, int, uint, int } { int 216, int -1, uint 1, int 0 }, { int, int, uint, int } { int 216, int -2, uint 1, int 0 }, { int, int, uint, int } { int 217, int -1, uint 1, int 1 }, { int, int, uint, int } { int 218, int -1, uint 1, int 2 }, { int, int, uint, int } { int 219, int -1, uint 1, int 3 }, { int, int, uint, int } { int 220, int -1, uint 1, int 0 }, { int, int, uint, int } { int 221, int -1, uint 0, int -1 }, { int, int, uint, int } { int 222, int -1, uint 0, int -1 }, { int, int, uint, int } { int 223, int -1, uint 0, int -1 }, { int, int, uint, int } { int 224, int -1, uin! t 0, int -1 }, { int, int, uint, int } { int 225, int -1, uint 0, int -1 }, { int, int, uint, int } { int 226, int -1, uint 1, int 0 }, { int, int, uint, int } { int 227, int -1, uint 0, int -1 }, { int, int, uint, int } { int 228, int -1, uint 1, int 0 }, { int, int, uint, int } { int 229, int -1, uint 0, int -1 }, { int, int, uint, int } { int 230, int -1, uint 0, int -1 }, { int, int, uint, int } { int 231, int -1, uint 1, int 0 }, { int, int, uint, int } { int 232, int -1, uint 0, int -1 }, { int, int, uint, int } { int 233, int -1, uint 0, int -1 }, { int, int, uint, int } { int 234, int -1, uint 1, int 0 }, { int, int, uint, int } { int 235, int -1, uint 0, int -1 }, { int, int, uint, int } { int 236, int -1, uint 1, int 0 }, { int, int, uint, int } { int 237, int -1, uint 0, int -1 }, { int, int, uint, int } { int 238, int -1, uint 0, int -1 }, { int, int, uint, int } { int 239, int -1, uint 1, int 0 }, { int, int, uint, int } { int 240, int -1, uint 0, int -1 }, { int, int, uint, int } { int 241, int -1, uint 0, int -1 }, { int, int, u! int, int } { int 242, int -1, uint 0, int -1 }, { int, int, uint, int } { int 243, int -1, uint 1, int 0 }, { int, int, uint, int } { int 244, int -1, uint 0, int -1 }, { int, int, uint, int } { int 245, int -1, uint 1, int 0 }, { int, int, uint, int } { int 246, int -1, uint 0, int -1 }, { int, int, uint, int } { int 247, int -1, uint 0, int -1 }, { int, int, uint, int } { int 248, int -1, uint 1, int 0 }, { int, int, uint, int } { int 249, int -1, uint 0, int -1 }, { int, int, uint, int } { int 250, int -1, uint 0, int -1 }, { int, int, uint, int } { int 251, int -1, uint 1, int 0 }, { int, int, uint, int } { int 252, int -1, uint 0, int -1 }, { int, int, uint, int } { int 253, int -1, uint 1, int 0 }, { int, int, uint, int } { int 254, int -1, uint 0, int -1 }, { int, int, uint, int } { int 255, int -1, uint 0, int -1 }, { int, int, uint, int } { int 256, int -1, uint 1, int 0 }, { int, int, uint, int } { int 257, int -1, uint 0, int -1 }, { int, int, uint, int } { int 2! 58, int -1, uint 0, int -1 }, { int, int, uint, int } { int 259, int - 1, uint 1, int 7 }, { int, int, uint, int } { int 260, int -1, uint 0, int -1 }, { int, int, uint, int } { int 261, int -1, uint 0, int -1 }, { int, int, uint, int } { int 262, int -1, uint 1, int 0 }, { int, int, uint, int } { int 263, int -1, uint 0, int -1 }, { int, int, uint, int } { int 264, int -1, uint 0, int -1 }, { int, int, uint, int } { int 265, int -1, uint 1, int 0 }, { int, int, uint, int } { int 266, int -1, uint 0, int -1 }, { int, int, uint, int } { int 267, int -1, uint 0, int -1 }, { int, int, uint, int } { int 268, int -1, uint 1, int 0 }, { int, int, uint, int } { int 269, int -1, uint 0, int -1 }, { int, int, uint, int } { int 270, int -1, uint 0, int -1 }, { int, int, uint, int } { int 271, int -1, uint 1, int 0 }, { int, int, uint, int } { int 272, int -1, uint 0, int -1 }, { int, int, uint, int } { int 273, int -1, uint 1, int 0 }, { int, int, uint, int } { int 274, int -1, uint 0, int -1 }, { int, int, uint, int } { int 275, int -1, uint 1, int 0 },! { int, int, uint, int } { int 276, int -1, uint 0, int -1 }, { int, int, uint, int } { int 277, int -1, uint 0, int -1 }, { int, int, uint, int } { int 278, int -1, uint 1, int 1 }, { int, int, uint, int } { int 278, int -2, uint 1, int 1 }, { int, int, uint, int } { int 279, int -1, uint 1, int 0 }, { int, int, uint, int } { int 280, int -1, uint 0, int -1 }, { int, int, uint, int } { int 281, int -1, uint 0, int -1 }, { int, int, uint, int } { int 282, int -1, uint 0, int -1 }, { int, int, uint, int } { int 283, int -1, uint 1, int 1 }, { int, int, uint, int } { int 283, int -2, uint 1, int 1 }, { int, int, uint, int } { int 284, int -1, uint 0, int -1 }, { int, int, uint, int } { int 285, int -1, uint 1, int 0 }, { int, int, uint, int } { int 286, int -1, uint 1, int 0 }, { int, int, uint, int } { int 287, int -1, uint 0, int -1 }, { int, int, uint, int } { int 288, int -1, uint 0, int -1 }, { int, int, uint, int } { int 289, int -1, uint 0, int -1 } ] } ; <{ uint, [30! 2 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [2 x { uint, [0 x { int, int, uint, int }] }*] } { uint 2, [2 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [45 x { int, int, uint, int }] }* %list_equal.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [302 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [2 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [31 x sbyte*] } { uint 31, [31 x sbyte*] [ sbyte* cast ([27 x sbyte]* %.str_5 to sbyte*), sbyte* cast ([25 x sbyte]* %.str_6 to sbyte*), sbyte* cast ([25 x sbyte]* %.str_7 to sbyte*), sbyte* cast ([42 x sbyte]* %.str_8 to sbyte*), sbyte* cast ([37 x sbyte]* %.str_9 to sbyte*), sbyte* cast ([42 x sbyte]* %.str_10 to sbyte*), sbyte* cast ([35 x sbyte]* %.str_12 to sbyte*), sbyte* cast ([27 x sbyte]* %.str_13 to sbyte*), sbyte* cast ([4 x sbyte]* %.str_14 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [45 x { int, int, uint, int }] }* %list_equal.regAllocState to sbyte*), sbyte* cast ({ uint, [302 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast (int (%struct.DLL*, %struct.DLL*)* %list_equal to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* ! null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [31 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + declare void %exit(int) + + internal int %list_equal(%struct.DLL* %x, %struct.DLL* %y) { + entry: + %tmp.38 = getelementptr %struct.DLL* %x, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.49 = load %struct.DLL** %tmp.38 ; <%struct.DLL*> [#uses=1] + %tmp.610 = seteq %struct.DLL* %tmp.49, %x ; [#uses=1] + br bool %tmp.610, label %loopexit, label %no_exit.preheader + + no_exit.preheader: ; preds = %entry + br label %no_exit + + no_exit: ; preds = %no_exit.preheader, %backEdgeInst + %yp.0.0 = phi %struct.DLL* [ %tmp.21, %backEdgeInst ], [ %y, %no_exit.preheader ] ; <%struct.DLL*> [#uses=2] + %xp.0.0 = phi %struct.DLL* [ %tmp.18, %backEdgeInst ], [ %x, %no_exit.preheader ] ; <%struct.DLL*> [#uses=2] + %tmp.9 = getelementptr %struct.DLL* %xp.0.0, long 0, uint 0 ; [#uses=1] + %tmp.10 = load int* %tmp.9 ; [#uses=1] + %tmp.12 = getelementptr %struct.DLL* %yp.0.0, long 0, uint 0 ; [#uses=1] + %tmp.13 = load int* %tmp.12 ; [#uses=1] + %tmp.14 = seteq int %tmp.10, %tmp.13 ; [#uses=1] + br bool %tmp.14, label %endif.0, label %UnifiedReturnBlock.loopexit + + endif.0: ; preds = %no_exit + %tmp.17 = getelementptr %struct.DLL* %xp.0.0, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.18 = load %struct.DLL** %tmp.17 ; <%struct.DLL*> [#uses=3] + %tmp.20 = getelementptr %struct.DLL* %yp.0.0, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.21 = load %struct.DLL** %tmp.20 ; <%struct.DLL*> [#uses=2] + %tmp.3 = getelementptr %struct.DLL* %tmp.18, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.4 = load %struct.DLL** %tmp.3 ; <%struct.DLL*> [#uses=1] + %tmp.6 = seteq %struct.DLL* %tmp.4, %x ; [#uses=1] + br bool %tmp.6, label %loopexit.loopexit, label %backEdgeInst + + loopexit.loopexit: ; preds = %endif.0 + br label %loopexit + + loopexit: ; preds = %entry, %loopexit.loopexit + %yp.0.1 = phi %struct.DLL* [ %y, %entry ], [ %tmp.21, %loopexit.loopexit ] ; <%struct.DLL*> [#uses=2] + %xp.0.1 = phi %struct.DLL* [ %x, %entry ], [ %tmp.18, %loopexit.loopexit ] ; <%struct.DLL*> [#uses=1] + %tmp.23 = getelementptr %struct.DLL* %xp.0.1, long 0, uint 0 ; [#uses=1] + %tmp.24 = load int* %tmp.23 ; [#uses=1] + %tmp.26 = getelementptr %struct.DLL* %yp.0.1, long 0, uint 0 ; [#uses=1] + %tmp.27 = load int* %tmp.26 ; [#uses=1] + %tmp.28 = seteq int %tmp.24, %tmp.27 ; [#uses=1] + br bool %tmp.28, label %endif.1, label %UnifiedReturnBlock + + endif.1: ; preds = %loopexit + %tmp.31 = getelementptr %struct.DLL* %yp.0.1, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.32 = load %struct.DLL** %tmp.31 ; <%struct.DLL*> [#uses=1] + %tmp.34 = seteq %struct.DLL* %tmp.32, %y ; [#uses=1] + %tmp.35 = cast bool %tmp.34 to int ; [#uses=1] + ret int %tmp.35 + + UnifiedReturnBlock.loopexit: ; preds = %no_exit + br label %UnifiedReturnBlock + + UnifiedReturnBlock: ; preds = %loopexit, %UnifiedReturnBlock.loopexit + ret int 0 + + backEdgeInst: ; preds = %endif.0 + call void %llvm_first_trigger( ) + br label %no_exit + } + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 2999999 to int ; [#uses=1] + br bool %tmp.1, label %cond_true, label %no_exit.preheader + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=2] + %dec2 = add int %tmp.3, -1 ; [#uses=1] + %tmp.93 = seteq int %tmp.3, 0 ; [#uses=1] + br bool %tmp.93, label %loopexit, label %no_exit.preheader + + no_exit.preheader: ; preds = %__main.entry, %cond_true + %dec.0.ph = phi int [ %dec2, %cond_true ], [ %copyConst, %__main.entry ] ; [#uses=1] + %dec.0.ph = cast int %dec.0.ph to uint ; [#uses=1] + %tmp. = add uint %dec.0.ph, 1 ; [#uses=1] + "constantGEP:" = getelementptr [101 x %struct.DLL]* null, uint 1 ; <[101 x %struct.DLL]*> [#uses=1] + %constantCast = cast [101 x %struct.DLL]* "constantGEP:" to uint ; [#uses=2] + %v9 = cast int 0 to long ; [#uses=4] + %v953 = cast int 100 to long ; [#uses=4] + %v959 = cast int 99 to long ; [#uses=1] + %copyConst63 = cast int 100 to int ; [#uses=1] + "constantGEP:" = getelementptr %struct.DLL* null, uint 1 ; <%struct.DLL*> [#uses=1] + %constantCast88 = cast %struct.DLL* "constantGEP:" to uint ; [#uses=1] + "addrOfGlobal:.str_5" = getelementptr [27 x sbyte]* %.str_5, long 0 ; <[27 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_5" = getelementptr [27 x sbyte]* "addrOfGlobal:.str_5", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_6" = getelementptr [25 x sbyte]* %.str_6, long 0 ; <[25 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_6" = getelementptr [25 x sbyte]* "addrOfGlobal:.str_6", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_7" = getelementptr [25 x sbyte]* %.str_7, long 0 ; <[25 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_7" = getelementptr [25 x sbyte]* "addrOfGlobal:.str_7", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_8" = getelementptr [42 x sbyte]* %.str_8, long 0 ; <[42 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_8" = getelementptr [42 x sbyte]* "addrOfGlobal:.str_8", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_9" = getelementptr [37 x sbyte]* %.str_9, long 0 ; <[37 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_9" = getelementptr [37 x sbyte]* "addrOfGlobal:.str_9", long 0, long 0 ; [#uses=2] + "addrOfGlobal:.str_10" = getelementptr [42 x sbyte]* %.str_10, long 0 ; <[42 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_10" = getelementptr [42 x sbyte]* "addrOfGlobal:.str_10", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_12" = getelementptr [35 x sbyte]* %.str_12, long 0 ; <[35 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_12" = getelementptr [35 x sbyte]* "addrOfGlobal:.str_12", long 0, long 0 ; [#uses=1] + "addrOfGlobal:.str_13" = getelementptr [27 x sbyte]* %.str_13, long 0 ; <[27 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_13" = getelementptr [27 x sbyte]* "addrOfGlobal:.str_13", long 0, long 0 ; [#uses=1] + br label %no_exit + + no_exit: ; preds = %no_exit.preheader, %test_lists.entry + %indvar = phi uint [ 0, %no_exit.preheader ], [ %indvar.next, %test_lists.entry ] ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :0 [#uses=1] + cast sbyte* %0 to [101 x %struct.DLL]* ; <[101 x %struct.DLL]*>:0 [#uses=5] + %ptr1 = getelementptr [101 x %struct.DLL]* %0, long %v9 ; <[101 x %struct.DLL]*> [#uses=5] + %tmp.12.i.i.sub40 = getelementptr [101 x %struct.DLL]* %ptr1, long 0, long %v9 ; <%struct.DLL*> [#uses=7] + br label %no_exit.i.i + + no_exit.i.i: ; preds = %no_exit, %backEdgeInst + %indvar.i.i = phi uint [ %indvar.next.i.i, %backEdgeInst ], [ 0, %no_exit ] ; [#uses=2] + %i.0.0.i.i = cast uint %indvar.i.i to int ; [#uses=3] + %j.0.0.i.i = add int %i.0.0.i.i, 1 ; [#uses=3] + %v941 = cast int %i.0.0.i.i to long ; [#uses=2] + %ptr1 = getelementptr [101 x %struct.DLL]* %0, long 0, long %v941 ; <%struct.DLL*> [#uses=2] + %tmp.27.i.i1 = getelementptr %struct.DLL* %ptr1, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %v943 = cast int %j.0.0.i.i to long ; [#uses=2] + %tmp.32.i.i45 = getelementptr [101 x %struct.DLL]* %ptr1, long 0, long %v943 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.32.i.i45, %struct.DLL** %tmp.27.i.i1 + %ptr12 = getelementptr [101 x %struct.DLL]* %0, long 0, long %v943 ; <%struct.DLL*> [#uses=1] + %tmp.37.i.i3 = getelementptr %struct.DLL* %ptr12, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + %tmp.42.i.i50 = getelementptr [101 x %struct.DLL]* %ptr1, long 0, long %v941 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.42.i.i50, %struct.DLL** %tmp.37.i.i3 + %tmp.47.i.i5 = getelementptr %struct.DLL* %ptr1, long 0, uint 0 ; [#uses=1] + store int %i.0.0.i.i, int* %tmp.47.i.i5 + %tmp.21.i.i = setlt int %j.0.0.i.i, 100 ; [#uses=1] + %indvar.next.i.i = add uint %indvar.i.i, 1 ; [#uses=1] + br bool %tmp.21.i.i, label %backEdgeInst, label %list_sequence.entry.i + + list_sequence.entry.i: ; preds = %no_exit.i.i + %ptr16 = getelementptr [101 x %struct.DLL]* %0, long 0, long 0 ; <%struct.DLL*> [#uses=3] + %tmp.53.i.i7 = getelementptr %struct.DLL* %ptr16, long 0, uint 2 ; <%struct.DLL**> [#uses=2] + %tmp.57.i.i55 = getelementptr [101 x %struct.DLL]* %ptr1, long 0, long %v953 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.57.i.i55, %struct.DLL** %tmp.53.i.i7 + %ptr18 = getelementptr [101 x %struct.DLL]* %0, long 0, long %v953 ; <%struct.DLL*> [#uses=3] + %tmp.62.i.i9 = getelementptr %struct.DLL* %ptr18, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.12.i.i.sub40, %struct.DLL** %tmp.62.i.i9 + %tmp.69.i.i11 = getelementptr %struct.DLL* %ptr18, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + %tmp.74.i.i61 = getelementptr [101 x %struct.DLL]* %ptr1, long 0, long %v959 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.74.i.i61, %struct.DLL** %tmp.69.i.i11 + %tmp.79.i.i13 = getelementptr %struct.DLL* %ptr18, long 0, uint 0 ; [#uses=2] + store int %j.0.0.i.i, int* %tmp.79.i.i13 + %tmp.83.i.i15 = getelementptr %struct.DLL* %ptr16, long 0, uint 0 ; [#uses=2] + store int %copyConst63, int* %tmp.83.i.i15 + call sbyte* %malloc( uint %constantCast ) ; :1 [#uses=1] + cast sbyte* %1 to [101 x %struct.DLL]* ; <[101 x %struct.DLL]*>:1 [#uses=5] + %ptr168 = getelementptr [101 x %struct.DLL]* %1, long %v9 ; <[101 x %struct.DLL]*> [#uses=4] + %tmp.2.i.i.sub69 = getelementptr [101 x %struct.DLL]* %ptr168, long 0, long %v9 ; <%struct.DLL*> [#uses=6] + br label %no_exit.i4.i + + no_exit.i4.i: ; preds = %list_sequence.entry.i, %no_exit.i4.i + %indvar.i5.i = phi uint [ %indvar.next.i8.i, %no_exit.i4.i ], [ 0, %list_sequence.entry.i ] ; [#uses=2] + %xp.0.0.i.i = phi %struct.DLL* [ %tmp.43.i.i, %no_exit.i4.i ], [ %tmp.12.i.i.sub40, %list_sequence.entry.i ] ; <%struct.DLL*> [#uses=2] + %i.0.0.i6.i = cast uint %indvar.i5.i to int ; [#uses=2] + %j.0.0.i7.i = add int %i.0.0.i6.i, 1 ; [#uses=2] + %v970 = cast int %i.0.0.i6.i to long ; [#uses=2] + %ptr116 = getelementptr [101 x %struct.DLL]* %1, long 0, long %v970 ; <%struct.DLL*> [#uses=2] + %tmp.17.i.i17 = getelementptr %struct.DLL* %ptr116, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %v972 = cast int %j.0.0.i7.i to long ; [#uses=2] + %tmp.21.i.i74 = getelementptr [101 x %struct.DLL]* %ptr168, long 0, long %v972 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.21.i.i74, %struct.DLL** %tmp.17.i.i17 + %ptr118 = getelementptr [101 x %struct.DLL]* %1, long 0, long %v972 ; <%struct.DLL*> [#uses=1] + %tmp.26.i.i19 = getelementptr %struct.DLL* %ptr118, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + %tmp.30.i.i79 = getelementptr [101 x %struct.DLL]* %ptr168, long 0, long %v970 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.30.i.i79, %struct.DLL** %tmp.26.i.i19 + %tmp.35.i.i21 = getelementptr %struct.DLL* %ptr116, long 0, uint 0 ; [#uses=1] + %tmp.37.i.i = getelementptr %struct.DLL* %xp.0.0.i.i, long 0, uint 0 ; [#uses=1] + %tmp.38.i.i = load int* %tmp.37.i.i ; [#uses=1] + store int %tmp.38.i.i, int* %tmp.35.i.i21 + %tmp.42.i.i = getelementptr %struct.DLL* %xp.0.0.i.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.43.i.i = load %struct.DLL** %tmp.42.i.i ; <%struct.DLL*> [#uses=1] + %tmp.11.i.i = setlt int %j.0.0.i7.i, 100 ; [#uses=1] + %indvar.next.i8.i = add uint %indvar.i5.i, 1 ; [#uses=1] + br bool %tmp.11.i.i, label %no_exit.i4.i, label %list_copy.entry.i + + list_copy.entry.i: ; preds = %no_exit.i4.i + %ptr122 = getelementptr [101 x %struct.DLL]* %1, long 0, long 0 ; <%struct.DLL*> [#uses=4] + %tmp.46.i.i23 = getelementptr %struct.DLL* %ptr122, long 0, uint 2 ; <%struct.DLL**> [#uses=4] + %tmp.50.i.i84 = getelementptr [101 x %struct.DLL]* %ptr168, long 0, long %v953 ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.50.i.i84, %struct.DLL** %tmp.46.i.i23 + %ptr124 = getelementptr [101 x %struct.DLL]* %1, long 0, long %v953 ; <%struct.DLL*> [#uses=2] + %tmp.55.i.i25 = getelementptr %struct.DLL* %ptr124, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.2.i.i.sub69, %struct.DLL** %tmp.55.i.i25 + %tmp.62.i.i27 = getelementptr %struct.DLL* %ptr124, long 0, uint 0 ; [#uses=1] + %tmp.66.i.i = load int* %tmp.79.i.i13 ; [#uses=1] + store int %tmp.66.i.i, int* %tmp.62.i.i27 + call sbyte* %malloc( uint %constantCast88 ) ; :2 [#uses=1] + cast sbyte* %2 to %struct.DLL* ; <%struct.DLL*>:0 [#uses=8] + %tmp.3.i.i = getelementptr %struct.DLL* %0, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %0, %struct.DLL** %tmp.3.i.i + %tmp.6.i.i = getelementptr %struct.DLL* %0, long 0, uint 2 ; <%struct.DLL**> [#uses=5] + store %struct.DLL* %0, %struct.DLL** %tmp.6.i.i + %tmp.9.i.i = getelementptr %struct.DLL* %0, long 0, uint 0 ; [#uses=9] + store int 0, int* %tmp.9.i.i + %tmp.5.i = call int %list_equal( %struct.DLL* %tmp.2.i.i.sub69, %struct.DLL* %tmp.12.i.i.sub40 ) ; [#uses=1] + %tmp.8.i = seteq int %tmp.5.i, 0 ; [#uses=1] + br bool %tmp.8.i, label %then.0.i, label %loopentry.0.i + + then.0.i: ; preds = %list_copy.entry.i + %tmp.10.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_5" ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + loopentry.0.i: ; preds = %list_copy.entry.i + %tmp.1.i.i.i31 = getelementptr %struct.DLL* %ptr122, long 0, uint 0 ; [#uses=8] + %tmp.2.i.i.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %tmp.2.i.i = seteq int %tmp.2.i.i.i, 0 ; [#uses=1] + br bool %tmp.2.i.i, label %loopexit.0.i, label %no_exit.0.preheader.i + + no_exit.0.preheader.i: ; preds = %loopentry.0.i + %tmp.5.i56.i33 = getelementptr %struct.DLL* %ptr122, long 0, uint 1 ; <%struct.DLL**> [#uses=2] + br label %no_exit.0.i + + no_exit.0.i: ; preds = %no_exit.0.preheader.i, %list_pop_head.entry.i + %tmp.2.i.i.i51.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %tmp.2.i.i52.i = seteq int %tmp.2.i.i.i51.i, 0 ; [#uses=1] + br bool %tmp.2.i.i52.i, label %list_pop_head.entry.i, label %endif.i55.i + + endif.i55.i: ; preds = %no_exit.0.i + %tmp.6.i57.i = load %struct.DLL** %tmp.5.i56.i33 ; <%struct.DLL*> [#uses=2] + %tmp.10.i59.i = getelementptr %struct.DLL* %tmp.6.i57.i, long 0, uint 1 ; <%struct.DLL**> [#uses=2] + %tmp.11.i.i = load %struct.DLL** %tmp.10.i59.i ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.11.i.i, %struct.DLL** %tmp.5.i56.i33 + %tmp.14.i.i = load %struct.DLL** %tmp.10.i59.i ; <%struct.DLL*> [#uses=1] + %tmp.15.i.i = getelementptr %struct.DLL* %tmp.14.i.i, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.2.i.i.sub69, %struct.DLL** %tmp.15.i.i + %tmp.19.i.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %dec.i61.i = add int %tmp.19.i.i, -1 ; [#uses=1] + store int %dec.i61.i, int* %tmp.1.i.i.i31 + br label %list_pop_head.entry.i + + list_pop_head.entry.i: ; preds = %no_exit.0.i, %endif.i55.i + %tmp.1763.i = phi %struct.DLL* [ %tmp.6.i57.i, %endif.i55.i ], [ null, %no_exit.0.i ] ; <%struct.DLL*> [#uses=4] + %tmp.2.i42.i = load %struct.DLL** %tmp.6.i.i ; <%struct.DLL*> [#uses=2] + %tmp.4.i43.i = getelementptr %struct.DLL* %tmp.2.i42.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.1763.i, %struct.DLL** %tmp.4.i43.i + %tmp.7.i44.i = getelementptr %struct.DLL* %tmp.1763.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %0, %struct.DLL** %tmp.7.i44.i + store %struct.DLL* %tmp.1763.i, %struct.DLL** %tmp.6.i.i + %tmp.13.i46.i = getelementptr %struct.DLL* %tmp.1763.i, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.2.i42.i, %struct.DLL** %tmp.13.i46.i + %tmp.17.i48.i = load int* %tmp.9.i.i ; [#uses=1] + %inc.i49.i = add int %tmp.17.i48.i, 1 ; [#uses=1] + store int %inc.i49.i, int* %tmp.9.i.i + %tmp.2.i.i65.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %tmp.2.i66.i = seteq int %tmp.2.i.i65.i, 0 ; [#uses=1] + br bool %tmp.2.i66.i, label %loopexit.0.i.loopexit, label %no_exit.0.i + + loopexit.0.i.loopexit: ; preds = %list_pop_head.entry.i + br label %loopexit.0.i + + loopexit.0.i: ; preds = %loopentry.0.i, %loopexit.0.i.loopexit + %tmp.2.i.i38.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %tmp.2.i39.i = seteq int %tmp.2.i.i38.i, 0 ; [#uses=1] + br bool %tmp.2.i39.i, label %loopentry.1.i, label %then.1.i1 + + then.1.i1: ; preds = %loopexit.0.i + %tmp.23.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_6" ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + loopentry.1.i: ; preds = %loopexit.0.i + %tmp.2.i.i34.i = load int* %tmp.9.i.i ; [#uses=1] + %tmp.2.i35.i = seteq int %tmp.2.i.i34.i, 0 ; [#uses=1] + br bool %tmp.2.i35.i, label %loopexit.1.i, label %no_exit.1.i.preheader + + no_exit.1.i.preheader: ; preds = %loopentry.1.i + br label %no_exit.1.i + + no_exit.1.i: ; preds = %no_exit.1.i.preheader, %list_pop_tail.entry.i + %tmp.2.i.i.i.i = load int* %tmp.9.i.i ; [#uses=1] + %tmp.2.i.i.i = seteq int %tmp.2.i.i.i.i, 0 ; [#uses=1] + br bool %tmp.2.i.i.i, label %list_pop_tail.entry.i, label %endif.i.i + + endif.i.i: ; preds = %no_exit.1.i + %tmp.6.i.i = load %struct.DLL** %tmp.6.i.i ; <%struct.DLL*> [#uses=2] + %tmp.8.i29.i = getelementptr %struct.DLL* %tmp.6.i.i, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + %tmp.9.i30.i = load %struct.DLL** %tmp.8.i29.i ; <%struct.DLL*> [#uses=2] + %tmp.11.i31.i = getelementptr %struct.DLL* %tmp.9.i30.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %0, %struct.DLL** %tmp.11.i31.i + store %struct.DLL* %tmp.9.i30.i, %struct.DLL** %tmp.6.i.i + %tmp.18.i.i = load int* %tmp.9.i.i ; [#uses=1] + %dec.i.i = add int %tmp.18.i.i, -1 ; [#uses=1] + store int %dec.i.i, int* %tmp.9.i.i + br label %list_pop_tail.entry.i + + list_pop_tail.entry.i: ; preds = %no_exit.1.i, %endif.i.i + %tmp.3032.i = phi %struct.DLL* [ %tmp.6.i.i, %endif.i.i ], [ null, %no_exit.1.i ] ; <%struct.DLL*> [#uses=4] + %tmp.2.i27.i = load %struct.DLL** %tmp.46.i.i23 ; <%struct.DLL*> [#uses=2] + %tmp.4.i.i = getelementptr %struct.DLL* %tmp.2.i27.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.3032.i, %struct.DLL** %tmp.4.i.i + %tmp.7.i.i = getelementptr %struct.DLL* %tmp.3032.i, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.2.i.i.sub69, %struct.DLL** %tmp.7.i.i + store %struct.DLL* %tmp.3032.i, %struct.DLL** %tmp.46.i.i23 + %tmp.13.i.i = getelementptr %struct.DLL* %tmp.3032.i, long 0, uint 2 ; <%struct.DLL**> [#uses=1] + store %struct.DLL* %tmp.2.i27.i, %struct.DLL** %tmp.13.i.i + %tmp.17.i.i = load int* %tmp.1.i.i.i31 ; [#uses=1] + %inc.i.i = add int %tmp.17.i.i, 1 ; [#uses=1] + store int %inc.i.i, int* %tmp.1.i.i.i31 + %tmp.2.i.i3470.i = load int* %tmp.9.i.i ; [#uses=1] + %tmp.2.i3571.i = seteq int %tmp.2.i.i3470.i, 0 ; [#uses=1] + br bool %tmp.2.i3571.i, label %loopexit.1.i.loopexit, label %no_exit.1.i + + loopexit.1.i.loopexit: ; preds = %list_pop_tail.entry.i + br label %loopexit.1.i + + loopexit.1.i: ; preds = %loopentry.1.i, %loopexit.1.i.loopexit + %tmp.2.i.i23.i = load int* %tmp.9.i.i ; [#uses=1] + %tmp.2.i24.i = seteq int %tmp.2.i.i23.i, 0 ; [#uses=1] + br bool %tmp.2.i24.i, label %loopentry.i.i.preheader, label %then.2.i2 + + then.2.i2: ; preds = %loopexit.1.i + %tmp.36.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_7" ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + loopentry.i.i.preheader: ; preds = %loopexit.1.i + br label %loopentry.i.i + + loopentry.i.i: ; preds = %loopentry.i.i.preheader, %loopentry.i.i + %p.0.i.i = phi %struct.DLL* [ %tmp.4.i.i, %loopentry.i.i ], [ %tmp.12.i.i.sub40, %loopentry.i.i.preheader ] ; <%struct.DLL*> [#uses=2] + %tmp.3.i20.i = getelementptr %struct.DLL* %p.0.i.i, long 0, uint 1 ; <%struct.DLL**> [#uses=2] + %tmp.4.i.i = load %struct.DLL** %tmp.3.i20.i ; <%struct.DLL*> [#uses=3] + %tmp.8.i.i = getelementptr %struct.DLL* %p.0.i.i, long 0, uint 2 ; <%struct.DLL**> [#uses=2] + %tmp.9.i.i = load %struct.DLL** %tmp.8.i.i ; <%struct.DLL*> [#uses=1] + store %struct.DLL* %tmp.9.i.i, %struct.DLL** %tmp.3.i20.i + store %struct.DLL* %tmp.4.i.i, %struct.DLL** %tmp.8.i.i + %tmp.16.i.i = seteq %struct.DLL* %tmp.4.i.i, %tmp.12.i.i.sub40 ; [#uses=1] + br bool %tmp.16.i.i, label %list_reverse.entry.i, label %loopentry.i.i + + list_reverse.entry.i: ; preds = %loopentry.i.i + %tmp.1.i18.i35 = getelementptr %struct.DLL* %ptr16, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.2.i19.i = load %struct.DLL** %tmp.1.i18.i35 ; <%struct.DLL*> [#uses=1] + %tmp.41.i = getelementptr %struct.DLL* %tmp.2.i19.i, long 0, uint 0 ; [#uses=1] + %tmp.42.i = load int* %tmp.41.i ; [#uses=2] + %tmp.43.i = seteq int %tmp.42.i, 100 ; [#uses=1] + br bool %tmp.43.i, label %endif.3.i, label %then.3.i + + then.3.i: ; preds = %list_reverse.entry.i + %tmp.45.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_8", int 100, int %tmp.42.i ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.3.i: ; preds = %list_reverse.entry.i + %tmp.2.i15.i = load %struct.DLL** %tmp.53.i.i7 ; <%struct.DLL*> [#uses=1] + %tmp.53.i = getelementptr %struct.DLL* %tmp.2.i15.i, long 0, uint 0 ; [#uses=1] + %tmp.54.i = load int* %tmp.53.i ; [#uses=2] + %tmp.55.i = seteq int %tmp.54.i, 1 ; [#uses=1] + br bool %tmp.55.i, label %endif.4.i, label %then.4.i + + then.4.i: ; preds = %endif.3.i + %tmp.57.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_9", int 100, int %tmp.54.i ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.4.i: ; preds = %endif.3.i + %tmp.1.i10.i37 = getelementptr %struct.DLL* %ptr122, long 0, uint 1 ; <%struct.DLL**> [#uses=1] + %tmp.2.i11.i = load %struct.DLL** %tmp.1.i10.i37 ; <%struct.DLL*> [#uses=1] + %tmp.65.i = getelementptr %struct.DLL* %tmp.2.i11.i, long 0, uint 0 ; [#uses=1] + %tmp.66.i = load int* %tmp.65.i ; [#uses=2] + %tmp.67.i = seteq int %tmp.66.i, 100 ; [#uses=1] + br bool %tmp.67.i, label %endif.5.i, label %then.5.i + + then.5.i: ; preds = %endif.4.i + %tmp.69.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_10", int 100, int %tmp.66.i ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.5.i: ; preds = %endif.4.i + %tmp.2.i7.i = load %struct.DLL** %tmp.46.i.i23 ; <%struct.DLL*> [#uses=1] + %tmp.77.i = getelementptr %struct.DLL* %tmp.2.i7.i, long 0, uint 0 ; [#uses=1] + %tmp.78.i = load int* %tmp.77.i ; [#uses=2] + %tmp.79.i = seteq int %tmp.78.i, 1 ; [#uses=1] + br bool %tmp.79.i, label %endif.6.i, label %then.6.i + + then.6.i: ; preds = %endif.5.i + %tmp.81.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_9", int 100, int %tmp.78.i ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.6.i: ; preds = %endif.5.i + %tmp.2.i5.i = load int* %tmp.83.i.i15 ; [#uses=3] + %tmp.89.i = seteq int %tmp.2.i5.i, 100 ; [#uses=1] + br bool %tmp.89.i, label %endif.7.i, label %then.7.i + + then.7.i: ; preds = %endif.6.i + %tmp.91.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_12", int 100, int %tmp.2.i5.i ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.7.i: ; preds = %endif.6.i + %tmp.95.i = call int %list_equal( %struct.DLL* %tmp.12.i.i.sub40, %struct.DLL* %tmp.2.i.i.sub69 ) ; [#uses=1] + %tmp.98.i = seteq int %tmp.95.i, 0 ; [#uses=1] + br bool %tmp.98.i, label %then.8.i, label %endif.8.i + + then.8.i: ; preds = %endif.7.i + %tmp.100.i = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_13" ) ; [#uses=0] + call void %exit( int 1 ) + br label %test_lists.entry + + endif.8.i: ; preds = %endif.7.i + cast %struct.DLL* %tmp.12.i.i.sub40 to sbyte* ; :3 [#uses=1] + call void %free( sbyte* %3 ) + cast %struct.DLL* %tmp.2.i.i.sub69 to sbyte* ; :4 [#uses=1] + call void %free( sbyte* %4 ) + cast %struct.DLL* %0 to sbyte* ; :5 [#uses=1] + call void %free( sbyte* %5 ) + br label %test_lists.entry + + test_lists.entry: ; preds = %then.0.i, %then.1.i1, %then.2.i2, %then.3.i, %then.4.i, %then.5.i, %then.6.i, %then.7.i, %then.8.i, %endif.8.i + %tmp.1213 = phi int [ 0, %then.0.i ], [ 0, %then.1.i1 ], [ 0, %then.2.i2 ], [ 0, %then.3.i ], [ 0, %then.4.i ], [ 0, %then.5.i ], [ 0, %then.6.i ], [ 0, %then.7.i ], [ 0, %then.8.i ], [ %tmp.2.i5.i, %endif.8.i ] ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=2] + %exitcond = seteq uint %indvar.next, %tmp. ; [#uses=1] + br bool %exitcond, label %loopexit.loopexit, label %no_exit + + loopexit.loopexit: ; preds = %test_lists.entry + br label %loopexit + + loopexit: ; preds = %cond_true, %loopexit.loopexit + %result.1.0.1 = phi int [ 0, %cond_true ], [ %tmp.1213, %loopexit.loopexit ] ; [#uses=1] + "addrOfGlobal:.str_14" = getelementptr [4 x sbyte]* %.str_14, long 0 ; <[4 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_14" = getelementptr [4 x sbyte]* "addrOfGlobal:.str_14", long 0, long 0 ; [#uses=1] + %tmp.13 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_14", int %result.1.0.1 ) ; [#uses=0] + ret int 0 + + backEdgeInst: ; preds = %no_exit.i.i + call void %llvm_first_trigger( ) + br label %no_exit.i.i + } + + declare int %atoi(sbyte*) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/lists.main.trace9.txt diff -c /dev/null reopt/test/TTFTestCases/lists.main.trace9.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/lists.main.trace9.txt Wed Sep 8 16:34:21 2004 *************** *** 0 **** --- 1,2 ---- + main + 6 45 Index: reopt/test/TTFTestCases/methcall.ll diff -c /dev/null reopt/test/TTFTestCases/methcall.ll:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/methcall.ll Wed Sep 8 16:34:22 2004 *************** *** 0 **** --- 1,282 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.NthToggle = type { sbyte, sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)*, int, int } + %struct.Toggle = type { sbyte, sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [6 x sbyte] c"true\0A\00" ; <[6 x sbyte]*> [#uses=2] + %.str_2 = internal constant [7 x sbyte] c"false\0A\00" ; <[7 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)*, %struct.NthToggle* (%struct.NthToggle*)*, int (int, sbyte**)* } { sbyte (%struct.Toggle*)* %toggle_value, %struct.Toggle* (%struct.Toggle*)* %toggle_activate, %struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate, int (int, sbyte**)* %main } ; <{ sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)*, %struct.NthToggle* (%struct.NthToggle*)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [4 x sbyte] c"\01\01\01\00" ; <[4 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 4 ; [#uses=0] + %toggle_value.regAllocState = internal constant { uint, [4 x { int, int, uint, int }] } { uint 4, [4 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 0, int -1 }, { int, int, uint, int } { int 1, int -1, uint 1, int 15 }, { int, int, uint, int } { int 2, int -1, uint 0, int -1 } ] } ; <{ uint, [4 x { int, int, uint, int }] }*> [#uses=2] + %toggle_activate.regAllocState = internal constant { uint, [7 x { int, int, uint, int }] } { uint 7, [7 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 1, int 2 }, { int, int, uint, int } { int 1, int -1, uint 1, int 0 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 } ] } ; <{ uint, [7 x { int, int, uint, int }] }*> [#uses=2] + %nth_toggle_activate.regAllocState = internal constant { uint, [17 x { int, int, uint, int }] } { uint 17, [17 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 1, int 3 }, { int, int, uint, int } { int 1, int -1, uint 1, int 1 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 1, int 0 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 1 }, { int, int, uint, int } { int 9, int -1, uint 1, int 2 }, { int, int, uint, int } { int 10, int -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 0, int -1 }, { int, int, uint, int } { int 12, int -1, uint 0, int -1 }, { int, int, uint, int } {! int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 } ] } ; <{ uint, [17 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [150 x { int, int, uint, int }] } { uint 150, [150 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 3 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 0 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 1, int 14 }, { int, int, uint, int } { int 14, int -2, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 1, int 0 }, { int, int, uint, int } { int 16, int -1, uint 1, int 0 }, { int, int, uint, int } { int 17, int -1, uint 1, int 0 }, { int, int, uint, int } { int 18, int -1, uint 1, int 13 }, { int, int, uint, int } { int 19, int -1, uint 1, int 11 }, { int, int, uint, int } { int 20, int -1, uint 1, int 7 }, { int, int, uint, int } { int 21, int -1, uint 0, int -1 }, { int, int, uint, int } { int 22, int -1, uint 0, int -1 }, { int, int, uint, int } { int 23, int -1, uint 1, int 9 }, { int, int, uint, int } { int 24, int -1, uint 0, int -1 }, { int, int, uint, int } { int 25, int -1, uint 1, int 15 }, { int, int, uint, int } { int 26, int -1, uint 1, int 16 }, { int, int, uint, int } { int 27, int -1, uint 0, int -1 }, { int, int, ! uint, int } { int 28, int -1, uint 1, int 12 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 1, int 8 }, { int, int, uint, int } { int 31, int -2, uint 1, int 8 }, { int, int, uint, int } { int 32, int -1, uint 1, int 10 }, { int, int, uint, int } { int 33, int -1, uint 1, int 6 }, { int, int, uint, int } { int 34, int -1, uint 1, int 6 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 1, int 6 }, { int, int, uint, int } { int 37, int -1, uint 1, int 0 }, { int, int, uint, int } { int 38, int -1, uint 1, int 10 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 1, int 8 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, { int, int, uint, int } { int 42, int -1, uint 0, int -1 }, { int, int, uint, int } { int 43, int -1, uint 1, int 0 }, { int, int, uint, int } { int 43, int -2, uint 1, int 0 }, ! { int, int, uint, int } { int 44, int -1, uint 0, int -1 }, { int, int, uint, int } { int 45, int -1, uint 0, int -1 }, { int, int, uint, int } { int 46, int -1, uint 1, int 10 }, { int, int, uint, int } { int 47, int -1, uint 0, int -1 }, { int, int, uint, int } { int 48, int -1, uint 1, int 8 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 }, { int, int, uint, int } { int 51, int -1, uint 1, int 15 }, { int, int, uint, int } { int 51, int -2, uint 1, int 1 }, { int, int, uint, int } { int 52, int -1, uint 1, int 0 }, { int, int, uint, int } { int 53, int -1, uint 0, int -1 }, { int, int, uint, int } { int 54, int -1, uint 0, int -1 }, { int, int, uint, int } { int 55, int -1, uint 0, int -1 }, { int, int, uint, int } { int 56, int -1, uint 1, int 13 }, { int, int, uint, int } { int 56, int -2, uint 1, int 13 }, { int, int, uint, int } { int 57, int -1, uint 1, int 0 }, { int, int, uint, int } { int 58! , int -1, uint 0, int -1 }, { int, int, uint, int } { int 59, int -1, uint 1, int 17 }, { int, int, uint, int } { int 60, int -1, uint 0, int -1 }, { int, int, uint, int } { int 61, int -1, uint 1, int 0 }, { int, int, uint, int } { int 62, int -1, uint 1, int 0 }, { int, int, uint, int } { int 63, int -1, uint 1, int 0 }, { int, int, uint, int } { int 64, int -1, uint 1, int 17 }, { int, int, uint, int } { int 65, int -1, uint 0, int -1 }, { int, int, uint, int } { int 66, int -1, uint 1, int 13 }, { int, int, uint, int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 1, int 0 }, { int, int, uint, int } { int 70, int -1, uint 0, int -1 }, { int, int, uint, int } { int 71, int -1, uint 1, int 0 }, { int, int, uint, int } { int 72, int -1, uint 1, int 0 }, { int, int, uint, int } { int 73, int -1, uint 1, int 0 }, { int, int, uint, int } { int 74, int -1, uint 1, int 0 }, { int, int, uint, int } { int 75, int -1, uint 1, int 15 }, { int, int, uint, i! nt } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 }, { int, int, uint, int } { int 80, int -1, uint 0, int -1 }, { int, int, uint, int } { int 81, int -1, uint 0, int -1 }, { int, int, uint, int } { int 82, int -1, uint 1, int 9 }, { int, int, uint, int } { int 83, int -1, uint 0, int -1 }, { int, int, uint, int } { int 84, int -1, uint 0, int -1 }, { int, int, uint, int } { int 85, int -1, uint 0, int -1 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 0, int -1 }, { int, int, uint, int } { int 88, int -1, uint 1, int 13 }, { int, int, uint, int } { int 89, int -1, uint 0, int -1 }, { int, int, uint, int } { int 90, int -1, uint 0, int -1 }, { int, int, uint, int } { int 91, int -1, uint 0, int -1 }, { int, int, uint, int } { int 92, int -1, uint 0! , int -1 }, { int, int, uint, int } { int 93, int -1, uint 1, int 11 } , { int, int, uint, int } { int 93, int -2, uint 1, int 11 }, { int, int, uint, int } { int 94, int -1, uint 1, int 7 }, { int, int, uint, int } { int 95, int -1, uint 1, int 6 }, { int, int, uint, int } { int 96, int -1, uint 1, int 6 }, { int, int, uint, int } { int 97, int -1, uint 0, int -1 }, { int, int, uint, int } { int 98, int -1, uint 1, int 6 }, { int, int, uint, int } { int 99, int -1, uint 1, int 0 }, { int, int, uint, int } { int 100, int -1, uint 1, int 7 }, { int, int, uint, int } { int 101, int -1, uint 0, int -1 }, { int, int, uint, int } { int 102, int -1, uint 1, int 11 }, { int, int, uint, int } { int 103, int -1, uint 0, int -1 }, { int, int, uint, int } { int 104, int -1, uint 0, int -1 }, { int, int, uint, int } { int 105, int -1, uint 1, int 0 }, { int, int, uint, int } { int 105, int -2, uint 1, int 0 }, { int, int, uint, int } { int 106, int -1, uint 0, int -1 }, { int, int, uint, int } { int 107, int -1, uint 0, int -1 }, { int, int, uint, int } { ! int 108, int -1, uint 0, int -1 }, { int, int, uint, int } { int 109, int -1, uint 1, int 11 }, { int, int, uint, int } { int 109, int -2, uint 1, int 11 }, { int, int, uint, int } { int 110, int -1, uint 1, int 0 }, { int, int, uint, int } { int 111, int -1, uint 0, int -1 }, { int, int, uint, int } { int 112, int -1, uint 0, int -1 }, { int, int, uint, int } { int 113, int -1, uint 0, int -1 }, { int, int, uint, int } { int 114, int -1, uint 1, int 8 }, { int, int, uint, int } { int 114, int -2, uint 1, int 8 }, { int, int, uint, int } { int 115, int -1, uint 1, int 0 }, { int, int, uint, int } { int 116, int -1, uint 0, int -1 }, { int, int, uint, int } { int 117, int -1, uint 1, int 7 }, { int, int, uint, int } { int 118, int -1, uint 0, int -1 }, { int, int, uint, int } { int 119, int -1, uint 1, int 0 }, { int, int, uint, int } { int 120, int -1, uint 1, int 0 }, { int, int, uint, int } { int 121, int -1, uint 1, int 0 }, { int, int, uint, int } { int 122, int -1, uin! t 1, int 7 }, { int, int, uint, int } { int 123, int -1, uint 0, int - 1 }, { int, int, uint, int } { int 124, int -1, uint 1, int 8 }, { int, int, uint, int } { int 125, int -1, uint 0, int -1 }, { int, int, uint, int } { int 126, int -1, uint 0, int -1 }, { int, int, uint, int } { int 127, int -1, uint 1, int 0 }, { int, int, uint, int } { int 128, int -1, uint 1, int 0 }, { int, int, uint, int } { int 129, int -1, uint 0, int -1 }, { int, int, uint, int } { int 130, int -1, uint 0, int -1 }, { int, int, uint, int } { int 131, int -1, uint 0, int -1 }, { int, int, uint, int } { int 132, int -1, uint 0, int -1 }, { int, int, uint, int } { int 133, int -1, uint 0, int -1 }, { int, int, uint, int } { int 134, int -1, uint 0, int -1 }, { int, int, uint, int } { int 135, int -1, uint 0, int -1 }, { int, int, uint, int } { int 136, int -1, uint 0, int -1 }, { int, int, uint, int } { int 137, int -1, uint 0, int -1 }, { int, int, uint, int } { int 138, int -1, uint 0, int -1 } ] } ; <{ uint, [150 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [4 x { uint, [0 x { int, int, uint, int }] }*] } { uint 4, [4 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [4 x { int, int, uint, int }] }* %toggle_value.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [7 x { int, int, uint, int }] }* %toggle_activate.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [17 x { int, int, uint, int }] }* %nth_toggle_activate.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [150 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [4 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [27 x sbyte*] } { uint 27, [27 x sbyte*] [ sbyte* cast ([6 x sbyte]* %.str_1 to sbyte*), sbyte* cast ([7 x sbyte]* %.str_2 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [4 x { int, int, uint, int }] }* %toggle_value.regAllocState to sbyte*), sbyte* cast ({ uint, [7 x { int, int, uint, int }] }* %toggle_activate.regAllocState to sbyte*), sbyte* cast ({ uint, [17 x { int, int, uint, int }] }* %nth_toggle_activate.regAllocState to sbyte*), sbyte* cast ({ uint, [150 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* cast (sbyte (%struct.Toggle*)* %toggle_value to sbyte*), sbyte* cast (%struct.Toggle* (%struct.Toggle*)* %toggle_activate to sbyte*), sbyte* cast (%struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* nul! l, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [27 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + internal sbyte %toggle_value(%struct.Toggle* %this) { + entry: + %tmp.1 = getelementptr %struct.Toggle* %this, long 0, uint 0 ; [#uses=1] + %tmp.2 = load sbyte* %tmp.1 ; [#uses=1] + ret sbyte %tmp.2 + } + + internal %struct.Toggle* %toggle_activate(%struct.Toggle* %this) { + entry: + %tmp.1 = getelementptr %struct.Toggle* %this, long 0, uint 0 ; [#uses=2] + %tmp.4 = load sbyte* %tmp.1 ; [#uses=1] + %tmp.5 = seteq sbyte %tmp.4, 0 ; [#uses=1] + %tmp.6 = cast bool %tmp.5 to sbyte ; [#uses=1] + store sbyte %tmp.6, sbyte* %tmp.1 + ret %struct.Toggle* %this + } + + internal %struct.NthToggle* %nth_toggle_activate(%struct.NthToggle* %this) { + entry: + %tmp.1 = getelementptr %struct.NthToggle* %this, long 0, uint 4 ; [#uses=3] + %tmp.2 = load int* %tmp.1 ; [#uses=1] + %inc = add int %tmp.2, 1 ; [#uses=2] + store int %inc, int* %tmp.1 + %tmp.4 = getelementptr %struct.NthToggle* %this, long 0, uint 3 ; [#uses=1] + %tmp.5 = load int* %tmp.4 ; [#uses=1] + %tmp.6 = setlt int %inc, %tmp.5 ; [#uses=1] + br bool %tmp.6, label %UnifiedReturnBlock, label %then + + then: ; preds = %entry + %tmp.9 = getelementptr %struct.NthToggle* %this, long 0, uint 0 ; [#uses=2] + %tmp.12 = load sbyte* %tmp.9 ; [#uses=1] + %tmp.13 = seteq sbyte %tmp.12, 0 ; [#uses=1] + %tmp.14 = cast bool %tmp.13 to sbyte ; [#uses=1] + store sbyte %tmp.14, sbyte* %tmp.9 + store int 0, int* %tmp.1 + ret %struct.NthToggle* %this + + UnifiedReturnBlock: ; preds = %entry + ret %struct.NthToggle* %this + } + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 500000000 to int ; [#uses=1] + br bool %tmp.1, label %cond_true.0, label %cond_continue.0 + + cond_true.0: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=1] + br label %cond_continue.0 + + cond_continue.0: ; preds = %__main.entry, %cond_true.0 + %mem_tmp.0.0 = phi int [ %tmp.3, %cond_true.0 ], [ %copyConst, %__main.entry ] ; [#uses=3] + "constantGEP:" = getelementptr %struct.Toggle* null, uint 1 ; <%struct.Toggle*> [#uses=1] + %constantCast = cast %struct.Toggle* "constantGEP:" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :0 [#uses=1] + cast sbyte* %0 to %struct.Toggle* ; <%struct.Toggle*>:0 [#uses=5] + %tmp.1.i.i = getelementptr %struct.Toggle* %0, long 0, uint 0 ; [#uses=2] + %copyConst = cast sbyte 1 to sbyte ; [#uses=2] + store sbyte %copyConst, sbyte* %tmp.1.i.i + %tmp.4.i.i = getelementptr %struct.Toggle* %0, long 0, uint 1 ; [#uses=1] + %copyConst = cast sbyte (%struct.Toggle*)* %toggle_value to sbyte (%struct.Toggle*)* ; [#uses=2] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i + %tmp.6.i.i = getelementptr %struct.Toggle* %0, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=2] + %copyConst = cast %struct.Toggle* (%struct.Toggle*)* %toggle_activate to %struct.Toggle* (%struct.Toggle*)* ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=2] + store %struct.Toggle* (%struct.Toggle*)* %copyConst, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i + %tmp.117 = setgt int %mem_tmp.0.0, 0 ; [#uses=2] + br bool %tmp.117, label %no_exit.0.preheader, label %loopexit.0 + + no_exit.0.preheader: ; preds = %cond_continue.0 + br label %no_exit.0 + + no_exit.0: ; preds = %no_exit.0.preheader, %backEdgeInst + %indvar = phi uint [ %indvar.next, %backEdgeInst ], [ 0, %no_exit.0.preheader ] ; [#uses=2] + %i.1.0 = cast uint %indvar to int ; [#uses=1] + %tmp.15 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.16 = call %struct.Toggle* %tmp.15( %struct.Toggle* %0 ) ; <%struct.Toggle*> [#uses=1] + %tmp.18 = getelementptr %struct.Toggle* %tmp.16, long 0, uint 1 ; [#uses=1] + %tmp.19 = load sbyte (%struct.Toggle*)** %tmp.18 ; [#uses=1] + %tmp.20 = call sbyte %tmp.19( %struct.Toggle* %0 ) ; [#uses=1] + %inc.0 = add int %i.1.0, 1 ; [#uses=1] + %tmp.11 = setlt int %inc.0, %mem_tmp.0.0 ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.11, label %backEdgeInst, label %loopexit.0.loopexit + + loopexit.0.loopexit: ; preds = %no_exit.0 + br label %loopexit.0 + + loopexit.0: ; preds = %cond_continue.0, %loopexit.0.loopexit + %val.1.1 = phi sbyte [ 1, %cond_continue.0 ], [ %tmp.20, %loopexit.0.loopexit ] ; [#uses=1] + %tmp.25 = setne sbyte %val.1.1, 0 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [6 x sbyte]* %.str_1, long 0 ; <[6 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [6 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=2] + "addrOfGlobal:.str_2" = getelementptr [7 x sbyte]* %.str_2, long 0 ; <[7 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_2" = getelementptr [7 x sbyte]* "addrOfGlobal:.str_2", long 0, long 0 ; [#uses=2] + br bool %tmp.25, label %loopexit.0.selecttrue, label %loopexit.0.selectcont + + loopexit.0.selecttrue: ; preds = %loopexit.0 + br label %loopexit.0.selectcont + + loopexit.0.selectcont: ; preds = %loopexit.0, %loopexit.0.selecttrue + %mem_tmp.1.0 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %loopexit.0.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %loopexit.0 ] ; [#uses=3] + %tmp.25.i4 = load sbyte* %mem_tmp.1.0 ; [#uses=1] + %tmp.36.i5 = seteq sbyte %tmp.25.i4, 0 ; [#uses=1] + br bool %tmp.36.i5, label %puts.entry26, label %no_exit.i6.preheader + + no_exit.i6.preheader: ; preds = %loopexit.0.selectcont + br label %no_exit.i6 + + no_exit.i6: ; preds = %no_exit.i6.preheader, %backEdgeInst1 + %indvar.i7 = phi ulong [ %indvar.next.i17, %backEdgeInst1 ], [ 0, %no_exit.i6.preheader ] ; [#uses=2] + %Str.0.0.rec.i8 = cast ulong %indvar.i7 to long ; [#uses=2] + %Str.0.0.i9 = getelementptr sbyte* %mem_tmp.1.0, long %Str.0.0.rec.i8 ; [#uses=1] + %inc.rec.i10 = add long %Str.0.0.rec.i8, 1 ; [#uses=1] + %inc.i11 = getelementptr sbyte* %mem_tmp.1.0, long %inc.rec.i10 ; [#uses=1] + %tmp.7.i12 = load sbyte* %Str.0.0.i9 ; [#uses=1] + %tmp.8.i13 = cast sbyte %tmp.7.i12 to int ; [#uses=1] + %tmp.5.i14 = call int %putchar( int %tmp.8.i13 ) ; [#uses=0] + %tmp.2.i15 = load sbyte* %inc.i11 ; [#uses=1] + %tmp.3.i16 = seteq sbyte %tmp.2.i15, 0 ; [#uses=1] + %indvar.next.i17 = add ulong %indvar.i7, 1 ; [#uses=1] + br bool %tmp.3.i16, label %puts.entry26.loopexit, label %backEdgeInst1 + + puts.entry26.loopexit: ; preds = %no_exit.i6 + br label %puts.entry26 + + puts.entry26: ; preds = %loopexit.0.selectcont, %puts.entry26.loopexit + %tmp.9.i19 = call int %putchar( int 10 ) ; [#uses=0] + call void %free( sbyte* %tmp.1.i.i ) + "constantGEP:" = getelementptr [32 x sbyte]* null, uint 1 ; <[32 x sbyte]*> [#uses=1] + %constantCast2 = cast [32 x sbyte]* "constantGEP:" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast2 ) ; :1 [#uses=1] + cast sbyte* %1 to [32 x sbyte]* ; <[32 x sbyte]*>:0 [#uses=2] + %tmp.4.i = cast [32 x sbyte]* %0 to %struct.Toggle* ; <%struct.Toggle*> [#uses=5] + %tmp.1.i.i2 = getelementptr %struct.Toggle* %tmp.4.i, long 0, uint 0 ; [#uses=1] + store sbyte %copyConst, sbyte* %tmp.1.i.i2 + %tmp.4.i.i3 = getelementptr %struct.Toggle* %tmp.4.i, long 0, uint 1 ; [#uses=1] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i3 + %tmp.6.i.i4 = getelementptr %struct.Toggle* %tmp.4.i, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=1] + store %struct.Toggle* (%struct.Toggle*)* %copyConst, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i4 + %tmp.6.i = cast [32 x sbyte]* %0 to %struct.NthToggle* ; <%struct.NthToggle*> [#uses=4] + %tmp.1.i.i = getelementptr %struct.NthToggle* %tmp.6.i, long 0, uint 3 ; [#uses=1] + %copyConst6 = cast int 3 to int ; [#uses=1] + store int %copyConst6, int* %tmp.1.i.i + %tmp.4.i.i = getelementptr %struct.NthToggle* %tmp.6.i, long 0, uint 4 ; [#uses=1] + store int 0, int* %tmp.4.i.i + %tmp.6.i1.i = getelementptr %struct.NthToggle* %tmp.6.i, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=2] + %constantCast = cast %struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate to %struct.Toggle* (%struct.Toggle*)* ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + store %struct.Toggle* (%struct.Toggle*)* %constantCast, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i1.i + br bool %tmp.117, label %no_exit.1.preheader, label %loopexit.1 + + no_exit.1.preheader: ; preds = %puts.entry26 + br label %no_exit.1 + + no_exit.1: ; preds = %no_exit.1.preheader, %backEdgeInst2 + %indvar11 = phi uint [ %indvar.next12, %backEdgeInst2 ], [ 0, %no_exit.1.preheader ] ; [#uses=2] + %i.0.0 = cast uint %indvar11 to int ; [#uses=1] + %tmp.40 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i1.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.41 = call %struct.Toggle* %tmp.40( %struct.Toggle* %tmp.4.i ) ; <%struct.Toggle*> [#uses=1] + %tmp.44 = getelementptr %struct.Toggle* %tmp.41, long 0, uint 1 ; [#uses=1] + %tmp.45 = load sbyte (%struct.Toggle*)** %tmp.44 ; [#uses=1] + %tmp.46 = call sbyte %tmp.45( %struct.Toggle* %tmp.4.i ) ; [#uses=1] + %inc.1 = add int %i.0.0, 1 ; [#uses=1] + %tmp.36 = setlt int %inc.1, %mem_tmp.0.0 ; [#uses=1] + %indvar.next12 = add uint %indvar11, 1 ; [#uses=1] + br bool %tmp.36, label %backEdgeInst2, label %loopexit.1.loopexit + + loopexit.1.loopexit: ; preds = %no_exit.1 + br label %loopexit.1 + + loopexit.1: ; preds = %puts.entry26, %loopexit.1.loopexit + %val.0.1 = phi sbyte [ 1, %puts.entry26 ], [ %tmp.46, %loopexit.1.loopexit ] ; [#uses=1] + %tmp.52 = setne sbyte %val.0.1, 0 ; [#uses=1] + br bool %tmp.52, label %loopexit.1.selecttrue, label %loopexit.1.selectcont + + loopexit.1.selecttrue: ; preds = %loopexit.1 + br label %loopexit.1.selectcont + + loopexit.1.selectcont: ; preds = %loopexit.1, %loopexit.1.selecttrue + %mem_tmp.2.0 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %loopexit.1.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %loopexit.1 ] ; [#uses=3] + %tmp.25.i = load sbyte* %mem_tmp.2.0 ; [#uses=1] + %tmp.36.i = seteq sbyte %tmp.25.i, 0 ; [#uses=1] + br bool %tmp.36.i, label %puts.entry, label %no_exit.i1.preheader + + no_exit.i1.preheader: ; preds = %loopexit.1.selectcont + br label %no_exit.i1 + + no_exit.i1: ; preds = %no_exit.i1.preheader, %backEdgeInst3 + %indvar.i2 = phi ulong [ %indvar.next.i3, %backEdgeInst3 ], [ 0, %no_exit.i1.preheader ] ; [#uses=2] + %Str.0.0.rec.i = cast ulong %indvar.i2 to long ; [#uses=2] + %Str.0.0.i = getelementptr sbyte* %mem_tmp.2.0, long %Str.0.0.rec.i ; [#uses=1] + %inc.rec.i = add long %Str.0.0.rec.i, 1 ; [#uses=1] + %inc.i = getelementptr sbyte* %mem_tmp.2.0, long %inc.rec.i ; [#uses=1] + %tmp.7.i = load sbyte* %Str.0.0.i ; [#uses=1] + %tmp.8.i = cast sbyte %tmp.7.i to int ; [#uses=1] + %tmp.5.i = call int %putchar( int %tmp.8.i ) ; [#uses=0] + %tmp.2.i = load sbyte* %inc.i ; [#uses=1] + %tmp.3.i = seteq sbyte %tmp.2.i, 0 ; [#uses=1] + %indvar.next.i3 = add ulong %indvar.i2, 1 ; [#uses=1] + br bool %tmp.3.i, label %puts.entry.loopexit, label %backEdgeInst3 + + puts.entry.loopexit: ; preds = %no_exit.i1 + br label %puts.entry + + puts.entry: ; preds = %loopexit.1.selectcont, %puts.entry.loopexit + %tmp.9.i = call int %putchar( int 10 ) ; [#uses=0] + %tmp.58 = getelementptr %struct.NthToggle* %tmp.6.i, long 0, uint 0 ; [#uses=1] + call void %free( sbyte* %tmp.58 ) + ret int 0 + + backEdgeInst: ; preds = %no_exit.0 + call void %llvm_first_trigger( ) + br label %no_exit.0 + + backEdgeInst1: ; preds = %no_exit.i6 + call void %llvm_first_trigger( ) + br label %no_exit.i6 + + backEdgeInst2: ; preds = %no_exit.1 + call void %llvm_first_trigger( ) + br label %no_exit.1 + + backEdgeInst3: ; preds = %no_exit.i1 + call void %llvm_first_trigger( ) + br label %no_exit.i1 + } + + declare int %atoi(sbyte*) + + declare int %putchar(int) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/methcall.main.trace10.txt diff -c /dev/null reopt/test/TTFTestCases/methcall.main.trace10.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/methcall.main.trace10.txt Wed Sep 8 16:34:22 2004 *************** *** 0 **** --- 1,2 ---- + main + 6 25 Index: reopt/test/TTFTestCases/methcall.main.trace11.txt diff -c /dev/null reopt/test/TTFTestCases/methcall.main.trace11.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/methcall.main.trace11.txt Wed Sep 8 16:34:22 2004 *************** *** 0 **** --- 1,2 ---- + main + 16 27 Index: reopt/test/TTFTestCases/nestedloop.ll diff -c /dev/null reopt/test/TTFTestCases/nestedloop.ll:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/nestedloop.ll Wed Sep 8 16:34:22 2004 *************** *** 0 **** --- 1,202 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [4 x sbyte] c"%d\0A\00" ; <[4 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (int, sbyte**)* } { int (int, sbyte**)* %main } ; <{ int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [1 x sbyte] zeroinitializer ; <[1 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 1 ; [#uses=0] + %main.regAllocState = internal constant { uint, [121 x { int, int, uint, int }] } { uint 121, [121 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 3 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int! -1, uint 0, int -1 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 1, int 7 }, { int, int, uint, int } { int 14, int -2, uint 1, int 7 }, { int, int, uint, int } { int 15, int -1, uint 1, int 8 }, { int, int, uint, int } { int 15, int -2, uint 1, int 8 }, { int, int, uint, int } { int 16, int -1, uint 1, int 14 }, { int, int, uint, int } { int 16, int -2, uint 1, int 14 }, { int, int, uint, int } { int 17, int -1, uint 0, int -1 }, { int, int, uint, int } { int 18, int -1, uint 0, int -1 }, { int, int, uint, int } { int 19, int -1, uint 1, int 13 }, { int, int, uint, int } { int 19, int -2, uint 1, int 7 }, { int, int, uint, int } { int 20, int -1, uint 1, int 9 }, { int, int, uint, int } { int 20, int -2, uint 1, int 8 }, { int, int, uint, int } { int 21, int -1, uint 1, int 14 }, { int, int, uint, int } { int 21, int -2, uint 1, int 14 }, { int, int, uint, int } { int 22, int -1, uint 1, int 7 }, { int, int, u! int, int } { int 23, int -1, uint 0, int -1 }, { int, int, uint, int } { int 24, int -1, uint 0, int -1 }, { int, int, uint, int } { int 25, int -1, uint 1, int 19 }, { int, int, uint, int } { int 25, int -2, uint 1, int 8 }, { int, int, uint, int } { int 26, int -1, uint 1, int 14 }, { int, int, uint, int } { int 26, int -2, uint 1, int 14 }, { int, int, uint, int } { int 27, int -1, uint 1, int 16 }, { int, int, uint, int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 1, int 8 }, { int, int, uint, int } { int 30, int -2, uint 1, int 8 }, { int, int, uint, int } { int 31, int -1, uint 1, int 14 }, { int, int, uint, int } { int 31, int -2, uint 1, int 14 }, { int, int, uint, int } { int 32, int -1, uint 1, int 18 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 1, int 15 }, { int, int, uint, int } { int 35, int -2, uint 1, int 1! 5 }, { int, int, uint, int } { int 36, int -1, uint 1, int 14 }, { int, int, uint, int } { int 36, int -2, uint 1, int 14 }, { int, int, uint, int } { int 37, int -1, uint 1, int 12 }, { int, int, uint, int } { int 38, int -1, uint 0, int -1 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 1, int 11 }, { int, int, uint, int } { int 40, int -2, uint 1, int 11 }, { int, int, uint, int } { int 41, int -1, uint 1, int 14 }, { int, int, uint, int } { int 41, int -2, uint 1, int 14 }, { int, int, uint, int } { int 42, int -1, uint 1, int 17 }, { int, int, uint, int } { int 43, int -1, uint 0, int -1 }, { int, int, uint, int } { int 44, int -1, uint 0, int -1 }, { int, int, uint, int } { int 45, int -1, uint 1, int 10 }, { int, int, uint, int } { int 45, int -2, uint 1, int 10 }, { int, int, uint, int } { int 46, int -1, uint 1, int 0 }, { int, int, uint, int } { int 47, int -1, uint 1, int 1 }, { int, int, uint, int } {! int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, i nt -1, uint 1, int 10 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 }, { int, int, uint, int } { int 51, int -1, uint 1, int 14 }, { int, int, uint, int } { int 52, int -1, uint 1, int 14 }, { int, int, uint, int } { int 53, int -1, uint 0, int -1 }, { int, int, uint, int } { int 54, int -1, uint 1, int 10 }, { int, int, uint, int } { int 54, int -2, uint 1, int 10 }, { int, int, uint, int } { int 55, int -1, uint 1, int 17 }, { int, int, uint, int } { int 56, int -1, uint 0, int -1 }, { int, int, uint, int } { int 57, int -1, uint 1, int 11 }, { int, int, uint, int } { int 58, int -1, uint 0, int -1 }, { int, int, uint, int } { int 59, int -1, uint 0, int -1 }, { int, int, uint, int } { int 60, int -1, uint 1, int 10 }, { int, int, uint, int } { int 60, int -2, uint 1, int 10 }, { int, int, uint, int } { int 61, int -1, uint 1, int 12 }, { int, int, uint, int } { int 62, int -1, uint 0, int -1 }, { int, int, uint, int } { int 63, int -1, uint 1, int 15 }, { in! t, int, uint, int } { int 64, int -1, uint 0, int -1 }, { int, int, uint, int } { int 65, int -1, uint 0, int -1 }, { int, int, uint, int } { int 66, int -1, uint 1, int 10 }, { int, int, uint, int } { int 66, int -2, uint 1, int 10 }, { int, int, uint, int } { int 67, int -1, uint 1, int 0 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 1, int 8 }, { int, int, uint, int } { int 70, int -1, uint 0, int -1 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } { int 72, int -1, uint 1, int 10 }, { int, int, uint, int } { int 72, int -2, uint 1, int 10 }, { int, int, uint, int } { int 73, int -1, uint 1, int 0 }, { int, int, uint, int } { int 74, int -1, uint 0, int -1 }, { int, int, uint, int } { int 75, int -1, uint 1, int 8 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, in! t -1, uint 1, int 10 }, { int, int, uint, int } { int 78, int -2, uint 1, int 10 }, { int, int, uint, int } { int 79, int -1, uint 1, int 8 }, { int, int, uint, int } { int 80, int -1, uint 0, int -1 }, { int, int, uint, int } { int 81, int -1, uint 1, int 1 }, { int, int, uint, int } { int 81, int -2, uint 1, int 1 }, { int, int, uint, int } { int 82, int -1, uint 0, int -1 }, { int, int, uint, int } { int 83, int -1, uint 1, int 0 }, { int, int, uint, int } { int 84, int -1, uint 1, int 0 }, { int, int, uint, int } { int 85, int -1, uint 0, int -1 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 0, int -1 }, { int, int, uint, int } { int 88, int -1, uint 0, int -1 }, { int, int, uint, int } { int 89, int -1, uint 0, int -1 }, { int, int, uint, int } { int 90, int -1, uint 0, int -1 }, { int, int, uint, int } { int 91, int -1, uint 0, int -1 }, { int, int, uint, int } { int 92, int -1, uint 0, int -1 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, in! t } { int 94, int -1, uint 0, int -1 }, { int, int, uint, int } { int 95, int -1, uint 0, int -1 }, { int, int, uint, int } { int 96, int -1, uint 0, int -1 }, { int, int, uint, int } { int 97, int -1, uint 0, int -1 } ] } ; <{ uint, [121 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [1 x { uint, [0 x { int, int, uint, int }] }*] } { uint 1, [1 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [121 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [1 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [20 x sbyte*] } { uint 20, [20 x sbyte*] [ sbyte* cast ([4 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [121 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [20 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + br bool %tmp.1, label %cond_true, label %loopentry.0 + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=2] + %tmp.1011 = setgt int %tmp.3, 0 ; [#uses=1] + br bool %tmp.1011, label %loopentry.1, label %loopexit.0 + + loopentry.0: ; preds = %__main.entry, %loopexit.1 + %mem_tmp.0 = phi int [ 46, %__main.entry ], [ %mem_tmp.0.0, %loopexit.1 ] ; [#uses=2] + %a.0 = phi int [ %inc.6, %loopexit.1 ], [ 0, %__main.entry ] ; [#uses=2] + %x.5 = phi int [ %x.4.1, %loopexit.1 ], [ 0, %__main.entry ] ; [#uses=2] + %tmp.10 = setlt int %a.0, %mem_tmp.0 ; [#uses=1] + br bool %tmp.10, label %backEdgeInst, label %loopexit.0 + + loopentry.1: ; preds = %cond_true, %backEdgeInst + %mem_tmp.0.0 = phi int [ %tmp.3, %cond_true ], [ %mem_tmp.0, %backEdgeInst ] ; [#uses=7] + %a.0.0 = phi int [ 0, %cond_true ], [ %a.0, %backEdgeInst ] ; [#uses=1] + %x.4 = phi int [ %x.5, %backEdgeInst ], [ 0, %cond_true ] ; [#uses=2] + %tmp.14 = setgt int %mem_tmp.0.0, 0 ; [#uses=5] + br bool %tmp.14, label %loopentry.2.preheader, label %loopexit.1 + + loopentry.2.preheader: ; preds = %loopentry.1 + br label %loopentry.2 + + loopentry.2: ; preds = %loopentry.2.preheader, %backEdgeInst1 + %indvar54 = phi uint [ %indvar.next55, %backEdgeInst1 ], [ 0, %loopentry.2.preheader ] ; [#uses=2] + %x.4.0 = phi int [ %x.3.1, %backEdgeInst1 ], [ %x.4, %loopentry.2.preheader ] ; [#uses=2] + %b.0.0 = cast uint %indvar54 to int ; [#uses=1] + br bool %tmp.14, label %loopentry.3.preheader, label %loopexit.2 + + loopentry.3.preheader: ; preds = %loopentry.2 + br label %loopentry.3 + + loopentry.3: ; preds = %loopentry.3.preheader, %backEdgeInst2 + %indvar52 = phi uint [ %indvar.next53, %backEdgeInst2 ], [ 0, %loopentry.3.preheader ] ; [#uses=2] + %x.3.0 = phi int [ %x.2.1, %backEdgeInst2 ], [ %x.4.0, %loopentry.3.preheader ] ; [#uses=2] + %c.0.0 = cast uint %indvar52 to int ; [#uses=1] + br bool %tmp.14, label %loopentry.4.preheader, label %loopexit.3 + + loopentry.4.preheader: ; preds = %loopentry.3 + br label %loopentry.4 + + loopentry.4: ; preds = %loopentry.4.preheader, %backEdgeInst3 + %indvar50 = phi uint [ %indvar.next51, %backEdgeInst3 ], [ 0, %loopentry.4.preheader ] ; [#uses=2] + %x.2.0 = phi int [ %x.1.1, %backEdgeInst3 ], [ %x.3.0, %loopentry.4.preheader ] ; [#uses=2] + %d.0.0 = cast uint %indvar50 to int ; [#uses=1] + br bool %tmp.14, label %loopentry.5.preheader, label %loopexit.4 + + loopentry.5.preheader: ; preds = %loopentry.4 + br label %loopentry.5 + + loopentry.5: ; preds = %loopentry.5.preheader, %backEdgeInst4 + %indvar48 = phi uint [ %indvar.next49, %backEdgeInst4 ], [ 0, %loopentry.5.preheader ] ; [#uses=2] + %x.1.0 = phi int [ %x.0.1, %backEdgeInst4 ], [ %x.2.0, %loopentry.5.preheader ] ; [#uses=2] + %e.0.0 = cast uint %indvar48 to int ; [#uses=1] + br bool %tmp.14, label %no_exit.5.preheader, label %loopexit.5 + + no_exit.5.preheader: ; preds = %loopentry.5 + br label %no_exit.5 + + no_exit.5: ; preds = %no_exit.5.preheader, %backEdgeInst5 + %indvar = phi uint [ %indvar.next, %backEdgeInst5 ], [ 0, %no_exit.5.preheader ] ; [#uses=2] + %f.0.0 = cast uint %indvar to int ; [#uses=2] + %inc.1 = add int %f.0.0, 1 ; [#uses=1] + %tmp.3018 = setlt int %inc.1, %mem_tmp.0.0 ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.3018, label %backEdgeInst5, label %loopexit.5.loopexit + + loopexit.5.loopexit: ; preds = %no_exit.5 + %x.0.0 = add int %x.1.0, 1 ; [#uses=1] + %inc.0 = add int %x.0.0, %f.0.0 ; [#uses=1] + br label %loopexit.5 + + loopexit.5: ; preds = %loopentry.5, %loopexit.5.loopexit + %x.0.1 = phi int [ %x.1.0, %loopentry.5 ], [ %inc.0, %loopexit.5.loopexit ] ; [#uses=2] + %inc.2 = add int %e.0.0, 1 ; [#uses=1] + %tmp.2624 = setlt int %inc.2, %mem_tmp.0.0 ; [#uses=1] + %indvar.next49 = add uint %indvar48, 1 ; [#uses=1] + br bool %tmp.2624, label %backEdgeInst4, label %loopexit.4.loopexit + + loopexit.4.loopexit: ; preds = %loopexit.5 + br label %loopexit.4 + + loopexit.4: ; preds = %loopentry.4, %loopexit.4.loopexit + %x.1.1 = phi int [ %x.2.0, %loopentry.4 ], [ %x.0.1, %loopexit.4.loopexit ] ; [#uses=2] + %inc.3 = add int %d.0.0, 1 ; [#uses=1] + %tmp.2231 = setlt int %inc.3, %mem_tmp.0.0 ; [#uses=1] + %indvar.next51 = add uint %indvar50, 1 ; [#uses=1] + br bool %tmp.2231, label %backEdgeInst3, label %loopexit.3.loopexit + + loopexit.3.loopexit: ; preds = %loopexit.4 + br label %loopexit.3 + + loopexit.3: ; preds = %loopentry.3, %loopexit.3.loopexit + %x.2.1 = phi int [ %x.3.0, %loopentry.3 ], [ %x.1.1, %loopexit.3.loopexit ] ; [#uses=2] + %inc.4 = add int %c.0.0, 1 ; [#uses=1] + %tmp.1839 = setlt int %inc.4, %mem_tmp.0.0 ; [#uses=1] + %indvar.next53 = add uint %indvar52, 1 ; [#uses=1] + br bool %tmp.1839, label %backEdgeInst2, label %loopexit.2.loopexit + + loopexit.2.loopexit: ; preds = %loopexit.3 + br label %loopexit.2 + + loopexit.2: ; preds = %loopentry.2, %loopexit.2.loopexit + %x.3.1 = phi int [ %x.4.0, %loopentry.2 ], [ %x.2.1, %loopexit.2.loopexit ] ; [#uses=2] + %inc.5 = add int %b.0.0, 1 ; [#uses=1] + %tmp.1447 = setlt int %inc.5, %mem_tmp.0.0 ; [#uses=1] + %indvar.next55 = add uint %indvar54, 1 ; [#uses=1] + br bool %tmp.1447, label %backEdgeInst1, label %loopexit.1.loopexit + + loopexit.1.loopexit: ; preds = %loopexit.2 + br label %loopexit.1 + + loopexit.1: ; preds = %loopentry.1, %loopexit.1.loopexit + %x.4.1 = phi int [ %x.4, %loopentry.1 ], [ %x.3.1, %loopexit.1.loopexit ] ; [#uses=1] + %inc.6 = add int %a.0.0, 1 ; [#uses=1] + br label %loopentry.0 + + loopexit.0: ; preds = %cond_true, %loopentry.0 + %x.5.1 = phi int [ %x.5, %loopentry.0 ], [ 0, %cond_true ] ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [4 x sbyte]* %.str_1, long 0 ; <[4 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [4 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + %tmp.39 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", int %x.5.1 ) ; [#uses=0] + ret int 0 + + backEdgeInst: ; preds = %loopentry.0 + call void %llvm_first_trigger( ) + br label %loopentry.1 + + backEdgeInst1: ; preds = %loopexit.2 + call void %llvm_first_trigger( ) + br label %loopentry.2 + + backEdgeInst2: ; preds = %loopexit.3 + call void %llvm_first_trigger( ) + br label %loopentry.3 + + backEdgeInst3: ; preds = %loopexit.4 + call void %llvm_first_trigger( ) + br label %loopentry.4 + + backEdgeInst4: ; preds = %loopexit.5 + call void %llvm_first_trigger( ) + br label %loopentry.5 + + backEdgeInst5: ; preds = %no_exit.5 + call void %llvm_first_trigger( ) + br label %no_exit.5 + } + + declare int %atoi(sbyte*) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/nestedloop.main.trace12.txt diff -c /dev/null reopt/test/TTFTestCases/nestedloop.main.trace12.txt:1.1 *** /dev/null Wed Sep 8 16:34:37 2004 --- reopt/test/TTFTestCases/nestedloop.main.trace12.txt Wed Sep 8 16:34:23 2004 *************** *** 0 **** --- 1,2 ---- + main + 15 32 Index: reopt/test/TTFTestCases/objinst.ll diff -c /dev/null reopt/test/TTFTestCases/objinst.ll:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/objinst.ll Wed Sep 8 16:34:23 2004 *************** *** 0 **** --- 1,768 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.NthToggle = type { %struct.Toggle, int, int } + %struct.Toggle = type { sbyte, sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [5 x sbyte] c"true\00" ; <[5 x sbyte]*> [#uses=2] + %.str_2 = internal constant [6 x sbyte] c"false\00" ; <[6 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)*, %struct.NthToggle* (%struct.NthToggle*)*, int (int, sbyte**)* } { sbyte (%struct.Toggle*)* %toggle_value, %struct.Toggle* (%struct.Toggle*)* %toggle_activate, %struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate, int (int, sbyte**)* %main } ; <{ sbyte (%struct.Toggle*)*, %struct.Toggle* (%struct.Toggle*)*, %struct.NthToggle* (%struct.NthToggle*)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [4 x sbyte] c"\01\01\01\00" ; <[4 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 4 ; [#uses=0] + %toggle_value.regAllocState = internal constant { uint, [4 x { int, int, uint, int }] } { uint 4, [4 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 0, int -1 }, { int, int, uint, int } { int 1, int -1, uint 1, int 15 }, { int, int, uint, int } { int 2, int -1, uint 0, int -1 } ] } ; <{ uint, [4 x { int, int, uint, int }] }*> [#uses=2] + %toggle_activate.regAllocState = internal constant { uint, [7 x { int, int, uint, int }] } { uint 7, [7 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 1 }, { int, int, uint, int } { int 2, int -1, uint 1, int 2 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 } ] } ; <{ uint, [7 x { int, int, uint, int }] }*> [#uses=2] + %nth_toggle_activate.regAllocState = internal constant { uint, [18 x { int, int, uint, int }] } { uint 18, [18 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 2 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 0, int -1 }, { int, int, uint, int } { int 5, int -1, uint 1, int 1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 1, int 2 }, { int, int, uint, int } { int 10, int -1, uint 1, int 3 }, { int, int, uint, int } { int 11, int -1, uint 1, int 1 }, { int, int, uint, int } { int 12, int -1, uint 0, int -1 }, { int, int, uint, int } {! int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 0, int -1 } ] } ; <{ uint, [18 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [501 x { int, int, uint, int }] } { uint 501, [501 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 1 }, { int, int, uint, int } { int 2, int -1, uint 1, int 2 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 2 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 0 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 0, int -1 }, { int, int, uint, int } { int 14, int -1, uint 1, int 12 }, { int, int, uint, int } { int 14, int -2, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 1, int 0 }, { int, int, uint, int } { int 16, int -1, uint 1, int 11 }, { int, int, uint, int } { int 17, int -1, uint 1, int 0 }, { int, int, uint, int } { int 18, int -1, uint 1, int 13 }, { int, int, uint, int } { int 19, int -1, uint 1, int 9 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 1, int 10 }, { int, int, uint, int } { int 22, int -1, uint 0, int -1 }, { int, int, uint, int } { int 23, int -1, uint 1, int 15 }, { int, int, uint, int } { int 24, int -1, uint 1, int 8 }, { int, int, uint, int } { int 25, int -1, uint 0, int -1 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, uint, int } { int 27, int -1, uint 1, int 2 }, { int, int, ! uint, int } { int 28, int -1, uint 0, int -1 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 1, int 7 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 1, int 14 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 1, int 17 }, { int, int, uint, int } { int 35, int -2, uint 1, int 0 }, { int, int, uint, int } { int 36, int -1, uint 1, int 0 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 0, int -1 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 1, int 18 }, { int, int, uint, int } { int 40, int -2, uint 1, int 18 }, { int, int, uint, int } { int 41, int -1, uint 1, int 0 }, { int, int, uint, int } { int 42, int -1, uint 0, int -1 }, { int, int, uint, int } { int 43, int -1, uint 1, int 1! 6 }, { int, int, uint, int } { int 44, int -1, uint 0, int -1 }, { int, int, uint, int } { int 45, int -1, uint 1, int 0 }, { int, int, uint, int } { int 46, int -1, uint 1, int 0 }, { int, int, uint, int } { int 47, int -1, uint 1, int 0 }, { int, int, uint, int } { int 48, int -1, uint 1, int 16 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 1, int 18 }, { int, int, uint, int } { int 51, int -1, uint 0, int -1 }, { int, int, uint, int } { int 52, int -1, uint 0, int -1 }, { int, int, uint, int } { int 53, int -1, uint 1, int 0 }, { int, int, uint, int } { int 54, int -1, uint 1, int 6 }, { int, int, uint, int } { int 55, int -1, uint 1, int 6 }, { int, int, uint, int } { int 56, int -1, uint 0, int -1 }, { int, int, uint, int } { int 57, int -1, uint 1, int 6 }, { int, int, uint, int } { int 58, int -1, uint 1, int 0 }, { int, int, uint, int } { int 59, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6! 0, int -1, uint 0, int -1 }, { int, int, uint, int } { int 61, int -1, uint 0, int -1 }, { int, int, uint, int } { int 62, int -1, uint 1, int 17 }, { int, int, uint, int } { int 62, int -2, uint 1, int 1 }, { int, int, uint, int } { int 63, int -1, uint 1, int 0 }, { int, int, uint, int } { int 64, int -1, uint 0, int -1 }, { int, int, uint, int } { int 65, int -1, uint 0, int -1 }, { int, int, uint, int } { int 66, int -1, uint 0, int -1 }, { int, int, uint, int } { int 67, int -1, uint 1, int 16 }, { int, int, uint, int } { int 67, int -2, uint 1, int 16 }, { int, int, uint, int } { int 68, int -1, uint 1, int 0 }, { int, int, uint, int } { int 69, int -1, uint 0, int -1 }, { int, int, uint, int } { int 70, int -1, uint 1, int 18 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } { int 72, int -1, uint 1, int 0 }, { int, int, uint, int } { int 73, int -1, uint 1, int 0 }, { int, int, uint, int } { int 74, int -1, uint 1, int 0 }, { int, int, uint, int } { int 75, int -1, uint 1, int 18 }, { int, int, uint! , int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 1, int 16 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 }, { int, int, uint, int } { int 80, int -1, uint 1, int 0 }, { int, int, uint, int } { int 81, int -1, uint 1, int 6 }, { int, int, uint, int } { int 82, int -1, uint 1, int 6 }, { int, int, uint, int } { int 83, int -1, uint 0, int -1 }, { int, int, uint, int } { int 84, int -1, uint 1, int 6 }, { int, int, uint, int } { int 85, int -1, uint 1, int 0 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 0, int -1 }, { int, int, uint, int } { int 88, int -1, uint 0, int -1 }, { int, int, uint, int } { int 89, int -1, uint 1, int 18 }, { int, int, uint, int } { int 89, int -2, uint 1, int 1 }, { int, int, uint, int } { int 90, int -1, uint 1, int 0 }, { int, int, uint, int } { int 91, int -1, uint 0, i! nt -1 }, { int, int, uint, int } { int 92, int -1, uint 0, int -1 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, int } { int 94, int -1, uint 1, int 16 }, { int, int, uint, int } { int 94, int -2, uint 1, int 16 }, { int, int, uint, int } { int 95, int -1, uint 1, int 0 }, { int, int, uint, int } { int 96, int -1, uint 0, int -1 }, { int, int, uint, int } { int 97, int -1, uint 1, int 17 }, { int, int, uint, int } { int 98, int -1, uint 0, int -1 }, { int, int, uint, int } { int 99, int -1, uint 1, int 0 }, { int, int, uint, int } { int 100, int -1, uint 1, int 0 }, { int, int, uint, int } { int 101, int -1, uint 1, int 0 }, { int, int, uint, int } { int 102, int -1, uint 1, int 17 }, { int, int, uint, int } { int 103, int -1, uint 0, int -1 }, { int, int, uint, int } { int 104, int -1, uint 1, int 16 }, { int, int, uint, int } { int 105, int -1, uint 0, int -1 }, { int, int, uint, int } { int 106, int -1, uint 0, int -1 }, { int, int, uint, int } { int 107, int -1, uint 1, int 0 }, { int, int, uint, int } { i! nt 108, int -1, uint 1, int 6 }, { int, int, uint, int } { int 109, int -1, uint 1, int 6 }, { int, int, uint, int } { int 110, int -1, uint 0, int -1 }, { int, int, uint, int } { int 111, int -1, uint 1, int 6 }, { int, int, uint, int } { int 112, int -1, uint 1, int 0 }, { int, int, uint, int } { int 113, int -1, uint 0, int -1 }, { int, int, uint, int } { int 114, int -1, uint 0, int -1 }, { int, int, uint, int } { int 115, int -1, uint 0, int -1 }, { int, int, uint, int } { int 116, int -1, uint 1, int 16 }, { int, int, uint, int } { int 116, int -2, uint 1, int 1 }, { int, int, uint, int } { int 117, int -1, uint 1, int 0 }, { int, int, uint, int } { int 118, int -1, uint 0, int -1 }, { int, int, uint, int } { int 119, int -1, uint 0, int -1 }, { int, int, uint, int } { int 120, int -1, uint 0, int -1 }, { int, int, uint, int } { int 121, int -1, uint 1, int 17 }, { int, int, uint, int } { int 121, int -2, uint 1, int 17 }, { int, int, uint, int } { int 122, int -1, ui! nt 1, int 0 }, { int, int, uint, int } { int 123, int -1, uint 0, int -1 }, { int, int, uint, int } { int 124, int -1, uint 1, int 18 }, { int, int, uint, int } { int 125, int -1, uint 0, int -1 }, { int, int, uint, int } { int 126, int -1, uint 1, int 0 }, { int, int, uint, int } { int 127, int -1, uint 1, int 0 }, { int, int, uint, int } { int 128, int -1, uint 1, int 0 }, { int, int, uint, int } { int 129, int -1, uint 1, int 18 }, { int, int, uint, int } { int 130, int -1, uint 0, int -1 }, { int, int, uint, int } { int 131, int -1, uint 1, int 17 }, { int, int, uint, int } { int 132, int -1, uint 0, int -1 }, { int, int, uint, int } { int 133, int -1, uint 0, int -1 }, { int, int, uint, int } { int 134, int -1, uint 1, int 0 }, { int, int, uint, int } { int 135, int -1, uint 1, int 6 }, { int, int, uint, int } { int 136, int -1, uint 1, int 6 }, { int, int, uint, int } { int 137, int -1, uint 0, int -1 }, { int, int, uint, int } { int 138, int -1, uint 1, int 6 }, { int, int, uint, int } { int 139, int -1, uint 1, int 0 }, { int, int, uin! t, int } { int 140, int -1, uint 0, int -1 }, { int, int, uint, int } { int 141, int -1, uint 0, int -1 }, { int, int, uint, int } { int 142, int -1, uint 0, int -1 }, { int, int, uint, int } { int 143, int -1, uint 1, int 13 }, { int, int, uint, int } { int 143, int -2, uint 1, int 1 }, { int, int, uint, int } { int 144, int -1, uint 1, int 0 }, { int, int, uint, int } { int 145, int -1, uint 0, int -1 }, { int, int, uint, int } { int 146, int -1, uint 0, int -1 }, { int, int, uint, int } { int 147, int -1, uint 0, int -1 }, { int, int, uint, int } { int 148, int -1, uint 1, int 16 }, { int, int, uint, int } { int 148, int -2, uint 1, int 16 }, { int, int, uint, int } { int 149, int -1, uint 1, int 0 }, { int, int, uint, int } { int 150, int -1, uint 0, int -1 }, { int, int, uint, int } { int 151, int -1, uint 1, int 15 }, { int, int, uint, int } { int 152, int -1, uint 0, int -1 }, { int, int, uint, int } { int 153, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1! 54, int -1, uint 1, int 0 }, { int, int, uint, int } { int 155, int -1 , uint 1, int 0 }, { int, int, uint, int } { int 156, int -1, uint 1, int 15 }, { int, int, uint, int } { int 157, int -1, uint 0, int -1 }, { int, int, uint, int } { int 158, int -1, uint 1, int 16 }, { int, int, uint, int } { int 159, int -1, uint 0, int -1 }, { int, int, uint, int } { int 160, int -1, uint 0, int -1 }, { int, int, uint, int } { int 161, int -1, uint 1, int 0 }, { int, int, uint, int } { int 162, int -1, uint 0, int -1 }, { int, int, uint, int } { int 163, int -1, uint 1, int 16 }, { int, int, uint, int } { int 164, int -1, uint 0, int -1 }, { int, int, uint, int } { int 165, int -1, uint 0, int -1 }, { int, int, uint, int } { int 166, int -1, uint 1, int 9 }, { int, int, uint, int } { int 166, int -2, uint 1, int 9 }, { int, int, uint, int } { int 167, int -1, uint 1, int 13 }, { int, int, uint, int } { int 168, int -1, uint 1, int 1 }, { int, int, uint, int } { int 169, int -1, uint 1, int 1 }, { int, int, uint, int } { int 170, int -1, uint 1, int 0 }, ! { int, int, uint, int } { int 171, int -1, uint 0, int -1 }, { int, int, uint, int } { int 172, int -1, uint 0, int -1 }, { int, int, uint, int } { int 173, int -1, uint 0, int -1 }, { int, int, uint, int } { int 174, int -1, uint 0, int -1 }, { int, int, uint, int } { int 175, int -1, uint 0, int -1 }, { int, int, uint, int } { int 176, int -1, uint 1, int 13 }, { int, int, uint, int } { int 177, int -1, uint 0, int -1 }, { int, int, uint, int } { int 178, int -1, uint 1, int 9 }, { int, int, uint, int } { int 179, int -1, uint 0, int -1 }, { int, int, uint, int } { int 180, int -1, uint 0, int -1 }, { int, int, uint, int } { int 181, int -1, uint 1, int 0 }, { int, int, uint, int } { int 182, int -1, uint 1, int 0 }, { int, int, uint, int } { int 183, int -1, uint 1, int 15 }, { int, int, uint, int } { int 184, int -1, uint 1, int 6 }, { int, int, uint, int } { int 185, int -1, uint 1, int 6 }, { int, int, uint, int } { int 186, int -1, uint 1, int 11 }, { int, int, uint,! int } { int 187, int -1, uint 1, int 17 }, { int, int, uint, int } { int 188, int -1, uint 0, int -1 }, { int, int, uint, int } { int 189, int -1, uint 0, int -1 }, { int, int, uint, int } { int 190, int -1, uint 0, int -1 }, { int, int, uint, int } { int 191, int -1, uint 0, int -1 }, { int, int, uint, int } { int 192, int -1, uint 1, int 13 }, { int, int, uint, int } { int 193, int -1, uint 0, int -1 }, { int, int, uint, int } { int 194, int -1, uint 1, int 9 }, { int, int, uint, int } { int 195, int -1, uint 0, int -1 }, { int, int, uint, int } { int 196, int -1, uint 0, int -1 }, { int, int, uint, int } { int 197, int -1, uint 1, int 8 }, { int, int, uint, int } { int 198, int -1, uint 0, int -1 }, { int, int, uint, int } { int 199, int -1, uint 0, int -1 }, { int, int, uint, int } { int 200, int -1, uint 0, int -1 }, { int, int, uint, int } { int 201, int -1, uint 0, int -1 }, { int, int, uint, int } { int 202, int -1, uint 0, int -1 }, { int, int, uint, int } { int 203, int -1, uint 1, int 6 }, { int, int, uint, int } { int 204, int -1,! uint 1, int 0 }, { int, int, uint, int } { int 205, int -1, uint 0, int -1 }, { int, int, uint, int } { int 206, int -1, uint 0, int -1 }, { int, int, uint, int } { int 207, int -1, uint 0, int -1 }, { int, int, uint, int } { int 208, int -1, uint 1, int 19 }, { int, int, uint, int } { int 208, int -2, uint 1, int 1 }, { int, int, uint, int } { int 209, int -1, uint 1, int 0 }, { int, int, uint, int } { int 210, int -1, uint 0, int -1 }, { int, int, uint, int } { int 211, int -1, uint 0, int -1 }, { int, int, uint, int } { int 212, int -1, uint 0, int -1 }, { int, int, uint, int } { int 213, int -1, uint 1, int 18 }, { int, int, uint, int } { int 213, int -2, uint 1, int 18 }, { int, int, uint, int } { int 214, int -1, uint 1, int 0 }, { int, int, uint, int } { int 215, int -1, uint 0, int -1 }, { int, int, uint, int } { int 216, int -1, uint 1, int 20 }, { int, int, uint, int } { int 217, int -1, uint 0, int -1 }, { int, int, uint, int } { int 218, int -1, uint 1, int 0 }! , { int, int, uint, int } { int 219, int -1, uint 1, int 0 }, { int, i nt, uint, int } { int 220, int -1, uint 1, int 0 }, { int, int, uint, int } { int 221, int -1, uint 1, int 20 }, { int, int, uint, int } { int 222, int -1, uint 0, int -1 }, { int, int, uint, int } { int 223, int -1, uint 1, int 18 }, { int, int, uint, int } { int 224, int -1, uint 0, int -1 }, { int, int, uint, int } { int 225, int -1, uint 0, int -1 }, { int, int, uint, int } { int 226, int -1, uint 1, int 0 }, { int, int, uint, int } { int 227, int -1, uint 1, int 6 }, { int, int, uint, int } { int 228, int -1, uint 1, int 6 }, { int, int, uint, int } { int 229, int -1, uint 0, int -1 }, { int, int, uint, int } { int 230, int -1, uint 1, int 6 }, { int, int, uint, int } { int 231, int -1, uint 1, int 0 }, { int, int, uint, int } { int 232, int -1, uint 0, int -1 }, { int, int, uint, int } { int 233, int -1, uint 0, int -1 }, { int, int, uint, int } { int 234, int -1, uint 0, int -1 }, { int, int, uint, int } { int 235, int -1, uint 1, int 18 }, { int, int, uint, int } { i! nt 235, int -2, uint 1, int 1 }, { int, int, uint, int } { int 236, int -1, uint 1, int 0 }, { int, int, uint, int } { int 237, int -1, uint 0, int -1 }, { int, int, uint, int } { int 238, int -1, uint 0, int -1 }, { int, int, uint, int } { int 239, int -1, uint 0, int -1 }, { int, int, uint, int } { int 240, int -1, uint 1, int 20 }, { int, int, uint, int } { int 240, int -2, uint 1, int 20 }, { int, int, uint, int } { int 241, int -1, uint 1, int 0 }, { int, int, uint, int } { int 242, int -1, uint 0, int -1 }, { int, int, uint, int } { int 243, int -1, uint 1, int 19 }, { int, int, uint, int } { int 244, int -1, uint 0, int -1 }, { int, int, uint, int } { int 245, int -1, uint 1, int 0 }, { int, int, uint, int } { int 246, int -1, uint 1, int 0 }, { int, int, uint, int } { int 247, int -1, uint 1, int 0 }, { int, int, uint, int } { int 248, int -1, uint 1, int 19 }, { int, int, uint, int } { int 249, int -1, uint 0, int -1 }, { int, int, uint, int } { int 250, int -1, ui! nt 1, int 20 }, { int, int, uint, int } { int 251, int -1, uint 0, int -1 }, { int, int, uint, int } { int 252, int -1, uint 0, int -1 }, { int, int, uint, int } { int 253, int -1, uint 1, int 0 }, { int, int, uint, int } { int 254, int -1, uint 1, int 6 }, { int, int, uint, int } { int 255, int -1, uint 1, int 6 }, { int, int, uint, int } { int 256, int -1, uint 0, int -1 }, { int, int, uint, int } { int 257, int -1, uint 1, int 6 }, { int, int, uint, int } { int 258, int -1, uint 1, int 0 }, { int, int, uint, int } { int 259, int -1, uint 0, int -1 }, { int, int, uint, int } { int 260, int -1, uint 0, int -1 }, { int, int, uint, int } { int 261, int -1, uint 0, int -1 }, { int, int, uint, int } { int 262, int -1, uint 1, int 20 }, { int, int, uint, int } { int 262, int -2, uint 1, int 1 }, { int, int, uint, int } { int 263, int -1, uint 1, int 0 }, { int, int, uint, int } { int 264, int -1, uint 0, int -1 }, { int, int, uint, int } { int 265, int -1, uint 0, int -1 }, { int, int, uint, int } { int 266, int -1, uint 0, int -1 }, { int, int, u! int, int } { int 267, int -1, uint 1, int 19 }, { int, int, uint, int } { int 267, int -2, uint 1, int 19 }, { int, int, uint, int } { int 268, int -1, uint 1, int 0 }, { int, int, uint, int } { int 269, int -1, uint 0, int -1 }, { int, int, uint, int } { int 270, int -1, uint 1, int 18 }, { int, int, uint, int } { int 271, int -1, uint 0, int -1 }, { int, int, uint, int } { int 272, int -1, uint 1, int 0 }, { int, int, uint, int } { int 273, int -1, uint 1, int 0 }, { int, int, uint, int } { int 274, int -1, uint 1, int 0 }, { int, int, uint, int } { int 275, int -1, uint 1, int 18 }, { int, int, uint, int } { int 276, int -1, uint 0, int -1 }, { int, int, uint, int } { int 277, int -1, uint 1, int 19 }, { int, int, uint, int } { int 278, int -1, uint 0, int -1 }, { int, int, uint, int } { int 279, int -1, uint 0, int -1 }, { int, int, uint, int } { int 280, int -1, uint 1, int 0 }, { int, int, uint, int } { int 281, int -1, uint 1, int 6 }, { int, int, uint, int } { int 2! 82, int -1, uint 1, int 6 }, { int, int, uint, int } { int 283, int -1 , uint 0, int -1 }, { int, int, uint, int } { int 284, int -1, uint 1, int 6 }, { int, int, uint, int } { int 285, int -1, uint 1, int 0 }, { int, int, uint, int } { int 286, int -1, uint 0, int -1 }, { int, int, uint, int } { int 287, int -1, uint 0, int -1 }, { int, int, uint, int } { int 288, int -1, uint 0, int -1 }, { int, int, uint, int } { int 289, int -1, uint 1, int 19 }, { int, int, uint, int } { int 289, int -2, uint 1, int 1 }, { int, int, uint, int } { int 290, int -1, uint 1, int 0 }, { int, int, uint, int } { int 291, int -1, uint 0, int -1 }, { int, int, uint, int } { int 292, int -1, uint 0, int -1 }, { int, int, uint, int } { int 293, int -1, uint 0, int -1 }, { int, int, uint, int } { int 294, int -1, uint 1, int 18 }, { int, int, uint, int } { int 294, int -2, uint 1, int 18 }, { int, int, uint, int } { int 295, int -1, uint 1, int 0 }, { int, int, uint, int } { int 296, int -1, uint 0, int -1 }, { int, int, uint, int } { int 297, int -1, uint 1, int 20 }! , { int, int, uint, int } { int 298, int -1, uint 0, int -1 }, { int, int, uint, int } { int 299, int -1, uint 1, int 0 }, { int, int, uint, int } { int 300, int -1, uint 1, int 0 }, { int, int, uint, int } { int 301, int -1, uint 1, int 0 }, { int, int, uint, int } { int 302, int -1, uint 1, int 20 }, { int, int, uint, int } { int 303, int -1, uint 0, int -1 }, { int, int, uint, int } { int 304, int -1, uint 1, int 18 }, { int, int, uint, int } { int 305, int -1, uint 0, int -1 }, { int, int, uint, int } { int 306, int -1, uint 0, int -1 }, { int, int, uint, int } { int 307, int -1, uint 1, int 0 }, { int, int, uint, int } { int 308, int -1, uint 1, int 6 }, { int, int, uint, int } { int 309, int -1, uint 1, int 6 }, { int, int, uint, int } { int 310, int -1, uint 0, int -1 }, { int, int, uint, int } { int 311, int -1, uint 1, int 6 }, { int, int, uint, int } { int 312, int -1, uint 1, int 0 }, { int, int, uint, int } { int 313, int -1, uint 0, int -1 }, { int, int, uint, ! int } { int 314, int -1, uint 0, int -1 }, { int, int, uint, int } { i nt 315, int -1, uint 0, int -1 }, { int, int, uint, int } { int 316, int -1, uint 1, int 18 }, { int, int, uint, int } { int 316, int -2, uint 1, int 1 }, { int, int, uint, int } { int 317, int -1, uint 1, int 0 }, { int, int, uint, int } { int 318, int -1, uint 0, int -1 }, { int, int, uint, int } { int 319, int -1, uint 0, int -1 }, { int, int, uint, int } { int 320, int -1, uint 0, int -1 }, { int, int, uint, int } { int 321, int -1, uint 1, int 19 }, { int, int, uint, int } { int 321, int -2, uint 1, int 19 }, { int, int, uint, int } { int 322, int -1, uint 1, int 0 }, { int, int, uint, int } { int 323, int -1, uint 0, int -1 }, { int, int, uint, int } { int 324, int -1, uint 1, int 20 }, { int, int, uint, int } { int 325, int -1, uint 0, int -1 }, { int, int, uint, int } { int 326, int -1, uint 1, int 0 }, { int, int, uint, int } { int 327, int -1, uint 1, int 0 }, { int, int, uint, int } { int 328, int -1, uint 1, int 0 }, { int, int, uint, int } { int 329, int -1, uin! t 1, int 20 }, { int, int, uint, int } { int 330, int -1, uint 0, int -1 }, { int, int, uint, int } { int 331, int -1, uint 1, int 19 }, { int, int, uint, int } { int 332, int -1, uint 0, int -1 }, { int, int, uint, int } { int 333, int -1, uint 0, int -1 }, { int, int, uint, int } { int 334, int -1, uint 1, int 0 }, { int, int, uint, int } { int 335, int -1, uint 1, int 6 }, { int, int, uint, int } { int 336, int -1, uint 1, int 6 }, { int, int, uint, int } { int 337, int -1, uint 0, int -1 }, { int, int, uint, int } { int 338, int -1, uint 1, int 6 }, { int, int, uint, int } { int 339, int -1, uint 1, int 0 }, { int, int, uint, int } { int 340, int -1, uint 0, int -1 }, { int, int, uint, int } { int 341, int -1, uint 0, int -1 }, { int, int, uint, int } { int 342, int -1, uint 0, int -1 }, { int, int, uint, int } { int 343, int -1, uint 1, int 20 }, { int, int, uint, int } { int 343, int -2, uint 1, int 1 }, { int, int, uint, int } { int 344, int -1, uint 1, int 0 }, { in! t, int, uint, int } { int 345, int -1, uint 0, int -1 }, { int, int, u int, int } { int 346, int -1, uint 0, int -1 }, { int, int, uint, int } { int 347, int -1, uint 0, int -1 }, { int, int, uint, int } { int 348, int -1, uint 1, int 19 }, { int, int, uint, int } { int 348, int -2, uint 1, int 19 }, { int, int, uint, int } { int 349, int -1, uint 1, int 0 }, { int, int, uint, int } { int 350, int -1, uint 0, int -1 }, { int, int, uint, int } { int 351, int -1, uint 1, int 18 }, { int, int, uint, int } { int 352, int -1, uint 0, int -1 }, { int, int, uint, int } { int 353, int -1, uint 1, int 0 }, { int, int, uint, int } { int 354, int -1, uint 1, int 0 }, { int, int, uint, int } { int 355, int -1, uint 1, int 0 }, { int, int, uint, int } { int 356, int -1, uint 1, int 18 }, { int, int, uint, int } { int 357, int -1, uint 0, int -1 }, { int, int, uint, int } { int 358, int -1, uint 1, int 19 }, { int, int, uint, int } { int 359, int -1, uint 0, int -1 }, { int, int, uint, int } { int 360, int -1, uint 0, int -1 }, { int, int, uint, int } { int ! 361, int -1, uint 1, int 0 }, { int, int, uint, int } { int 362, int -1, uint 1, int 6 }, { int, int, uint, int } { int 363, int -1, uint 1, int 6 }, { int, int, uint, int } { int 364, int -1, uint 0, int -1 }, { int, int, uint, int } { int 365, int -1, uint 1, int 6 }, { int, int, uint, int } { int 366, int -1, uint 1, int 0 }, { int, int, uint, int } { int 367, int -1, uint 0, int -1 }, { int, int, uint, int } { int 368, int -1, uint 0, int -1 }, { int, int, uint, int } { int 369, int -1, uint 0, int -1 }, { int, int, uint, int } { int 370, int -1, uint 1, int 19 }, { int, int, uint, int } { int 370, int -2, uint 1, int 1 }, { int, int, uint, int } { int 371, int -1, uint 1, int 0 }, { int, int, uint, int } { int 372, int -1, uint 0, int -1 }, { int, int, uint, int } { int 373, int -1, uint 0, int -1 }, { int, int, uint, int } { int 374, int -1, uint 0, int -1 }, { int, int, uint, int } { int 375, int -1, uint 1, int 18 }, { int, int, uint, int } { int 375, int -2, uint 1! , int 18 }, { int, int, uint, int } { int 376, int -1, uint 1, int 0 } , { int, int, uint, int } { int 377, int -1, uint 0, int -1 }, { int, int, uint, int } { int 378, int -1, uint 1, int 20 }, { int, int, uint, int } { int 379, int -1, uint 0, int -1 }, { int, int, uint, int } { int 380, int -1, uint 1, int 0 }, { int, int, uint, int } { int 381, int -1, uint 1, int 0 }, { int, int, uint, int } { int 382, int -1, uint 1, int 0 }, { int, int, uint, int } { int 383, int -1, uint 1, int 20 }, { int, int, uint, int } { int 384, int -1, uint 0, int -1 }, { int, int, uint, int } { int 385, int -1, uint 1, int 18 }, { int, int, uint, int } { int 386, int -1, uint 0, int -1 }, { int, int, uint, int } { int 387, int -1, uint 0, int -1 }, { int, int, uint, int } { int 388, int -1, uint 1, int 0 }, { int, int, uint, int } { int 389, int -1, uint 1, int 6 }, { int, int, uint, int } { int 390, int -1, uint 1, int 6 }, { int, int, uint, int } { int 391, int -1, uint 0, int -1 }, { int, int, uint, int } { int 392, int -1, uint 1, int 6 }, { int, int, uint, ! int } { int 393, int -1, uint 1, int 0 }, { int, int, uint, int } { int 394, int -1, uint 0, int -1 }, { int, int, uint, int } { int 395, int -1, uint 0, int -1 }, { int, int, uint, int } { int 396, int -1, uint 0, int -1 }, { int, int, uint, int } { int 397, int -1, uint 1, int 13 }, { int, int, uint, int } { int 397, int -2, uint 1, int 1 }, { int, int, uint, int } { int 398, int -1, uint 1, int 0 }, { int, int, uint, int } { int 399, int -1, uint 0, int -1 }, { int, int, uint, int } { int 400, int -1, uint 0, int -1 }, { int, int, uint, int } { int 401, int -1, uint 0, int -1 }, { int, int, uint, int } { int 402, int -1, uint 1, int 7 }, { int, int, uint, int } { int 402, int -2, uint 1, int 7 }, { int, int, uint, int } { int 403, int -1, uint 1, int 0 }, { int, int, uint, int } { int 404, int -1, uint 0, int -1 }, { int, int, uint, int } { int 405, int -1, uint 1, int 11 }, { int, int, uint, int } { int 406, int -1, uint 0, int -1 }, { int, int, uint, int } { int 407, i! nt -1, uint 1, int 0 }, { int, int, uint, int } { int 408, int -1, uin t 1, int 0 }, { int, int, uint, int } { int 409, int -1, uint 1, int 0 }, { int, int, uint, int } { int 410, int -1, uint 1, int 11 }, { int, int, uint, int } { int 411, int -1, uint 0, int -1 }, { int, int, uint, int } { int 412, int -1, uint 1, int 7 }, { int, int, uint, int } { int 413, int -1, uint 0, int -1 }, { int, int, uint, int } { int 414, int -1, uint 0, int -1 }, { int, int, uint, int } { int 415, int -1, uint 1, int 0 }, { int, int, uint, int } { int 416, int -1, uint 0, int -1 }, { int, int, uint, int } { int 417, int -1, uint 0, int -1 }, { int, int, uint, int } { int 418, int -1, uint 0, int -1 }, { int, int, uint, int } { int 419, int -1, uint 1, int 7 }, { int, int, uint, int } { int 419, int -2, uint 1, int 7 }, { int, int, uint, int } { int 420, int -1, uint 1, int 11 }, { int, int, uint, int } { int 421, int -1, uint 1, int 2 }, { int, int, uint, int } { int 422, int -1, uint 1, int 2 }, { int, int, uint, int } { int 423, int -1, uint 1, int 1 }, { int, ! int, uint, int } { int 424, int -1, uint 1, int 0 }, { int, int, uint, int } { int 425, int -1, uint 0, int -1 }, { int, int, uint, int } { int 426, int -1, uint 0, int -1 }, { int, int, uint, int } { int 427, int -1, uint 0, int -1 }, { int, int, uint, int } { int 428, int -1, uint 0, int -1 }, { int, int, uint, int } { int 429, int -1, uint 0, int -1 }, { int, int, uint, int } { int 430, int -1, uint 0, int -1 }, { int, int, uint, int } { int 431, int -1, uint 0, int -1 }, { int, int, uint, int } { int 432, int -1, uint 0, int -1 }, { int, int, uint, int } { int 433, int -1, uint 0, int -1 }, { int, int, uint, int } { int 434, int -1, uint 1, int 11 }, { int, int, uint, int } { int 435, int -1, uint 0, int -1 }, { int, int, uint, int } { int 436, int -1, uint 1, int 7 }, { int, int, uint, int } { int 437, int -1, uint 0, int -1 }, { int, int, uint, int } { int 438, int -1, uint 0, int -1 }, { int, int, uint, int } { int 439, int -1, uint 0, int -1 }, { int, int, uint, int! } { int 440, int -1, uint 0, int -1 }, { int, int, uint, int } { int 441, int -1, uint 0, int -1 }, { int, int, uint, int } { int 442, int -1, uint 0, int -1 }, { int, int, uint, int } { int 443, int -1, uint 0, int -1 }, { int, int, uint, int } { int 444, int -1, uint 0, int -1 }, { int, int, uint, int } { int 445, int -1, uint 0, int -1 }, { int, int, uint, int } { int 446, int -1, uint 0, int -1 }, { int, int, uint, int } { int 447, int -1, uint 0, int -1 }, { int, int, uint, int } { int 448, int -1, uint 0, int -1 }, { int, int, uint, int } { int 449, int -1, uint 0, int -1 }, { int, int, uint, int } { int 450, int -1, uint 0, int -1 }, { int, int, uint, int } { int 451, int -1, uint 0, int -1 }, { int, int, uint, int } { int 452, int -1, uint 0, int -1 }, { int, int, uint, int } { int 453, int -1, uint 0, int -1 }, { int, int, uint, int } { int 454, int -1, uint 0, int -1 }, { int, int, uint, int } { int 455, int -1, uint 0, int -1 }, { int, int, uint, int } { int 456, int -1, uint 0, int -1 }, { int, int, uint, int } { int 457, int -1, ! uint 0, int -1 }, { int, int, uint, int } { int 458, int -1, uint 0, int -1 }, { int, int, uint, int } { int 459, int -1, uint 0, int -1 }, { int, int, uint, int } { int 460, int -1, uint 0, int -1 }, { int, int, uint, int } { int 461, int -1, uint 0, int -1 }, { int, int, uint, int } { int 462, int -1, uint 0, int -1 }, { int, int, uint, int } { int 463, int -1, uint 0, int -1 }, { int, int, uint, int } { int 464, int -1, uint 0, int -1 }, { int, int, uint, int } { int 465, int -1, uint 0, int -1 }, { int, int, uint, int } { int 466, int -1, uint 0, int -1 }, { int, int, uint, int } { int 467, int -1, uint 0, int -1 }, { int, int, uint, int } { int 468, int -1, uint 0, int -1 }, { int, int, uint, int } { int 469, int -1, uint 0, int -1 } ] } ; <{ uint, [501 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [4 x { uint, [0 x { int, int, uint, int }] }*] } { uint 4, [4 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [4 x { int, int, uint, int }] }* %toggle_value.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [7 x { int, int, uint, int }] }* %toggle_activate.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [18 x { int, int, uint, int }] }* %nth_toggle_activate.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [501 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [4 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [27 x sbyte*] } { uint 27, [27 x sbyte*] [ sbyte* cast ([5 x sbyte]* %.str_1 to sbyte*), sbyte* cast ([6 x sbyte]* %.str_2 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [4 x { int, int, uint, int }] }* %toggle_value.regAllocState to sbyte*), sbyte* cast ({ uint, [7 x { int, int, uint, int }] }* %toggle_activate.regAllocState to sbyte*), sbyte* cast ({ uint, [18 x { int, int, uint, int }] }* %nth_toggle_activate.regAllocState to sbyte*), sbyte* cast ({ uint, [501 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* cast (sbyte (%struct.Toggle*)* %toggle_value to sbyte*), sbyte* cast (%struct.Toggle* (%struct.Toggle*)* %toggle_activate to sbyte*), sbyte* cast (%struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* nul! l, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [27 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + internal sbyte %toggle_value(%struct.Toggle* %this) { + entry: + %tmp.1 = getelementptr %struct.Toggle* %this, long 0, uint 0 ; [#uses=1] + %tmp.2 = load sbyte* %tmp.1 ; [#uses=1] + ret sbyte %tmp.2 + } + + internal %struct.Toggle* %toggle_activate(%struct.Toggle* %this) { + entry: + %tmp.1 = getelementptr %struct.Toggle* %this, long 0, uint 0 ; [#uses=2] + %tmp.4 = load sbyte* %tmp.1 ; [#uses=1] + %tmp.5 = seteq sbyte %tmp.4, 0 ; [#uses=1] + %tmp.6 = cast bool %tmp.5 to sbyte ; [#uses=1] + store sbyte %tmp.6, sbyte* %tmp.1 + ret %struct.Toggle* %this + } + + internal %struct.NthToggle* %nth_toggle_activate(%struct.NthToggle* %this) { + entry: + %tmp.1 = getelementptr %struct.NthToggle* %this, long 0, uint 2 ; [#uses=3] + %tmp.2 = load int* %tmp.1 ; [#uses=1] + %inc = add int %tmp.2, 1 ; [#uses=2] + store int %inc, int* %tmp.1 + %tmp.4 = getelementptr %struct.NthToggle* %this, long 0, uint 1 ; [#uses=1] + %tmp.5 = load int* %tmp.4 ; [#uses=1] + %tmp.6 = setlt int %inc, %tmp.5 ; [#uses=1] + br bool %tmp.6, label %UnifiedReturnBlock, label %then + + then: ; preds = %entry + %ptr1 = getelementptr %struct.NthToggle* %this, long 0, uint 0 ; <%struct.Toggle*> [#uses=1] + %tmp.101 = getelementptr %struct.Toggle* %ptr1, long 0, uint 0 ; [#uses=2] + %tmp.14 = load sbyte* %tmp.101 ; [#uses=1] + %tmp.15 = seteq sbyte %tmp.14, 0 ; [#uses=1] + %tmp.16 = cast bool %tmp.15 to sbyte ; [#uses=1] + store sbyte %tmp.16, sbyte* %tmp.101 + store int 0, int* %tmp.1 + ret %struct.NthToggle* %this + + UnifiedReturnBlock: ; preds = %entry + ret %struct.NthToggle* %this + } + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 70000000 to int ; [#uses=1] + br bool %tmp.1, label %cond_true.0, label %loopexit.0 + + cond_true.0: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=1] + br label %loopexit.0 + + loopexit.0: ; preds = %__main.entry, %cond_true.0 + %mem_tmp.0.0 = phi int [ %tmp.3, %cond_true.0 ], [ %copyConst, %__main.entry ] ; [#uses=3] + "constantGEP:" = getelementptr %struct.Toggle* null, uint 1 ; <%struct.Toggle*> [#uses=1] + %constantCast = cast %struct.Toggle* "constantGEP:" to uint ; [#uses=2] + call sbyte* %malloc( uint %constantCast ) ; :0 [#uses=1] + cast sbyte* %0 to %struct.Toggle* ; <%struct.Toggle*>:0 [#uses=11] + %tmp.1.i.i = getelementptr %struct.Toggle* %0, long 0, uint 0 ; [#uses=3] + %tmp.4.i.i = getelementptr %struct.Toggle* %0, long 0, uint 1 ; [#uses=1] + %copyConst = cast sbyte (%struct.Toggle*)* %toggle_value to sbyte (%struct.Toggle*)* ; [#uses=4] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i + %tmp.6.i.i = getelementptr %struct.Toggle* %0, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=5] + %copyConst = cast %struct.Toggle* (%struct.Toggle*)* %toggle_activate to %struct.Toggle* (%struct.Toggle*)* ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=2] + store %struct.Toggle* (%struct.Toggle*)* %copyConst, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i + store sbyte 0, sbyte* %tmp.1.i.i + %tmp.2.i1 = load sbyte* %tmp.1.i.i ; [#uses=1] + %tmp.22 = setne sbyte %tmp.2.i1, 0 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [5 x sbyte]* %.str_1, long 0 ; <[5 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [5 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=13] + "addrOfGlobal:.str_2" = getelementptr [6 x sbyte]* %.str_2, long 0 ; <[6 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_2" = getelementptr [6 x sbyte]* "addrOfGlobal:.str_2", long 0, long 0 ; [#uses=13] + br bool %tmp.22, label %loopexit.0.selecttrue, label %loopexit.0.selectcont + + loopexit.0.selecttrue: ; preds = %loopexit.0 + br label %loopexit.0.selectcont + + loopexit.0.selectcont: ; preds = %loopexit.0, %loopexit.0.selecttrue + %mem_tmp.1.0 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %loopexit.0.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %loopexit.0 ] ; [#uses=3] + %tmp.25.i4 = load sbyte* %mem_tmp.1.0 ; [#uses=1] + %tmp.36.i5 = seteq sbyte %tmp.25.i4, 0 ; [#uses=1] + br bool %tmp.36.i5, label %puts.entry26, label %no_exit.i6.preheader + + no_exit.i6.preheader: ; preds = %loopexit.0.selectcont + br label %no_exit.i6 + + no_exit.i6: ; preds = %no_exit.i6.preheader, %backEdgeInst + %indvar.i7 = phi ulong [ %indvar.next.i17, %backEdgeInst ], [ 0, %no_exit.i6.preheader ] ; [#uses=2] + %Str.0.0.rec.i8 = cast ulong %indvar.i7 to long ; [#uses=2] + %Str.0.0.i9 = getelementptr sbyte* %mem_tmp.1.0, long %Str.0.0.rec.i8 ; [#uses=1] + %inc.rec.i10 = add long %Str.0.0.rec.i8, 1 ; [#uses=1] + %inc.i11 = getelementptr sbyte* %mem_tmp.1.0, long %inc.rec.i10 ; [#uses=1] + %tmp.7.i12 = load sbyte* %Str.0.0.i9 ; [#uses=1] + %tmp.8.i13 = cast sbyte %tmp.7.i12 to int ; [#uses=1] + %tmp.5.i14 = call int %putchar( int %tmp.8.i13 ) ; [#uses=0] + %tmp.2.i15 = load sbyte* %inc.i11 ; [#uses=1] + %tmp.3.i16 = seteq sbyte %tmp.2.i15, 0 ; [#uses=1] + %indvar.next.i17 = add ulong %indvar.i7, 1 ; [#uses=1] + br bool %tmp.3.i16, label %puts.entry26.loopexit, label %backEdgeInst + + puts.entry26.loopexit: ; preds = %no_exit.i6 + br label %puts.entry26 + + puts.entry26: ; preds = %loopexit.0.selectcont, %puts.entry26.loopexit + %tmp.9.i19 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.15.1 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.16.1 = call %struct.Toggle* %tmp.15.1( %struct.Toggle* %0 ) ; <%struct.Toggle*> [#uses=1] + %tmp.18.1 = getelementptr %struct.Toggle* %tmp.16.1, long 0, uint 1 ; [#uses=1] + %tmp.19.1 = load sbyte (%struct.Toggle*)** %tmp.18.1 ; [#uses=1] + %tmp.20.1 = call sbyte %tmp.19.1( %struct.Toggle* %0 ) ; [#uses=1] + %tmp.22.1 = setne sbyte %tmp.20.1, 0 ; [#uses=1] + br bool %tmp.22.1, label %puts.entry26.selecttrue, label %puts.entry26.selectcont + + puts.entry26.selecttrue: ; preds = %puts.entry26 + br label %puts.entry26.selectcont + + puts.entry26.selectcont: ; preds = %puts.entry26, %puts.entry26.selecttrue + %mem_tmp.1.0.1 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry26.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry26 ] ; [#uses=3] + %tmp.25.i50 = load sbyte* %mem_tmp.1.0.1 ; [#uses=1] + %tmp.36.i51 = seteq sbyte %tmp.25.i50, 0 ; [#uses=1] + br bool %tmp.36.i51, label %puts.entry72, label %no_exit.i52.preheader + + no_exit.i52.preheader: ; preds = %puts.entry26.selectcont + br label %no_exit.i52 + + no_exit.i52: ; preds = %no_exit.i52.preheader, %backEdgeInst2 + %indvar.i53 = phi ulong [ %indvar.next.i63, %backEdgeInst2 ], [ 0, %no_exit.i52.preheader ] ; [#uses=2] + %Str.0.0.rec.i54 = cast ulong %indvar.i53 to long ; [#uses=2] + %Str.0.0.i55 = getelementptr sbyte* %mem_tmp.1.0.1, long %Str.0.0.rec.i54 ; [#uses=1] + %inc.rec.i56 = add long %Str.0.0.rec.i54, 1 ; [#uses=1] + %inc.i57 = getelementptr sbyte* %mem_tmp.1.0.1, long %inc.rec.i56 ; [#uses=1] + %tmp.7.i58 = load sbyte* %Str.0.0.i55 ; [#uses=1] + %tmp.8.i59 = cast sbyte %tmp.7.i58 to int ; [#uses=1] + %tmp.5.i60 = call int %putchar( int %tmp.8.i59 ) ; [#uses=0] + %tmp.2.i61 = load sbyte* %inc.i57 ; [#uses=1] + %tmp.3.i62 = seteq sbyte %tmp.2.i61, 0 ; [#uses=1] + %indvar.next.i63 = add ulong %indvar.i53, 1 ; [#uses=1] + br bool %tmp.3.i62, label %puts.entry72.loopexit, label %backEdgeInst2 + + puts.entry72.loopexit: ; preds = %no_exit.i52 + br label %puts.entry72 + + puts.entry72: ; preds = %puts.entry26.selectcont, %puts.entry72.loopexit + %tmp.9.i65 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.15.2 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.16.2 = call %struct.Toggle* %tmp.15.2( %struct.Toggle* %0 ) ; <%struct.Toggle*> [#uses=1] + %tmp.18.2 = getelementptr %struct.Toggle* %tmp.16.2, long 0, uint 1 ; [#uses=1] + %tmp.19.2 = load sbyte (%struct.Toggle*)** %tmp.18.2 ; [#uses=1] + %tmp.20.2 = call sbyte %tmp.19.2( %struct.Toggle* %0 ) ; [#uses=1] + %tmp.22.2 = setne sbyte %tmp.20.2, 0 ; [#uses=1] + br bool %tmp.22.2, label %puts.entry72.selecttrue, label %puts.entry72.selectcont + + puts.entry72.selecttrue: ; preds = %puts.entry72 + br label %puts.entry72.selectcont + + puts.entry72.selectcont: ; preds = %puts.entry72, %puts.entry72.selecttrue + %mem_tmp.1.0.2 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry72.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry72 ] ; [#uses=3] + %tmp.25.i73 = load sbyte* %mem_tmp.1.0.2 ; [#uses=1] + %tmp.36.i74 = seteq sbyte %tmp.25.i73, 0 ; [#uses=1] + br bool %tmp.36.i74, label %puts.entry95, label %no_exit.i75.preheader + + no_exit.i75.preheader: ; preds = %puts.entry72.selectcont + br label %no_exit.i75 + + no_exit.i75: ; preds = %no_exit.i75.preheader, %backEdgeInst3 + %indvar.i76 = phi ulong [ %indvar.next.i86, %backEdgeInst3 ], [ 0, %no_exit.i75.preheader ] ; [#uses=2] + %Str.0.0.rec.i77 = cast ulong %indvar.i76 to long ; [#uses=2] + %Str.0.0.i78 = getelementptr sbyte* %mem_tmp.1.0.2, long %Str.0.0.rec.i77 ; [#uses=1] + %inc.rec.i79 = add long %Str.0.0.rec.i77, 1 ; [#uses=1] + %inc.i80 = getelementptr sbyte* %mem_tmp.1.0.2, long %inc.rec.i79 ; [#uses=1] + %tmp.7.i81 = load sbyte* %Str.0.0.i78 ; [#uses=1] + %tmp.8.i82 = cast sbyte %tmp.7.i81 to int ; [#uses=1] + %tmp.5.i83 = call int %putchar( int %tmp.8.i82 ) ; [#uses=0] + %tmp.2.i84 = load sbyte* %inc.i80 ; [#uses=1] + %tmp.3.i85 = seteq sbyte %tmp.2.i84, 0 ; [#uses=1] + %indvar.next.i86 = add ulong %indvar.i76, 1 ; [#uses=1] + br bool %tmp.3.i85, label %puts.entry95.loopexit, label %backEdgeInst3 + + puts.entry95.loopexit: ; preds = %no_exit.i75 + br label %puts.entry95 + + puts.entry95: ; preds = %puts.entry72.selectcont, %puts.entry95.loopexit + %tmp.9.i88 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.15.3 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.16.3 = call %struct.Toggle* %tmp.15.3( %struct.Toggle* %0 ) ; <%struct.Toggle*> [#uses=1] + %tmp.18.3 = getelementptr %struct.Toggle* %tmp.16.3, long 0, uint 1 ; [#uses=1] + %tmp.19.3 = load sbyte (%struct.Toggle*)** %tmp.18.3 ; [#uses=1] + %tmp.20.3 = call sbyte %tmp.19.3( %struct.Toggle* %0 ) ; [#uses=1] + %tmp.22.3 = setne sbyte %tmp.20.3, 0 ; [#uses=1] + br bool %tmp.22.3, label %puts.entry95.selecttrue, label %puts.entry95.selectcont + + puts.entry95.selecttrue: ; preds = %puts.entry95 + br label %puts.entry95.selectcont + + puts.entry95.selectcont: ; preds = %puts.entry95, %puts.entry95.selecttrue + %mem_tmp.1.0.3 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry95.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry95 ] ; [#uses=3] + %tmp.25.i119 = load sbyte* %mem_tmp.1.0.3 ; [#uses=1] + %tmp.36.i120 = seteq sbyte %tmp.25.i119, 0 ; [#uses=1] + br bool %tmp.36.i120, label %puts.entry141, label %no_exit.i121.preheader + + no_exit.i121.preheader: ; preds = %puts.entry95.selectcont + br label %no_exit.i121 + + no_exit.i121: ; preds = %no_exit.i121.preheader, %backEdgeInst4 + %indvar.i122 = phi ulong [ %indvar.next.i132, %backEdgeInst4 ], [ 0, %no_exit.i121.preheader ] ; [#uses=2] + %Str.0.0.rec.i123 = cast ulong %indvar.i122 to long ; [#uses=2] + %Str.0.0.i124 = getelementptr sbyte* %mem_tmp.1.0.3, long %Str.0.0.rec.i123 ; [#uses=1] + %inc.rec.i125 = add long %Str.0.0.rec.i123, 1 ; [#uses=1] + %inc.i126 = getelementptr sbyte* %mem_tmp.1.0.3, long %inc.rec.i125 ; [#uses=1] + %tmp.7.i127 = load sbyte* %Str.0.0.i124 ; [#uses=1] + %tmp.8.i128 = cast sbyte %tmp.7.i127 to int ; [#uses=1] + %tmp.5.i129 = call int %putchar( int %tmp.8.i128 ) ; [#uses=0] + %tmp.2.i130 = load sbyte* %inc.i126 ; [#uses=1] + %tmp.3.i131 = seteq sbyte %tmp.2.i130, 0 ; [#uses=1] + %indvar.next.i132 = add ulong %indvar.i122, 1 ; [#uses=1] + br bool %tmp.3.i131, label %puts.entry141.loopexit, label %backEdgeInst4 + + puts.entry141.loopexit: ; preds = %no_exit.i121 + br label %puts.entry141 + + puts.entry141: ; preds = %puts.entry95.selectcont, %puts.entry141.loopexit + %tmp.9.i134 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.15.4 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.16.4 = call %struct.Toggle* %tmp.15.4( %struct.Toggle* %0 ) ; <%struct.Toggle*> [#uses=1] + %tmp.18.4 = getelementptr %struct.Toggle* %tmp.16.4, long 0, uint 1 ; [#uses=1] + %tmp.19.4 = load sbyte (%struct.Toggle*)** %tmp.18.4 ; [#uses=1] + %tmp.20.4 = call sbyte %tmp.19.4( %struct.Toggle* %0 ) ; [#uses=1] + %tmp.22.4 = setne sbyte %tmp.20.4, 0 ; [#uses=1] + br bool %tmp.22.4, label %puts.entry141.selecttrue, label %puts.entry141.selectcont + + puts.entry141.selecttrue: ; preds = %puts.entry141 + br label %puts.entry141.selectcont + + puts.entry141.selectcont: ; preds = %puts.entry141, %puts.entry141.selecttrue + %mem_tmp.1.0.4 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry141.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry141 ] ; [#uses=3] + %tmp.25.i142 = load sbyte* %mem_tmp.1.0.4 ; [#uses=1] + %tmp.36.i143 = seteq sbyte %tmp.25.i142, 0 ; [#uses=1] + br bool %tmp.36.i143, label %puts.entry164, label %no_exit.i144.preheader + + no_exit.i144.preheader: ; preds = %puts.entry141.selectcont + br label %no_exit.i144 + + no_exit.i144: ; preds = %no_exit.i144.preheader, %backEdgeInst5 + %indvar.i145 = phi ulong [ %indvar.next.i155, %backEdgeInst5 ], [ 0, %no_exit.i144.preheader ] ; [#uses=2] + %Str.0.0.rec.i146 = cast ulong %indvar.i145 to long ; [#uses=2] + %Str.0.0.i147 = getelementptr sbyte* %mem_tmp.1.0.4, long %Str.0.0.rec.i146 ; [#uses=1] + %inc.rec.i148 = add long %Str.0.0.rec.i146, 1 ; [#uses=1] + %inc.i149 = getelementptr sbyte* %mem_tmp.1.0.4, long %inc.rec.i148 ; [#uses=1] + %tmp.7.i150 = load sbyte* %Str.0.0.i147 ; [#uses=1] + %tmp.8.i151 = cast sbyte %tmp.7.i150 to int ; [#uses=1] + %tmp.5.i152 = call int %putchar( int %tmp.8.i151 ) ; [#uses=0] + %tmp.2.i153 = load sbyte* %inc.i149 ; [#uses=1] + %tmp.3.i154 = seteq sbyte %tmp.2.i153, 0 ; [#uses=1] + %indvar.next.i155 = add ulong %indvar.i145, 1 ; [#uses=1] + br bool %tmp.3.i154, label %puts.entry164.loopexit, label %backEdgeInst5 + + puts.entry164.loopexit: ; preds = %no_exit.i144 + br label %puts.entry164 + + puts.entry164: ; preds = %puts.entry141.selectcont, %puts.entry164.loopexit + %tmp.9.i157 = call int %putchar( int 10 ) ; [#uses=0] + call void %free( sbyte* %tmp.1.i.i ) + %tmp.3227 = setgt int %mem_tmp.0.0, 0 ; [#uses=2] + br bool %tmp.3227, label %no_exit.1.preheader, label %puts.entry210 + + no_exit.1.preheader: ; preds = %puts.entry164 + br label %no_exit.1 + + no_exit.1: ; preds = %no_exit.1.preheader, %backEdgeInst6 + %indvar34 = phi uint [ %indvar.next35, %backEdgeInst6 ], [ 0, %no_exit.1.preheader ] ; [#uses=2] + %i.2.0 = cast uint %indvar34 to int ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :1 [#uses=1] + cast sbyte* %1 to %struct.Toggle* ; <%struct.Toggle*>:1 [#uses=3] + %tmp.1.i.i8 = getelementptr %struct.Toggle* %1, long 0, uint 0 ; [#uses=1] + %tmp.4.i.i9 = getelementptr %struct.Toggle* %1, long 0, uint 1 ; [#uses=1] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i9 + %tmp.6.i.i10 = getelementptr %struct.Toggle* %1, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=1] + store %struct.Toggle* (%struct.Toggle*)* %copyConst, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i10 + call void %free( sbyte* %tmp.1.i.i8 ) + %inc.1 = add int %i.2.0, 1 ; [#uses=1] + %tmp.32 = setlt int %inc.1, %mem_tmp.0.0 ; [#uses=1] + %indvar.next35 = add uint %indvar34, 1 ; [#uses=1] + br bool %tmp.32, label %backEdgeInst6, label %puts.entry210.loopexit + + puts.entry210.loopexit: ; preds = %no_exit.1 + br label %puts.entry210 + + puts.entry210: ; preds = %puts.entry164, %puts.entry210.loopexit + %tmp.9.i203 = call int %putchar( int 10 ) ; [#uses=0] + "constantGEP:" = getelementptr %struct.NthToggle* null, uint 1 ; <%struct.NthToggle*> [#uses=1] + %constantCast29 = cast %struct.NthToggle* "constantGEP:" to uint ; [#uses=2] + call sbyte* %malloc( uint %constantCast29 ) ; :2 [#uses=1] + cast sbyte* %2 to %struct.NthToggle* ; <%struct.NthToggle*>:0 [#uses=4] + %ptr1 = getelementptr %struct.NthToggle* %0, long 0, uint 0 ; <%struct.Toggle*> [#uses=18] + %tmp.1.i.i151 = getelementptr %struct.Toggle* %ptr1, long 0, uint 0 ; [#uses=2] + %copyConst = cast sbyte 1 to sbyte ; [#uses=1] + store sbyte %copyConst, sbyte* %tmp.1.i.i151 + %tmp.4.i.i163 = getelementptr %struct.Toggle* %ptr1, long 0, uint 1 ; [#uses=1] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i163 + %tmp.6.i.i175 = getelementptr %struct.Toggle* %ptr1, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=8] + %tmp.1.i.i19 = getelementptr %struct.NthToggle* %0, long 0, uint 1 ; [#uses=1] + %copyConst31 = cast int 3 to int ; [#uses=2] + store int %copyConst31, int* %tmp.1.i.i19 + %tmp.4.i.i20 = getelementptr %struct.NthToggle* %0, long 0, uint 2 ; [#uses=1] + %constantCast = cast %struct.NthToggle* (%struct.NthToggle*)* %nth_toggle_activate to %struct.Toggle* (%struct.Toggle*)* ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=2] + store %struct.Toggle* (%struct.Toggle*)* %constantCast, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 + %copyConst32 = cast int 1 to int ; [#uses=1] + store int %copyConst32, int* %tmp.4.i.i20 + %tmp = cast %struct.NthToggle* %0 to %struct.Toggle* ; <%struct.Toggle*> [#uses=1] + %tmp.51 = getelementptr %struct.Toggle* %tmp, long 0, uint 1 ; [#uses=1] + %tmp.52 = load sbyte (%struct.Toggle*)** %tmp.51 ; [#uses=1] + %tmp.53 = call sbyte %tmp.52( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56 = setne sbyte %tmp.53, 0 ; [#uses=1] + br bool %tmp.56, label %puts.entry210.selecttrue, label %puts.entry210.selectcont + + puts.entry210.selecttrue: ; preds = %puts.entry210 + br label %puts.entry210.selectcont + + puts.entry210.selectcont: ; preds = %puts.entry210, %puts.entry210.selecttrue + %Msg.0 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry210.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry210 ] ; [#uses=3] + %tmp.25.i237 = load sbyte* %Msg.0 ; [#uses=1] + %tmp.36.i238 = seteq sbyte %tmp.25.i237, 0 ; [#uses=1] + br bool %tmp.36.i238, label %puts.entry259, label %no_exit.i239.preheader + + no_exit.i239.preheader: ; preds = %puts.entry210.selectcont + br label %no_exit.i239 + + no_exit.i239: ; preds = %no_exit.i239.preheader, %backEdgeInst7 + %indvar.i240 = phi ulong [ %indvar.next.i250, %backEdgeInst7 ], [ 0, %no_exit.i239.preheader ] ; [#uses=2] + %Str.0.0.rec.i241 = cast ulong %indvar.i240 to long ; [#uses=2] + %Str.0.0.i242 = getelementptr sbyte* %Msg.0, long %Str.0.0.rec.i241 ; [#uses=1] + %inc.rec.i243 = add long %Str.0.0.rec.i241, 1 ; [#uses=1] + %inc.i244 = getelementptr sbyte* %Msg.0, long %inc.rec.i243 ; [#uses=1] + %tmp.7.i245 = load sbyte* %Str.0.0.i242 ; [#uses=1] + %tmp.8.i246 = cast sbyte %tmp.7.i245 to int ; [#uses=1] + %tmp.5.i247 = call int %putchar( int %tmp.8.i246 ) ; [#uses=0] + %tmp.2.i248 = load sbyte* %inc.i244 ; [#uses=1] + %tmp.3.i249 = seteq sbyte %tmp.2.i248, 0 ; [#uses=1] + %indvar.next.i250 = add ulong %indvar.i240, 1 ; [#uses=1] + br bool %tmp.3.i249, label %puts.entry259.loopexit, label %backEdgeInst7 + + puts.entry259.loopexit: ; preds = %no_exit.i239 + br label %puts.entry259 + + puts.entry259: ; preds = %puts.entry210.selectcont, %puts.entry259.loopexit + %tmp.9.i252 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.1 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.1 = call %struct.Toggle* %tmp.47.1( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.1 = getelementptr %struct.Toggle* %tmp.48.1, long 0, uint 1 ; [#uses=1] + %tmp.52.1 = load sbyte (%struct.Toggle*)** %tmp.51.1 ; [#uses=1] + %tmp.53.1 = call sbyte %tmp.52.1( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.1 = setne sbyte %tmp.53.1, 0 ; [#uses=1] + br bool %tmp.56.1, label %puts.entry259.selecttrue, label %puts.entry259.selectcont + + puts.entry259.selecttrue: ; preds = %puts.entry259 + br label %puts.entry259.selectcont + + puts.entry259.selectcont: ; preds = %puts.entry259, %puts.entry259.selecttrue + %Msg.0.1 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry259.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry259 ] ; [#uses=3] + %tmp.25.i260 = load sbyte* %Msg.0.1 ; [#uses=1] + %tmp.36.i261 = seteq sbyte %tmp.25.i260, 0 ; [#uses=1] + br bool %tmp.36.i261, label %puts.entry282, label %no_exit.i262.preheader + + no_exit.i262.preheader: ; preds = %puts.entry259.selectcont + br label %no_exit.i262 + + no_exit.i262: ; preds = %no_exit.i262.preheader, %backEdgeInst8 + %indvar.i263 = phi ulong [ %indvar.next.i273, %backEdgeInst8 ], [ 0, %no_exit.i262.preheader ] ; [#uses=2] + %Str.0.0.rec.i264 = cast ulong %indvar.i263 to long ; [#uses=2] + %Str.0.0.i265 = getelementptr sbyte* %Msg.0.1, long %Str.0.0.rec.i264 ; [#uses=1] + %inc.rec.i266 = add long %Str.0.0.rec.i264, 1 ; [#uses=1] + %inc.i267 = getelementptr sbyte* %Msg.0.1, long %inc.rec.i266 ; [#uses=1] + %tmp.7.i268 = load sbyte* %Str.0.0.i265 ; [#uses=1] + %tmp.8.i269 = cast sbyte %tmp.7.i268 to int ; [#uses=1] + %tmp.5.i270 = call int %putchar( int %tmp.8.i269 ) ; [#uses=0] + %tmp.2.i271 = load sbyte* %inc.i267 ; [#uses=1] + %tmp.3.i272 = seteq sbyte %tmp.2.i271, 0 ; [#uses=1] + %indvar.next.i273 = add ulong %indvar.i263, 1 ; [#uses=1] + br bool %tmp.3.i272, label %puts.entry282.loopexit, label %backEdgeInst8 + + puts.entry282.loopexit: ; preds = %no_exit.i262 + br label %puts.entry282 + + puts.entry282: ; preds = %puts.entry259.selectcont, %puts.entry282.loopexit + %tmp.9.i275 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.2 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.2 = call %struct.Toggle* %tmp.47.2( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.2 = getelementptr %struct.Toggle* %tmp.48.2, long 0, uint 1 ; [#uses=1] + %tmp.52.2 = load sbyte (%struct.Toggle*)** %tmp.51.2 ; [#uses=1] + %tmp.53.2 = call sbyte %tmp.52.2( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.2 = setne sbyte %tmp.53.2, 0 ; [#uses=1] + br bool %tmp.56.2, label %puts.entry282.selecttrue, label %puts.entry282.selectcont + + puts.entry282.selecttrue: ; preds = %puts.entry282 + br label %puts.entry282.selectcont + + puts.entry282.selectcont: ; preds = %puts.entry282, %puts.entry282.selecttrue + %Msg.0.2 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry282.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry282 ] ; [#uses=3] + %tmp.25.i283 = load sbyte* %Msg.0.2 ; [#uses=1] + %tmp.36.i284 = seteq sbyte %tmp.25.i283, 0 ; [#uses=1] + br bool %tmp.36.i284, label %puts.entry305, label %no_exit.i285.preheader + + no_exit.i285.preheader: ; preds = %puts.entry282.selectcont + br label %no_exit.i285 + + no_exit.i285: ; preds = %no_exit.i285.preheader, %backEdgeInst9 + %indvar.i286 = phi ulong [ %indvar.next.i296, %backEdgeInst9 ], [ 0, %no_exit.i285.preheader ] ; [#uses=2] + %Str.0.0.rec.i287 = cast ulong %indvar.i286 to long ; [#uses=2] + %Str.0.0.i288 = getelementptr sbyte* %Msg.0.2, long %Str.0.0.rec.i287 ; [#uses=1] + %inc.rec.i289 = add long %Str.0.0.rec.i287, 1 ; [#uses=1] + %inc.i290 = getelementptr sbyte* %Msg.0.2, long %inc.rec.i289 ; [#uses=1] + %tmp.7.i291 = load sbyte* %Str.0.0.i288 ; [#uses=1] + %tmp.8.i292 = cast sbyte %tmp.7.i291 to int ; [#uses=1] + %tmp.5.i293 = call int %putchar( int %tmp.8.i292 ) ; [#uses=0] + %tmp.2.i294 = load sbyte* %inc.i290 ; [#uses=1] + %tmp.3.i295 = seteq sbyte %tmp.2.i294, 0 ; [#uses=1] + %indvar.next.i296 = add ulong %indvar.i286, 1 ; [#uses=1] + br bool %tmp.3.i295, label %puts.entry305.loopexit, label %backEdgeInst9 + + puts.entry305.loopexit: ; preds = %no_exit.i285 + br label %puts.entry305 + + puts.entry305: ; preds = %puts.entry282.selectcont, %puts.entry305.loopexit + %tmp.9.i298 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.3 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.3 = call %struct.Toggle* %tmp.47.3( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.3 = getelementptr %struct.Toggle* %tmp.48.3, long 0, uint 1 ; [#uses=1] + %tmp.52.3 = load sbyte (%struct.Toggle*)** %tmp.51.3 ; [#uses=1] + %tmp.53.3 = call sbyte %tmp.52.3( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.3 = setne sbyte %tmp.53.3, 0 ; [#uses=1] + br bool %tmp.56.3, label %puts.entry305.selecttrue, label %puts.entry305.selectcont + + puts.entry305.selecttrue: ; preds = %puts.entry305 + br label %puts.entry305.selectcont + + puts.entry305.selectcont: ; preds = %puts.entry305, %puts.entry305.selecttrue + %Msg.0.3 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry305.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry305 ] ; [#uses=3] + %tmp.25.i214 = load sbyte* %Msg.0.3 ; [#uses=1] + %tmp.36.i215 = seteq sbyte %tmp.25.i214, 0 ; [#uses=1] + br bool %tmp.36.i215, label %puts.entry236, label %no_exit.i216.preheader + + no_exit.i216.preheader: ; preds = %puts.entry305.selectcont + br label %no_exit.i216 + + no_exit.i216: ; preds = %no_exit.i216.preheader, %backEdgeInst10 + %indvar.i217 = phi ulong [ %indvar.next.i227, %backEdgeInst10 ], [ 0, %no_exit.i216.preheader ] ; [#uses=2] + %Str.0.0.rec.i218 = cast ulong %indvar.i217 to long ; [#uses=2] + %Str.0.0.i219 = getelementptr sbyte* %Msg.0.3, long %Str.0.0.rec.i218 ; [#uses=1] + %inc.rec.i220 = add long %Str.0.0.rec.i218, 1 ; [#uses=1] + %inc.i221 = getelementptr sbyte* %Msg.0.3, long %inc.rec.i220 ; [#uses=1] + %tmp.7.i222 = load sbyte* %Str.0.0.i219 ; [#uses=1] + %tmp.8.i223 = cast sbyte %tmp.7.i222 to int ; [#uses=1] + %tmp.5.i224 = call int %putchar( int %tmp.8.i223 ) ; [#uses=0] + %tmp.2.i225 = load sbyte* %inc.i221 ; [#uses=1] + %tmp.3.i226 = seteq sbyte %tmp.2.i225, 0 ; [#uses=1] + %indvar.next.i227 = add ulong %indvar.i217, 1 ; [#uses=1] + br bool %tmp.3.i226, label %puts.entry236.loopexit, label %backEdgeInst10 + + puts.entry236.loopexit: ; preds = %no_exit.i216 + br label %puts.entry236 + + puts.entry236: ; preds = %puts.entry305.selectcont, %puts.entry236.loopexit + %tmp.9.i229 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.4 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.4 = call %struct.Toggle* %tmp.47.4( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.4 = getelementptr %struct.Toggle* %tmp.48.4, long 0, uint 1 ; [#uses=1] + %tmp.52.4 = load sbyte (%struct.Toggle*)** %tmp.51.4 ; [#uses=1] + %tmp.53.4 = call sbyte %tmp.52.4( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.4 = setne sbyte %tmp.53.4, 0 ; [#uses=1] + br bool %tmp.56.4, label %puts.entry236.selecttrue, label %puts.entry236.selectcont + + puts.entry236.selecttrue: ; preds = %puts.entry236 + br label %puts.entry236.selectcont + + puts.entry236.selectcont: ; preds = %puts.entry236, %puts.entry236.selecttrue + %Msg.0.4 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry236.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry236 ] ; [#uses=3] + %tmp.25.i165 = load sbyte* %Msg.0.4 ; [#uses=1] + %tmp.36.i166 = seteq sbyte %tmp.25.i165, 0 ; [#uses=1] + br bool %tmp.36.i166, label %puts.entry187, label %no_exit.i167.preheader + + no_exit.i167.preheader: ; preds = %puts.entry236.selectcont + br label %no_exit.i167 + + no_exit.i167: ; preds = %no_exit.i167.preheader, %backEdgeInst11 + %indvar.i168 = phi ulong [ %indvar.next.i178, %backEdgeInst11 ], [ 0, %no_exit.i167.preheader ] ; [#uses=2] + %Str.0.0.rec.i169 = cast ulong %indvar.i168 to long ; [#uses=2] + %Str.0.0.i170 = getelementptr sbyte* %Msg.0.4, long %Str.0.0.rec.i169 ; [#uses=1] + %inc.rec.i171 = add long %Str.0.0.rec.i169, 1 ; [#uses=1] + %inc.i172 = getelementptr sbyte* %Msg.0.4, long %inc.rec.i171 ; [#uses=1] + %tmp.7.i173 = load sbyte* %Str.0.0.i170 ; [#uses=1] + %tmp.8.i174 = cast sbyte %tmp.7.i173 to int ; [#uses=1] + %tmp.5.i175 = call int %putchar( int %tmp.8.i174 ) ; [#uses=0] + %tmp.2.i176 = load sbyte* %inc.i172 ; [#uses=1] + %tmp.3.i177 = seteq sbyte %tmp.2.i176, 0 ; [#uses=1] + %indvar.next.i178 = add ulong %indvar.i168, 1 ; [#uses=1] + br bool %tmp.3.i177, label %puts.entry187.loopexit, label %backEdgeInst11 + + puts.entry187.loopexit: ; preds = %no_exit.i167 + br label %puts.entry187 + + puts.entry187: ; preds = %puts.entry236.selectcont, %puts.entry187.loopexit + %tmp.9.i180 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.5 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.5 = call %struct.Toggle* %tmp.47.5( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.5 = getelementptr %struct.Toggle* %tmp.48.5, long 0, uint 1 ; [#uses=1] + %tmp.52.5 = load sbyte (%struct.Toggle*)** %tmp.51.5 ; [#uses=1] + %tmp.53.5 = call sbyte %tmp.52.5( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.5 = setne sbyte %tmp.53.5, 0 ; [#uses=1] + br bool %tmp.56.5, label %puts.entry187.selecttrue, label %puts.entry187.selectcont + + puts.entry187.selecttrue: ; preds = %puts.entry187 + br label %puts.entry187.selectcont + + puts.entry187.selectcont: ; preds = %puts.entry187, %puts.entry187.selecttrue + %Msg.0.5 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry187.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry187 ] ; [#uses=3] + %tmp.25.i96 = load sbyte* %Msg.0.5 ; [#uses=1] + %tmp.36.i97 = seteq sbyte %tmp.25.i96, 0 ; [#uses=1] + br bool %tmp.36.i97, label %puts.entry118, label %no_exit.i98.preheader + + no_exit.i98.preheader: ; preds = %puts.entry187.selectcont + br label %no_exit.i98 + + no_exit.i98: ; preds = %no_exit.i98.preheader, %backEdgeInst12 + %indvar.i99 = phi ulong [ %indvar.next.i109, %backEdgeInst12 ], [ 0, %no_exit.i98.preheader ] ; [#uses=2] + %Str.0.0.rec.i100 = cast ulong %indvar.i99 to long ; [#uses=2] + %Str.0.0.i101 = getelementptr sbyte* %Msg.0.5, long %Str.0.0.rec.i100 ; [#uses=1] + %inc.rec.i102 = add long %Str.0.0.rec.i100, 1 ; [#uses=1] + %inc.i103 = getelementptr sbyte* %Msg.0.5, long %inc.rec.i102 ; [#uses=1] + %tmp.7.i104 = load sbyte* %Str.0.0.i101 ; [#uses=1] + %tmp.8.i105 = cast sbyte %tmp.7.i104 to int ; [#uses=1] + %tmp.5.i106 = call int %putchar( int %tmp.8.i105 ) ; [#uses=0] + %tmp.2.i107 = load sbyte* %inc.i103 ; [#uses=1] + %tmp.3.i108 = seteq sbyte %tmp.2.i107, 0 ; [#uses=1] + %indvar.next.i109 = add ulong %indvar.i99, 1 ; [#uses=1] + br bool %tmp.3.i108, label %puts.entry118.loopexit, label %backEdgeInst12 + + puts.entry118.loopexit: ; preds = %no_exit.i98 + br label %puts.entry118 + + puts.entry118: ; preds = %puts.entry187.selectcont, %puts.entry118.loopexit + %tmp.9.i111 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.6 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.6 = call %struct.Toggle* %tmp.47.6( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.6 = getelementptr %struct.Toggle* %tmp.48.6, long 0, uint 1 ; [#uses=1] + %tmp.52.6 = load sbyte (%struct.Toggle*)** %tmp.51.6 ; [#uses=1] + %tmp.53.6 = call sbyte %tmp.52.6( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.6 = setne sbyte %tmp.53.6, 0 ; [#uses=1] + br bool %tmp.56.6, label %puts.entry118.selecttrue, label %puts.entry118.selectcont + + puts.entry118.selecttrue: ; preds = %puts.entry118 + br label %puts.entry118.selectcont + + puts.entry118.selectcont: ; preds = %puts.entry118, %puts.entry118.selecttrue + %Msg.0.6 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry118.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry118 ] ; [#uses=3] + %tmp.25.i27 = load sbyte* %Msg.0.6 ; [#uses=1] + %tmp.36.i28 = seteq sbyte %tmp.25.i27, 0 ; [#uses=1] + br bool %tmp.36.i28, label %puts.entry49, label %no_exit.i29.preheader + + no_exit.i29.preheader: ; preds = %puts.entry118.selectcont + br label %no_exit.i29 + + no_exit.i29: ; preds = %no_exit.i29.preheader, %backEdgeInst13 + %indvar.i30 = phi ulong [ %indvar.next.i40, %backEdgeInst13 ], [ 0, %no_exit.i29.preheader ] ; [#uses=2] + %Str.0.0.rec.i31 = cast ulong %indvar.i30 to long ; [#uses=2] + %Str.0.0.i32 = getelementptr sbyte* %Msg.0.6, long %Str.0.0.rec.i31 ; [#uses=1] + %inc.rec.i33 = add long %Str.0.0.rec.i31, 1 ; [#uses=1] + %inc.i34 = getelementptr sbyte* %Msg.0.6, long %inc.rec.i33 ; [#uses=1] + %tmp.7.i35 = load sbyte* %Str.0.0.i32 ; [#uses=1] + %tmp.8.i36 = cast sbyte %tmp.7.i35 to int ; [#uses=1] + %tmp.5.i37 = call int %putchar( int %tmp.8.i36 ) ; [#uses=0] + %tmp.2.i38 = load sbyte* %inc.i34 ; [#uses=1] + %tmp.3.i39 = seteq sbyte %tmp.2.i38, 0 ; [#uses=1] + %indvar.next.i40 = add ulong %indvar.i30, 1 ; [#uses=1] + br bool %tmp.3.i39, label %puts.entry49.loopexit, label %backEdgeInst13 + + puts.entry49.loopexit: ; preds = %no_exit.i29 + br label %puts.entry49 + + puts.entry49: ; preds = %puts.entry118.selectcont, %puts.entry49.loopexit + %tmp.9.i42 = call int %putchar( int 10 ) ; [#uses=0] + %tmp.47.7 = load %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i175 ; <%struct.Toggle* (%struct.Toggle*)*> [#uses=1] + %tmp.48.7 = call %struct.Toggle* %tmp.47.7( %struct.Toggle* %ptr1 ) ; <%struct.Toggle*> [#uses=1] + %tmp.51.7 = getelementptr %struct.Toggle* %tmp.48.7, long 0, uint 1 ; [#uses=1] + %tmp.52.7 = load sbyte (%struct.Toggle*)** %tmp.51.7 ; [#uses=1] + %tmp.53.7 = call sbyte %tmp.52.7( %struct.Toggle* %ptr1 ) ; [#uses=1] + %tmp.56.7 = setne sbyte %tmp.53.7, 0 ; [#uses=1] + br bool %tmp.56.7, label %puts.entry49.selecttrue, label %puts.entry49.selectcont + + puts.entry49.selecttrue: ; preds = %puts.entry49 + br label %puts.entry49.selectcont + + puts.entry49.selectcont: ; preds = %puts.entry49, %puts.entry49.selecttrue + %Msg.0.7 = phi sbyte* [ "constantGEP:addrOfGlobal:.str_1", %puts.entry49.selecttrue ], [ "constantGEP:addrOfGlobal:.str_2", %puts.entry49 ] ; [#uses=3] + %tmp.25.i = load sbyte* %Msg.0.7 ; [#uses=1] + %tmp.36.i = seteq sbyte %tmp.25.i, 0 ; [#uses=1] + br bool %tmp.36.i, label %puts.entry, label %no_exit.i1.preheader + + no_exit.i1.preheader: ; preds = %puts.entry49.selectcont + br label %no_exit.i1 + + no_exit.i1: ; preds = %no_exit.i1.preheader, %backEdgeInst14 + %indvar.i2 = phi ulong [ %indvar.next.i3, %backEdgeInst14 ], [ 0, %no_exit.i1.preheader ] ; [#uses=2] + %Str.0.0.rec.i = cast ulong %indvar.i2 to long ; [#uses=2] + %Str.0.0.i = getelementptr sbyte* %Msg.0.7, long %Str.0.0.rec.i ; [#uses=1] + %inc.rec.i = add long %Str.0.0.rec.i, 1 ; [#uses=1] + %inc.i = getelementptr sbyte* %Msg.0.7, long %inc.rec.i ; [#uses=1] + %tmp.7.i = load sbyte* %Str.0.0.i ; [#uses=1] + %tmp.8.i = cast sbyte %tmp.7.i to int ; [#uses=1] + %tmp.5.i = call int %putchar( int %tmp.8.i ) ; [#uses=0] + %tmp.2.i = load sbyte* %inc.i ; [#uses=1] + %tmp.3.i = seteq sbyte %tmp.2.i, 0 ; [#uses=1] + %indvar.next.i3 = add ulong %indvar.i2, 1 ; [#uses=1] + br bool %tmp.3.i, label %puts.entry.loopexit, label %backEdgeInst14 + + puts.entry.loopexit: ; preds = %no_exit.i1 + br label %puts.entry + + puts.entry: ; preds = %puts.entry49.selectcont, %puts.entry.loopexit + %tmp.9.i = call int %putchar( int 10 ) ; [#uses=0] + call void %free( sbyte* %tmp.1.i.i151 ) + br bool %tmp.3227, label %no_exit.3.preheader, label %loopexit.3 + + no_exit.3.preheader: ; preds = %puts.entry + br label %no_exit.3 + + no_exit.3: ; preds = %no_exit.3.preheader, %backEdgeInst15 + %indvar39 = phi uint [ %indvar.next40, %backEdgeInst15 ], [ 0, %no_exit.3.preheader ] ; [#uses=2] + %i.0.0 = cast uint %indvar39 to int ; [#uses=1] + call sbyte* %malloc( uint %constantCast29 ) ; :3 [#uses=1] + cast sbyte* %3 to %struct.NthToggle* ; <%struct.NthToggle*>:1 [#uses=3] + %ptr16 = getelementptr %struct.NthToggle* %1, long 0, uint 0 ; <%struct.Toggle*> [#uses=3] + %tmp.1.i.i27 = getelementptr %struct.Toggle* %ptr16, long 0, uint 0 ; [#uses=1] + %tmp.4.i.i39 = getelementptr %struct.Toggle* %ptr16, long 0, uint 1 ; [#uses=1] + store sbyte (%struct.Toggle*)* %copyConst, sbyte (%struct.Toggle*)** %tmp.4.i.i39 + %tmp.6.i.i411 = getelementptr %struct.Toggle* %ptr16, long 0, uint 2 ; <%struct.Toggle* (%struct.Toggle*)**> [#uses=1] + %tmp.1.i.i = getelementptr %struct.NthToggle* %1, long 0, uint 1 ; [#uses=1] + store int %copyConst31, int* %tmp.1.i.i + %tmp.4.i.i = getelementptr %struct.NthToggle* %1, long 0, uint 2 ; [#uses=1] + store int 0, int* %tmp.4.i.i + store %struct.Toggle* (%struct.Toggle*)* %constantCast, %struct.Toggle* (%struct.Toggle*)** %tmp.6.i.i411 + call void %free( sbyte* %tmp.1.i.i27 ) + %inc.3 = add int %i.0.0, 1 ; [#uses=1] + %tmp.67 = setlt int %inc.3, %mem_tmp.0.0 ; [#uses=1] + %indvar.next40 = add uint %indvar39, 1 ; [#uses=1] + br bool %tmp.67, label %backEdgeInst15, label %loopexit.3.loopexit + + loopexit.3.loopexit: ; preds = %no_exit.3 + br label %loopexit.3 + + loopexit.3: ; preds = %puts.entry, %loopexit.3.loopexit + ret int 0 + + backEdgeInst: ; preds = %no_exit.i6 + call void %llvm_first_trigger( ) + br label %no_exit.i6 + + backEdgeInst2: ; preds = %no_exit.i52 + call void %llvm_first_trigger( ) + br label %no_exit.i52 + + backEdgeInst3: ; preds = %no_exit.i75 + call void %llvm_first_trigger( ) + br label %no_exit.i75 + + backEdgeInst4: ; preds = %no_exit.i121 + call void %llvm_first_trigger( ) + br label %no_exit.i121 + + backEdgeInst5: ; preds = %no_exit.i144 + call void %llvm_first_trigger( ) + br label %no_exit.i144 + + backEdgeInst6: ; preds = %no_exit.1 + call void %llvm_first_trigger( ) + br label %no_exit.1 + + backEdgeInst7: ; preds = %no_exit.i239 + call void %llvm_first_trigger( ) + br label %no_exit.i239 + + backEdgeInst8: ; preds = %no_exit.i262 + call void %llvm_first_trigger( ) + br label %no_exit.i262 + + backEdgeInst9: ; preds = %no_exit.i285 + call void %llvm_first_trigger( ) + br label %no_exit.i285 + + backEdgeInst10: ; preds = %no_exit.i216 + call void %llvm_first_trigger( ) + br label %no_exit.i216 + + backEdgeInst11: ; preds = %no_exit.i167 + call void %llvm_first_trigger( ) + br label %no_exit.i167 + + backEdgeInst12: ; preds = %no_exit.i98 + call void %llvm_first_trigger( ) + br label %no_exit.i98 + + backEdgeInst13: ; preds = %no_exit.i29 + call void %llvm_first_trigger( ) + br label %no_exit.i29 + + backEdgeInst14: ; preds = %no_exit.i1 + call void %llvm_first_trigger( ) + br label %no_exit.i1 + + backEdgeInst15: ; preds = %no_exit.3 + call void %llvm_first_trigger( ) + br label %no_exit.3 + } + + declare int %atoi(sbyte*) + + declare int %putchar(int) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/objinst.main.trace13.txt diff -c /dev/null reopt/test/TTFTestCases/objinst.main.trace13.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/objinst.main.trace13.txt Wed Sep 8 16:34:23 2004 *************** *** 0 **** --- 1,2 ---- + main + 36 96 Index: reopt/test/TTFTestCases/objinst.main.trace14.txt diff -c /dev/null reopt/test/TTFTestCases/objinst.main.trace14.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/objinst.main.trace14.txt Wed Sep 8 16:34:23 2004 *************** *** 0 **** --- 1,2 ---- + main + 88 105 Index: reopt/test/TTFTestCases/random.ll diff -c /dev/null reopt/test/TTFTestCases/random.ll:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/random.ll Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,108 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %last.0__ = internal global long 42 ; [#uses=3] + %.str_1 = internal constant [6 x sbyte] c"%.9f\0A\00" ; <[6 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (int, sbyte**)* } { int (int, sbyte**)* %main } ; <{ int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [1 x sbyte] zeroinitializer ; <[1 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 1 ; [#uses=0] + %main.regAllocState = internal constant { uint, [56 x { int, int, uint, int }] } { uint 56, [56 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 3 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 9 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int -1! , uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 1, int 9 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 9 }, { int, int, uint, int } { int 16, int -2, uint 1, int 9 }, { int, int, uint, int } { int 17, int -1, uint 1, int 9 }, { int, int, uint, int } { int 18, int -1, uint 1, int 8 }, { int, int, uint, int } { int 19, int -1, uint 1, int 11 }, { int, int, uint, int } { int 20, int -1, uint 1, int 9 }, { int, int, uint, int } { int 21, int -1, uint 1, int 10 }, { int, int, uint, int } { int 22, int -1, uint 1, int 12 }, { int, int, uint, int } { int 23, int -1, uint 0, int -1 }, { int, int, uint, int } { int 24, int -1, uint 1, int 7 }, { int, int, uint, int } { int 24, int -2, uint 1, int 7 }, { int, int, uint, int } { int 25, int -1, uint 1, int 11 }, { int, int, uint, int } { int 25, int -2, uint 1, int 11 }, { int, int, uint,! int } { int 26, int -1, uint 1, int 11 }, { int, int, uint, int } { i nt 27, int -1, uint 1, int 11 }, { int, int, uint, int } { int 28, int -1, uint 1, int 11 }, { int, int, uint, int } { int 29, int -1, uint 1, int 7 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 0, int -1 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 1, int 2 }, { int, int, uint, int } { int 35, int -1, uint 1, int 3 }, { int, int, uint, int } { int 36, int -1, uint 1, int 3 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 1, int 3 }, { int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 1, int 3 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, { int, int, uint, int } { int 42, int -1, uint 1, int 34 }, { int, int, uint, int } { int 43, int -1, uint 1, int 34 }, { ! int, int, uint, int } { int 44, int -1, uint 1, int 34 }, { int, int, uint, int } { int 45, int -1, uint 0, int -1 }, { int, int, uint, int } { int 46, int -1, uint 1, int 0 }, { int, int, uint, int } { int 47, int -1, uint 1, int 0 }, { int, int, uint, int } { int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 } ] } ; <{ uint, [56 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [1 x { uint, [0 x { int, int, uint, int }] }*] } { uint 1, [1 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [56 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [1 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [21 x sbyte*] } { uint 21, [21 x sbyte*] [ sbyte* cast (long* %last.0__ to sbyte*), sbyte* cast ([6 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [56 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [21 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 399999998 to int ; [#uses=1] + br bool %tmp.1, label %cond_true, label %no_exit.preheader + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=2] + %dec9 = add int %tmp.3, -2 ; [#uses=1] + %tmp.1010 = seteq int %tmp.3, 1 ; [#uses=1] + br bool %tmp.1010, label %loopexit, label %no_exit.preheader + + no_exit.preheader: ; preds = %__main.entry, %cond_true + %dec.0.ph = phi int [ %dec9, %cond_true ], [ %copyConst, %__main.entry ] ; [#uses=1] + %dec.0.ph = cast int %dec.0.ph to uint ; [#uses=1] + "addrOfGlobal:last.0__" = getelementptr long* %last.0__, long 0 ; [#uses=2] + %last.0__.promoted = load long* "addrOfGlobal:last.0__" ; [#uses=1] + %tmp. = add uint %dec.0.ph, 1 ; [#uses=1] + %copyConst = cast long 29573 to long ; [#uses=1] + %copyConst2 = cast long 139968 to long ; [#uses=1] + br label %no_exit + + no_exit: ; preds = %no_exit.preheader, %backEdgeInst + %indvar = phi uint [ 0, %no_exit.preheader ], [ %indvar.next, %backEdgeInst ] ; [#uses=1] + %last.0__.tmp.0 = phi long [ %last.0__.promoted, %no_exit.preheader ], [ %tmp.3.i, %backEdgeInst ] ; [#uses=1] + %tmp.1.i = mul long %last.0__.tmp.0, 3877 ; [#uses=1] + %tmp.2.i = add long %tmp.1.i, %copyConst ; [#uses=1] + %tmp.3.i = rem long %tmp.2.i, %copyConst2 ; [#uses=2] + %indvar.next = add uint %indvar, 1 ; [#uses=2] + %exitcond = seteq uint %indvar.next, %tmp. ; [#uses=1] + br bool %exitcond, label %loopexit.loopexit, label %backEdgeInst + + loopexit.loopexit: ; preds = %no_exit + store long %tmp.3.i, long* "addrOfGlobal:last.0__" + br label %loopexit + + loopexit: ; preds = %cond_true, %loopexit.loopexit + "addrOfGlobal:last.0__4" = getelementptr long* %last.0__, long 0 ; [#uses=2] + %tmp.0.i1 = load long* "addrOfGlobal:last.0__4" ; [#uses=1] + %tmp.1.i2 = mul long %tmp.0.i1, 3877 ; [#uses=1] + %copyConst5 = cast long 29573 to long ; [#uses=1] + %tmp.2.i3 = add long %tmp.1.i2, %copyConst5 ; [#uses=1] + %copyConst6 = cast long 139968 to long ; [#uses=1] + %tmp.3.i4 = rem long %tmp.2.i3, %copyConst6 ; [#uses=2] + store long %tmp.3.i4, long* "addrOfGlobal:last.0__4" + %tmp.5.i6 = cast long %tmp.3.i4 to double ; [#uses=1] + %tmp.7.i7 = mul double %tmp.5.i6, 0x4059000000000000 ; [#uses=1] + %tmp.8.i8 = div double %tmp.7.i7, 0x4101160000000000 ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [6 x sbyte]* %.str_1, long 0 ; <[6 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [6 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + %tmp.13 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", double %tmp.8.i8 ) ; [#uses=0] + ret int 0 + + backEdgeInst: ; preds = %no_exit + call void %llvm_first_trigger( ) + br label %no_exit + } + + declare int %atoi(sbyte*) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/random.main.trace15.txt diff -c /dev/null reopt/test/TTFTestCases/random.main.trace15.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/random.main.trace15.txt Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,2 ---- + main + 5 8 Index: reopt/test/TTFTestCases/sieve.ll diff -c /dev/null reopt/test/TTFTestCases/sieve.ll:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/sieve.ll Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,182 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %flags.0__ = internal global [8193 x sbyte] zeroinitializer ; <[8193 x sbyte]*> [#uses=2] + %.str_1 = internal constant [11 x sbyte] c"Count: %d\0A\00" ; <[11 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { int (int, sbyte**)* } { int (int, sbyte**)* %main } ; <{ int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [1 x sbyte] zeroinitializer ; <[1 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 1 ; [#uses=0] + %main.regAllocState = internal constant { uint, [116 x { int, int, uint, int }] } { uint 116, [116 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 2 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 1 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 1, int 0 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 1, int 0 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 1, int 8 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 10 }, { int, int, uint, int } { int 17, int -1, uint 1, int 13 }, { int, int, uint, int } { int 18, int -1, uint 1, int 1 }, { int, int, uint, int } { int 19, int -1, uint 0, int -1 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 1, int 9 }, { int, int, uint, int } { int 21, int -2, uint 1, int 9 }, { int, int, uint, int } { int 22, int -1, uint 1, int 13 }, { int, int, uint, int } { int 22, int -2, uint 1, int 13 }, { int, int, uint, int } { int 23, int -1, uint 1, int 0 }, { int, int, uint, int } { int 23, int -2, uint 1, int 0 }, { int, int, uint, int } { int 24, int -1, uint 1, int 1 }, { int, int, uint, int } { int 24, int -2, uint 1, int 1 }, { int, int, ui! nt, int } { int 25, int -1, uint 1, int 8 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, uint, int } { int 27, int -1, uint 0, int -1 }, { int, int, uint, int } { int 28, int -1, uint 1, int 15 }, { int, int, uint, int } { int 28, int -2, uint 1, int 8 }, { int, int, uint, int } { int 29, int -1, uint 1, int 4 }, { int, int, uint, int } { int 29, int -2, uint 1, int 13 }, { int, int, uint, int } { int 30, int -1, uint 1, int 2 }, { int, int, uint, int } { int 30, int -2, uint 1, int 2 }, { int, int, uint, int } { int 31, int -1, uint 1, int 3 }, { int, int, uint, int } { int 31, int -2, uint 1, int 3 }, { int, int, uint, int } { int 32, int -1, uint 1, int 5 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 1, int 7 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 1, int 10 }, { ! int, int, uint, int } { int 39, int -1, uint 0, int -1 }, { int, int, uint, int } { int 40, int -1, uint 0, int -1 }, { int, int, uint, int } { int 41, int -1, uint 0, int -1 }, { int, int, uint, int } { int 42, int -1, uint 1, int 8 }, { int, int, uint, int } { int 43, int -1, uint 0, int -1 }, { int, int, uint, int } { int 44, int -1, uint 1, int 9 }, { int, int, uint, int } { int 44, int -2, uint 1, int 9 }, { int, int, uint, int } { int 45, int -1, uint 1, int 13 }, { int, int, uint, int } { int 45, int -2, uint 1, int 13 }, { int, int, uint, int } { int 46, int -1, uint 1, int 12 }, { int, int, uint, int } { int 46, int -2, uint 1, int 14 }, { int, int, uint, int } { int 47, int -1, uint 1, int 11 }, { int, int, uint, int } { int 47, int -2, uint 1, int 11 }, { int, int, uint, int } { int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 0, int -1 }, { int, int, uint, int } { int 51,! int -1, uint 1, int 10 }, { int, int, uint, int } { int 51, int -2, u int 1, int 10 }, { int, int, uint, int } { int 52, int -1, uint 0, int -1 }, { int, int, uint, int } { int 53, int -1, uint 1, int 14 }, { int, int, uint, int } { int 54, int -1, uint 0, int -1 }, { int, int, uint, int } { int 55, int -1, uint 1, int 0 }, { int, int, uint, int } { int 56, int -1, uint 0, int -1 }, { int, int, uint, int } { int 57, int -1, uint 0, int -1 }, { int, int, uint, int } { int 58, int -1, uint 1, int 9 }, { int, int, uint, int } { int 59, int -1, uint 0, int -1 }, { int, int, uint, int } { int 60, int -1, uint 0, int -1 }, { int, int, uint, int } { int 61, int -1, uint 0, int -1 }, { int, int, uint, int } { int 62, int -1, uint 1, int 9 }, { int, int, uint, int } { int 62, int -2, uint 1, int 9 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 0, int -1 }, { int, int, uint, int } { int 65, int -1, uint 1, int 9 }, { int, int, uint, int } { int 66, int -1, uint 0, int -1 }, { int, int, uint,! int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 1, int 14 }, { int, int, uint, int } { int 70, int -1, uint 0, int -1 }, { int, int, uint, int } { int 71, int -1, uint 1, int 9 }, { int, int, uint, int } { int 72, int -1, uint 0, int -1 }, { int, int, uint, int } { int 73, int -1, uint 1, int 10 }, { int, int, uint, int } { int 74, int -1, uint 1, int 11 }, { int, int, uint, int } { int 75, int -1, uint 1, int 14 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 1, int 1 }, { int, int, uint, int } { int 77, int -2, uint 1, int 1 }, { int, int, uint, int } { int 78, int -1, uint 0, int -1 }, { int, int, uint, int } { int 79, int -1, uint 1, int 0 }, { int, int, uint, int } { int 80, int -1, uint 1, int 0 }, { int, int, uint, int } { int 81, int -1, uint 0, int -1 }, { int, int, uint, int } { int 82, int -1, uint 1, ! int 8 }, { int, int, uint, int } { int 82, int -2, uint 1, int 8 }, { int, int, uint, int } { int 83, int -1, uint 1, int 13 }, { int, int, uint, int } { int 83, int -2, uint 1, int 13 }, { int, int, uint, int } { int 84, int -1, uint 1, int 9 }, { int, int, uint, int } { int 84, int -2, uint 1, int 9 }, { int, int, uint, int } { int 85, int -1, uint 1, int 10 }, { int, int, uint, int } { int 85, int -2, uint 1, int 10 }, { int, int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uint, int } { int 87, int -1, uint 0, int -1 }, { int, int, uint, int } { int 88, int -1, uint 0, int -1 }, { int, int, uint, int } { int 89, int -1, uint 0, int -1 }, { int, int, uint, int } { int 90, int -1, uint 0, int -1 }, { int, int, uint, int } { int 91, int -1, uint 0, int -1 }, { int, int, uint, int } { int 92, int -1, uint 0, int -1 }, { int, int, uint, int } { int 93, int -1, uint 0, int -1 }, { int, int, uint, int } { int 94, int -1, uint 0, int -1 } ] } ; <{ uint, [116 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [1 x { uint, [0 x { int, int, uint, int }] }*] } { uint 1, [1 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [116 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [1 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [21 x sbyte*] } { uint 21, [21 x sbyte*] [ sbyte* cast ([8193 x sbyte]* %flags.0__ to sbyte*), sbyte* cast ([11 x sbyte]* %.str_1 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [116 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [21 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + declare int %printf(sbyte*, ...) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + %copyConst = cast int 170000 to int ; [#uses=1] + br bool %tmp.1, label %cond_true, label %loopentry.0 + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=2] + %dec1 = add int %tmp.3, -1 ; [#uses=1] + %tmp.92 = seteq int %tmp.3, 0 ; [#uses=1] + br bool %tmp.92, label %loopexit.0, label %no_exit.1 + + loopentry.0.loopexit.loopexit: ; preds = %loopexit.3 + %indvar.le = cast ulong %indvar27 to int ; [#uses=2] + %count.1.1.le = add int %indvar.le, %count.1 ; [#uses=2] + %inc.1 = add int %count.1.1.le, 1 ; [#uses=1] + br label %loopentry.0 + + loopentry.0.loopexit: ; preds = %loopentry.2 + br label %loopentry.0 + + loopentry.0: ; preds = %__main.entry, %loopentry.0.loopexit.loopexit, %loopentry.0.loopexit + %indvar.1 = phi int [ 0, %__main.entry ], [ %indvar.le, %loopentry.0.loopexit.loopexit ], [ %indvar.4, %loopentry.0.loopexit ] ; [#uses=1] + %count.1.1.1 = phi int [ 0, %__main.entry ], [ %count.1.1.le, %loopentry.0.loopexit.loopexit ], [ %count.1.1.4, %loopentry.0.loopexit ] ; [#uses=1] + %NUM.0 = phi int [ %copyConst, %__main.entry ], [ %dec.0.ph.ph, %loopentry.0.loopexit.loopexit ], [ %dec.0.ph.ph, %loopentry.0.loopexit ] ; [#uses=2] + %count.2 = phi int [ 0, %__main.entry ], [ %inc.1, %loopentry.0.loopexit.loopexit ], [ %count.1, %loopentry.0.loopexit ] ; [#uses=1] + %dec = add int %NUM.0, -1 ; [#uses=1] + %tmp.9 = seteq int %NUM.0, 0 ; [#uses=1] + br bool %tmp.9, label %loopexit.0, label %newCommon + + no_exit.1: ; preds = %cond_true, %backEdgeInst5 + %dec.0.ph.ph = phi int [ %dec1, %cond_true ], [ %phi, %backEdgeInst5 ] ; [#uses=3] + %count.1.1.2 = phi int [ 0, %cond_true ], [ %phi1, %backEdgeInst5 ] ; [#uses=2] + %indvar.2 = phi int [ 0, %cond_true ], [ %phi2, %backEdgeInst5 ] ; [#uses=2] + %indvar = phi ulong [ 0, %cond_true ], [ %phi, %backEdgeInst5 ] ; [#uses=3] + %tmp. = add ulong %indvar, 2 ; [#uses=1] + %v9 = cast ulong %tmp. to long ; [#uses=1] + "addrOfGlobal:flags.0__" = getelementptr [8193 x sbyte]* %flags.0__, long 0 ; <[8193 x sbyte]*> [#uses=3] + %tmp.15 = getelementptr [8193 x sbyte]* "addrOfGlobal:flags.0__", long 0, long %v9 ; [#uses=1] + %copyConst = cast sbyte 1 to sbyte ; [#uses=1] + store sbyte %copyConst, sbyte* %tmp.15 + %indvar.next = add ulong %indvar, 1 ; [#uses=1] + %copyConst = cast ulong 8190 to ulong ; [#uses=1] + %exitcond = seteq ulong %indvar, %copyConst ; [#uses=1] + br bool %exitcond, label %loopentry.2.preheader, label %newCommon + + loopentry.2.preheader: ; preds = %no_exit.1 + %copyConst = cast long 8193 to long ; [#uses=4] + br label %loopentry.2 + + loopentry.2: ; preds = %loopentry.2.preheader, %backEdgeInst + %indvar.4 = phi int [ %indvar, %backEdgeInst ], [ %indvar.2, %loopentry.2.preheader ] ; [#uses=1] + %count.1.1.4 = phi int [ %count.1.1, %backEdgeInst ], [ %count.1.1.2, %loopentry.2.preheader ] ; [#uses=1] + %i.0 = phi long [ %inc.2, %backEdgeInst ], [ 2, %loopentry.2.preheader ] ; [#uses=2] + %count.1 = phi int [ %count.1.1, %backEdgeInst ], [ 0, %loopentry.2.preheader ] ; [#uses=3] + %tmp.18 = setlt long %i.0, %copyConst ; [#uses=1] + br bool %tmp.18, label %no_exit.2.preheader, label %loopentry.0.loopexit + + no_exit.2.preheader: ; preds = %loopentry.2 + br label %no_exit.2 + + no_exit.2: ; preds = %no_exit.2.preheader, %backEdgeInst3 + %indvar27 = phi ulong [ %indvar.next28, %backEdgeInst3 ], [ 0, %no_exit.2.preheader ] ; [#uses=4] + %indvar27 = cast ulong %indvar27 to long ; [#uses=1] + %i.0.1 = add long %indvar27, %i.0 ; [#uses=5] + %tmp.21 = getelementptr [8193 x sbyte]* "addrOfGlobal:flags.0__", long 0, long %i.0.1 ; [#uses=1] + %tmp.22 = load sbyte* %tmp.21 ; [#uses=1] + %tmp.23 = seteq sbyte %tmp.22, 0 ; [#uses=1] + br bool %tmp.23, label %endif, label %then + + then: ; preds = %no_exit.2 + %tmp.27 = shl long %i.0.1, ubyte 1 ; [#uses=2] + %tmp.2912 = setlt long %tmp.27, %copyConst ; [#uses=1] + br bool %tmp.2912, label %no_exit.3.preheader, label %loopexit.3 + + no_exit.3.preheader: ; preds = %then + br label %no_exit.3 + + no_exit.3: ; preds = %no_exit.3.preheader, %backEdgeInst4 + %k.0.5 = phi long [ %tmp.35, %backEdgeInst4 ], [ %tmp.27, %no_exit.3.preheader ] ; [#uses=2] + %tmp.32 = getelementptr [8193 x sbyte]* "addrOfGlobal:flags.0__", long 0, long %k.0.5 ; [#uses=1] + store sbyte 0, sbyte* %tmp.32 + %tmp.35 = add long %k.0.5, %i.0.1 ; [#uses=2] + %tmp.29 = setlt long %tmp.35, %copyConst ; [#uses=1] + br bool %tmp.29, label %backEdgeInst4, label %loopexit.3.loopexit + + loopexit.3.loopexit: ; preds = %no_exit.3 + br label %loopexit.3 + + loopexit.3: ; preds = %then, %loopexit.3.loopexit + %inc.213 = add long %i.0.1, 1 ; [#uses=1] + %tmp.1823 = setlt long %inc.213, %copyConst ; [#uses=1] + %indvar.next28 = add ulong %indvar27, 1 ; [#uses=1] + br bool %tmp.1823, label %backEdgeInst3, label %loopentry.0.loopexit.loopexit + + endif: ; preds = %no_exit.2 + %indvar = cast ulong %indvar27 to int ; [#uses=2] + %count.1.1 = add int %indvar, %count.1 ; [#uses=2] + %inc.2 = add long %i.0.1, 1 ; [#uses=1] + br label %backEdgeInst + + loopexit.0: ; preds = %cond_true, %loopentry.0 + %count.2.1 = phi int [ %count.2, %loopentry.0 ], [ 0, %cond_true ] ; [#uses=1] + "addrOfGlobal:.str_1" = getelementptr [11 x sbyte]* %.str_1, long 0 ; <[11 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [11 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + %tmp.38 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_1", int %count.2.1 ) ; [#uses=0] + ret int 0 + + newCommon: ; preds = %loopentry.0, %no_exit.1 + %phi = phi int [ %dec.0.ph.ph, %no_exit.1 ], [ %dec, %loopentry.0 ] ; [#uses=1] + %phi1 = phi int [ %count.1.1.2, %no_exit.1 ], [ %count.1.1.1, %loopentry.0 ] ; [#uses=1] + %phi2 = phi int [ %indvar.2, %no_exit.1 ], [ %indvar.1, %loopentry.0 ] ; [#uses=1] + %phi = phi ulong [ %indvar.next, %no_exit.1 ], [ 0, %loopentry.0 ] ; [#uses=1] + br label %backEdgeInst5 + + backEdgeInst: ; preds = %endif + call void %llvm_first_trigger( ) + br label %loopentry.2 + + backEdgeInst3: ; preds = %loopexit.3 + call void %llvm_first_trigger( ) + br label %no_exit.2 + + backEdgeInst4: ; preds = %no_exit.3 + call void %llvm_first_trigger( ) + br label %no_exit.3 + + backEdgeInst5: ; preds = %newCommon + call void %llvm_first_trigger( ) + br label %no_exit.1 + } + + declare int %atoi(sbyte*) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) Index: reopt/test/TTFTestCases/sieve.main.trace16.txt diff -c /dev/null reopt/test/TTFTestCases/sieve.main.trace16.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/sieve.main.trace16.txt Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,2 ---- + main + 7 19 23 Index: reopt/test/TTFTestCases/sieve.main.trace17.txt diff -c /dev/null reopt/test/TTFTestCases/sieve.main.trace17.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/sieve.main.trace17.txt Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,2 ---- + main + 14 22 Index: reopt/test/TTFTestCases/strcat.ll diff -c /dev/null reopt/test/TTFTestCases/strcat.ll:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/strcat.ll Wed Sep 8 16:34:24 2004 *************** *** 0 **** --- 1,297 ---- + target endian = big + target pointersize = 64 + %llvm.sjljeh.jmpbufty = type { %llvm.sjljeh.jmpbufty*, [200 x sbyte*] } + %struct..TorRec = type { int, void ()* } + %struct.TorRec = type { int, void ()* } + %.str_1 = internal constant [14 x sbyte] c"calloc strbuf\00" ; <[14 x sbyte]*> [#uses=2] + %.str_2 = internal constant [15 x sbyte] c"realloc strbuf\00" ; <[15 x sbyte]*> [#uses=2] + %.str_3 = internal constant [7 x sbyte] c"hello\0A\00" ; <[7 x sbyte]*> [#uses=2] + %.str_4 = internal constant [4 x sbyte] c"%d\0A\00" ; <[4 x sbyte]*> [#uses=2] + %Initialized.0__ = internal global bool false ; [#uses=2] + %llvm.sjljeh.jblist = linkonce global %llvm.sjljeh.jmpbufty* null ; <%llvm.sjljeh.jmpbufty**> [#uses=0] + %llvmFunctionTable = constant { void (sbyte*)*, int (int, sbyte**)* } { void (sbyte*)* %strcat, int (int, sbyte**)* %main } ; <{ void (sbyte*)*, int (int, sbyte**)* }*> [#uses=0] + %llvmSimpleFunction = constant [2 x sbyte] zeroinitializer ; <[2 x sbyte]*> [#uses=0] + %llvmFunctionCount = constant int 2 ; [#uses=0] + %strcat.regAllocState = internal constant { uint, [41 x { int, int, uint, int }] } { uint 41, [41 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 0, int -1 }, { int, int, uint, int } { int 2, int -1, uint 0, int -1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 0 }, { int, int, uint, int } { int 4, int -2, uint 1, int 0 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 1, int 7 }, { int, int, uint, int } { int 7, int -1, uint 1, int 0 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 1, int 0 }, { int, int, uint, int } { int 10, int -1, uint 0, int -1 }, { int, int, uint, int } { int 11, int -1, uint 0, int -1 }, { int, int, uint, int } { int 12, int ! -1, uint 0, int -1 }, { int, int, uint, int } { int 13, int -1, uint 1, int 7 }, { int, int, uint, int } { int 13, int -2, uint 1, int 7 }, { int, int, uint, int } { int 14, int -1, uint 0, int -1 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 8 }, { int, int, uint, int } { int 17, int -1, uint 0, int -1 }, { int, int, uint, int } { int 18, int -1, uint 0, int -1 }, { int, int, uint, int } { int 19, int -1, uint 1, int 7 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 1, int 9 }, { int, int, uint, int } { int 21, int -2, uint 1, int 9 }, { int, int, uint, int } { int 22, int -1, uint 1, int 0 }, { int, int, uint, int } { int 23, int -1, uint 0, int -1 }, { int, int, uint, int } { int 24, int -1, uint 0, int -1 }, { int, int, uint, int } { int 25, int -1, uint 1, int 9 }, { int, int, uint, int } { int 26, int -1, uint 0, int -1 }, { int, int, ui! nt, int } { int 27, int -1, uint 0, int -1 }, { int, int, uint, int } { int 28, int -1, uint 1, int 1 }, { int, int, uint, int } { int 29, int -1, uint 0, int -1 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 0, int -1 }, { int, int, uint, int } { int 32, int -1, uint 0, int -1 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 0, int -1 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 } ] } ; <{ uint, [41 x { int, int, uint, int }] }*> [#uses=2] + %main.regAllocState = internal constant { uint, [150 x { int, int, uint, int }] } { uint 150, [150 x { int, int, uint, int }] [ { int, int, uint, int } { int -1, int 0, uint 1, int 15 }, { int, int, uint, int } { int -1, int 1, uint 1, int 16 }, { int, int, uint, int } { int 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 1, int -1, uint 1, int 3 }, { int, int, uint, int } { int 2, int -1, uint 1, int 1 }, { int, int, uint, int } { int 3, int -1, uint 0, int -1 }, { int, int, uint, int } { int 4, int -1, uint 1, int 2 }, { int, int, uint, int } { int 5, int -1, uint 0, int -1 }, { int, int, uint, int } { int 6, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7, int -1, uint 0, int -1 }, { int, int, uint, int } { int 8, int -1, uint 0, int -1 }, { int, int, uint, int } { int 9, int -1, uint 0, int -1 }, { int, int, uint, int } { int 10, int -1, uint 1, int 0 }, { int, int, uint, int } { int 11, int -1, uint 1, int 8 }, { int, int, uint, int } { int 12, int! -1, uint 1, int 0 }, { int, int, uint, int } { int 13, int -1, uint 1, int 0 }, { int, int, uint, int } { int 14, int -1, uint 1, int 0 }, { int, int, uint, int } { int 15, int -1, uint 0, int -1 }, { int, int, uint, int } { int 16, int -1, uint 1, int 7 }, { int, int, uint, int } { int 17, int -1, uint 1, int 0 }, { int, int, uint, int } { int 18, int -1, uint 1, int 7 }, { int, int, uint, int } { int 19, int -1, uint 1, int 0 }, { int, int, uint, int } { int 20, int -1, uint 0, int -1 }, { int, int, uint, int } { int 21, int -1, uint 0, int -1 }, { int, int, uint, int } { int 22, int -1, uint 1, int 0 }, { int, int, uint, int } { int 23, int -1, uint 1, int 0 }, { int, int, uint, int } { int 24, int -1, uint 1, int 0 }, { int, int, uint, int } { int 25, int -1, uint 0, int -1 }, { int, int, uint, int } { int 26, int -1, uint 1, int 7 }, { int, int, uint, int } { int 27, int -1, uint 1, int 0 }, { int, int, uint, int } { int 28, int -1, uint 1, int 7 }, { int, int, uint, ! int } { int 29, int -1, uint 1, int 0 }, { int, int, uint, int } { int 30, int -1, uint 0, int -1 }, { int, int, uint, int } { int 31, int -1, uint 1, int 8 }, { int, int, uint, int } { int 32, int -1, uint 0, int -1 }, { int, int, uint, int } { int 33, int -1, uint 0, int -1 }, { int, int, uint, int } { int 34, int -1, uint 1, int 0 }, { int, int, uint, int } { int 35, int -1, uint 0, int -1 }, { int, int, uint, int } { int 36, int -1, uint 0, int -1 }, { int, int, uint, int } { int 37, int -1, uint 0, int -1 }, { int, int, uint, int } { int 38, int -1, uint 1, int 7 }, { int, int, uint, int } { int 38, int -2, uint 1, int 8 }, { int, int, uint, int } { int 39, int -1, uint 1, int 2 }, { int, int, uint, int } { int 39, int -2, uint 1, int 2 }, { int, int, uint, int } { int 40, int -1, uint 1, int 1 }, { int, int, uint, int } { int 40, int -2, uint 1, int 1 }, { int, int, uint, int } { int 41, int -1, uint 1, int 8 }, { int, int, uint, int } { int 42, int -1, uint 0, int -1 }, { int, int, uint, int } { int 43, int -1, uint 1, int 2 }, { int, i! nt, uint, int } { int 43, int -2, uint 1, int 2 }, { int, int, uint, int } { int 44, int -1, uint 1, int 9 }, { int, int, uint, int } { int 44, int -2, uint 1, int 9 }, { int, int, uint, int } { int 45, int -1, uint 1, int 13 }, { int, int, uint, int } { int 45, int -2, uint 1, int 11 }, { int, int, uint, int } { int 46, int -1, uint 1, int 1 }, { int, int, uint, int } { int 46, int -2, uint 1, int 1 }, { int, int, uint, int } { int 47, int -1, uint 0, int -1 }, { int, int, uint, int } { int 48, int -1, uint 0, int -1 }, { int, int, uint, int } { int 49, int -1, uint 0, int -1 }, { int, int, uint, int } { int 50, int -1, uint 1, int 12 }, { int, int, uint, int } { int 50, int -2, uint 1, int 11 }, { int, int, uint, int } { int 51, int -1, uint 1, int 14 }, { int, int, uint, int } { int 51, int -2, uint 1, int 2 }, { int, int, uint, int } { int 52, int -1, uint 1, int 9 }, { int, int, uint, int } { int 52, int -2, uint 1, int 9 }, { int, int, uint, int } { int 53, int -1, ui! nt 1, int 10 }, { int, int, uint, int } { int 53, int -2, uint 1, int 1 }, { int, int, uint, int } { int 54, int -1, uint 1, int 0 }, { int, int, uint, int } { int 55, int -1, uint 1, int 11 }, { int, int, uint, int } { int 56, int -1, uint 1, int 1 }, { int, int, uint, int } { int 57, int -1, uint 1, int 1 }, { int, int, uint, int } { int 58, int -1, uint 0, int -1 }, { int, int, uint, int } { int 59, int -1, uint 0, int -1 }, { int, int, uint, int } { int 60, int -1, uint 1, int 0 }, { int, int, uint, int } { int 61, int -1, uint 1, int 1 }, { int, int, uint, int } { int 62, int -1, uint 0, int -1 }, { int, int, uint, int } { int 63, int -1, uint 0, int -1 }, { int, int, uint, int } { int 64, int -1, uint 1, int 9 }, { int, int, uint, int } { int 65, int -1, uint 1, int 1 }, { int, int, uint, int } { int 66, int -1, uint 1, int 14 }, { int, int, uint, int } { int 67, int -1, uint 0, int -1 }, { int, int, uint, int } { int 68, int -1, uint 0, int -1 }, { int, int, uint, int } { int 69, int -1, uint 0, int -1 }, { int, int, uint, int } { int 7! 0, int -1, uint 1, int 0 }, { int, int, uint, int } { int 71, int -1, uint 0, int -1 }, { int, int, uint, int } { int 72, int -1, uint 0, int -1 }, { int, int, uint, int } { int 73, int -1, uint 0, int -1 }, { int, int, uint, int } { int 74, int -1, uint 1, int 0 }, { int, int, uint, int } { int 75, int -1, uint 0, int -1 }, { int, int, uint, int } { int 76, int -1, uint 0, int -1 }, { int, int, uint, int } { int 77, int -1, uint 0, int -1 }, { int, int, uint, int } { int 78, int -1, uint 1, int 0 }, { int, int, uint, int } { int 78, int -2, uint 1, int 0 }, { int, int, uint, int } { int 79, int -1, uint 0, int -1 }, { int, int, uint, int } { int 80, int -1, uint 1, int 10 }, { int, int, uint, int } { int 81, int -1, uint 1, int 0 }, { int, int, uint, int } { int 82, int -1, uint 0, int -1 }, { int, int, uint, int } { int 83, int -1, uint 1, int 0 }, { int, int, uint, int } { int 84, int -1, uint 0, int -1 }, { int, int, uint, int } { int 85, int -1, uint 0, int -1 }, { int! , int, uint, int } { int 86, int -1, uint 0, int -1 }, { int, int, uin t, int } { int 87, int -1, uint 1, int 10 }, { int, int, uint, int } { int 87, int -2, uint 1, int 10 }, { int, int, uint, int } { int 88, int -1, uint 0, int -1 }, { int, int, uint, int } { int 89, int -1, uint 1, int 0 }, { int, int, uint, int } { int 90, int -1, uint 0, int -1 }, { int, int, uint, int } { int 91, int -1, uint 1, int 10 }, { int, int, uint, int } { int 92, int -1, uint 0, int -1 }, { int, int, uint, int } { int 93, int -1, uint 1, int 10 }, { int, int, uint, int } { int 94, int -1, uint 1, int 0 }, { int, int, uint, int } { int 95, int -1, uint 0, int -1 }, { int, int, uint, int } { int 96, int -1, uint 1, int 11 }, { int, int, uint, int } { int 97, int -1, uint 0, int -1 }, { int, int, uint, int } { int 98, int -1, uint 0, int -1 }, { int, int, uint, int } { int 99, int -1, uint 1, int 10 }, { int, int, uint, int } { int 100, int -1, uint 1, int 11 }, { int, int, uint, int } { int 101, int -1, uint 0, int -1 }, { int, int, uint, int } { int 102, int -1, u! int 0, int -1 }, { int, int, uint, int } { int 103, int -1, uint 1, int 7 }, { int, int, uint, int } { int 103, int -2, uint 1, int 14 }, { int, int, uint, int } { int 104, int -1, uint 1, int 0 }, { int, int, uint, int } { int 105, int -1, uint 0, int -1 }, { int, int, uint, int } { int 106, int -1, uint 0, int -1 }, { int, int, uint, int } { int 107, int -1, uint 0, int -1 }, { int, int, uint, int } { int 108, int -1, uint 1, int 0 }, { int, int, uint, int } { int 108, int -2, uint 1, int 0 }, { int, int, uint, int } { int 109, int -1, uint 0, int -1 }, { int, int, uint, int } { int 110, int -1, uint 1, int 1 }, { int, int, uint, int } { int 111, int -1, uint 1, int 0 }, { int, int, uint, int } { int 112, int -1, uint 0, int -1 }, { int, int, uint, int } { int 113, int -1, uint 1, int 0 }, { int, int, uint, int } { int 114, int -1, uint 0, int -1 }, { int, int, uint, int } { int 115, int -1, uint 0, int -1 }, { int, int, uint, int } { int 116, int -1, uint 0, int -1 }, { ! int, int, uint, int } { int 117, int -1, uint 1, int 1 }, { int, int, uint, int } { int 117, int -2, uint 1, int 1 }, { int, int, uint, int } { int 118, int -1, uint 1, int 1 }, { int, int, uint, int } { int 119, int -1, uint 0, int -1 }, { int, int, uint, int } { int 120, int -1, uint 1, int 0 }, { int, int, uint, int } { int 121, int -1, uint 1, int 0 }, { int, int, uint, int } { int 122, int -1, uint 0, int -1 }, { int, int, uint, int } { int 123, int -1, uint 0, int -1 }, { int, int, uint, int } { int 124, int -1, uint 0, int -1 }, { int, int, uint, int } { int 125, int -1, uint 0, int -1 }, { int, int, uint, int } { int 126, int -1, uint 0, int -1 }, { int, int, uint, int } { int 127, int -1, uint 0, int -1 }, { int, int, uint, int } { int 128, int -1, uint 0, int -1 }, { int, int, uint, int } { int 129, int -1, uint 0, int -1 }, { int, int, uint, int } { int 130, int -1, uint 0, int -1 }, { int, int, uint, int } { int 131, int -1, uint 0, int -1 } ] } ; <{ uint, [150 x { int, int, uint, int }] }*> [#uses=2] + %_llvm_regAllocState = constant { uint, [2 x { uint, [0 x { int, int, uint, int }] }*] } { uint 2, [2 x { uint, [0 x { int, int, uint, int }] }*] [ { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [41 x { int, int, uint, int }] }* %strcat.regAllocState to { uint, [0 x { int, int, uint, int }] }*), { uint, [0 x { int, int, uint, int }] }* cast ({ uint, [150 x { int, int, uint, int }] }* %main.regAllocState to { uint, [0 x { int, int, uint, int }] }*) ] } ; <{ uint, [2 x { uint, [0 x { int, int, uint, int }] }*] }*> [#uses=0] + %_llvm_internalGlobals = constant { uint, [30 x sbyte*] } { uint 30, [30 x sbyte*] [ sbyte* cast ([14 x sbyte]* %.str_1 to sbyte*), sbyte* cast ([15 x sbyte]* %.str_2 to sbyte*), sbyte* cast ([7 x sbyte]* %.str_3 to sbyte*), sbyte* cast ([4 x sbyte]* %.str_4 to sbyte*), sbyte* cast (bool* %Initialized.0__ to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* cast ({ uint, [41 x { int, int, uint, int }] }* %strcat.regAllocState to sbyte*), sbyte* cast ({ uint, [150 x { int, int, uint, int }] }* %main.regAllocState to sbyte*), sbyte* null, sbyte* null, sbyte* cast (void (sbyte*)* %strcat to sbyte*), sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null, sbyte* null ] } ; <{ uint, [30 x sbyte*] }*> [#uses=0] + + implementation ; Functions: + + internal void %strcat(sbyte* %s1) { + entry: + %tmp.1.i7 = load sbyte* %s1 ; [#uses=1] + %tmp.2.i8 = seteq sbyte %tmp.1.i7, 0 ; [#uses=1] + br bool %tmp.2.i8, label %loopexit.i, label %no_exit.i.preheader + + no_exit.i.preheader: ; preds = %entry + br label %no_exit.i + + no_exit.i: ; preds = %no_exit.i.preheader, %backEdgeInst + %Count.0.i.0 = phi ulong [ %inc.0.i, %backEdgeInst ], [ 0, %no_exit.i.preheader ] ; [#uses=2] + %Str_addr.0.i.0.rec = cast ulong %Count.0.i.0 to long ; [#uses=1] + %inc.0.i = add ulong %Count.0.i.0, 1 ; [#uses=2] + %inc.1.i.rec = add long %Str_addr.0.i.0.rec, 1 ; [#uses=1] + %inc.1.i = getelementptr sbyte* %s1, long %inc.1.i.rec ; [#uses=1] + %tmp.1.i = load sbyte* %inc.1.i ; [#uses=1] + %tmp.2.i = seteq sbyte %tmp.1.i, 0 ; [#uses=1] + br bool %tmp.2.i, label %loopexit.i.loopexit, label %backEdgeInst + + loopexit.i.loopexit: ; preds = %no_exit.i + br label %loopexit.i + + loopexit.i: ; preds = %entry, %loopexit.i.loopexit + %Count.0.i.1 = phi ulong [ 0, %entry ], [ %inc.0.i, %loopexit.i.loopexit ] ; [#uses=2] + %v9 = cast ulong %Count.0.i.1 to long ; [#uses=1] + %tmp.5 = getelementptr sbyte* %s1, long %v9 ; [#uses=1] + %tmp.5.sum = add ulong %Count.0.i.1, 1 ; [#uses=1] + %copyConst = cast sbyte 104 to sbyte ; [#uses=1] + store sbyte %copyConst, sbyte* %tmp.5 + "addrOfGlobal:.str_3" = getelementptr [7 x sbyte]* %.str_3, long 0 ; <[7 x sbyte]*> [#uses=1] + br label %loopentry.i1 + + loopentry.i1: ; preds = %loopexit.i, %backEdgeInst1 + %indvar = phi ulong [ %inc.1.i210.sum, %backEdgeInst1 ], [ 0, %loopexit.i ] ; [#uses=2] + %inc.0.i9.sum = add ulong %indvar, %tmp.5.sum ; [#uses=1] + %v91 = cast ulong %inc.0.i9.sum to long ; [#uses=1] + %s1_addr.0.i = getelementptr sbyte* %s1, long %v91 ; [#uses=1] + %inc.1.i210.sum = add ulong %indvar, 1 ; [#uses=2] + %v92 = cast ulong %inc.1.i210.sum to long ; [#uses=1] + %s2_addr.0.i = getelementptr [7 x sbyte]* "addrOfGlobal:.str_3", long 0, long %v92 ; [#uses=1] + %tmp.3.i = load sbyte* %s2_addr.0.i ; [#uses=2] + store sbyte %tmp.3.i, sbyte* %s1_addr.0.i + %tmp.4.i = seteq sbyte %tmp.3.i, 0 ; [#uses=1] + br bool %tmp.4.i, label %loopexit.i3, label %backEdgeInst1 + + loopexit.i3: ; preds = %loopentry.i1 + ret void + + backEdgeInst: ; preds = %no_exit.i + call void %llvm_first_trigger( ) + br label %no_exit.i + + backEdgeInst1: ; preds = %loopentry.i1 + call void %llvm_first_trigger( ) + br label %loopentry.i1 + } + + declare int %printf(sbyte*, ...) + + declare void %exit(int) + + int %main(int %argc, sbyte** %argv) { + entry: + %newargc = call int %reoptimizerInitialize( int %argc, sbyte** %argv, uint* null, uint 0 ) ; [#uses=1] + "addrOfGlobal:Initialized.0__" = getelementptr bool* %Initialized.0__, long 0 ; [#uses=2] + %tmp.1.i = load bool* "addrOfGlobal:Initialized.0__" ; [#uses=1] + br bool %tmp.1.i, label %__main.entry, label %endif.0.i + + endif.0.i: ; preds = %entry + %copyConst = cast bool true to bool ; [#uses=1] + store bool %copyConst, bool* "addrOfGlobal:Initialized.0__" + br label %__main.entry + + __main.entry: ; preds = %entry, %endif.0.i + %tmp.1 = seteq int %newargc, 2 ; [#uses=1] + br bool %tmp.1, label %cond_true, label %cond_continue + + cond_true: ; preds = %__main.entry + %tmp.5 = getelementptr sbyte** %argv, long 1 ; [#uses=1] + %tmp.6 = load sbyte** %tmp.5 ; [#uses=1] + %tmp.3 = call int %atoi( sbyte* %tmp.6 ) ; [#uses=1] + "constantGEP:" = getelementptr [32 x sbyte]* null, uint 1 ; <[32 x sbyte]*> [#uses=1] + %constantCast = cast [32 x sbyte]* "constantGEP:" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast ) ; :0 [#uses=1] + cast sbyte* %0 to [32 x sbyte]* ; <[32 x sbyte]*>:0 [#uses=1] + %v9 = cast int 0 to long ; [#uses=2] + %ptr1 = getelementptr [32 x sbyte]* %0, long %v9 ; <[32 x sbyte]*> [#uses=1] + %tmp.0.i.sub3 = getelementptr [32 x sbyte]* %ptr1, long 0, long %v9 ; [#uses=4] + call sbyte* %memset( sbyte* %tmp.0.i.sub3, ubyte 0, ulong 32 ) ; :1 [#uses=0] + %tmp.132 = seteq sbyte* %tmp.0.i.sub3, null ; [#uses=1] + br bool %tmp.132, label %then.0, label %loopentry.preheader + + cond_continue: ; preds = %__main.entry + "constantGEP:4" = getelementptr [32 x sbyte]* null, uint 1 ; <[32 x sbyte]*> [#uses=1] + %constantCast5 = cast [32 x sbyte]* "constantGEP:4" to uint ; [#uses=1] + call sbyte* %malloc( uint %constantCast5 ) ; :2 [#uses=1] + cast sbyte* %2 to [32 x sbyte]* ; <[32 x sbyte]*>:1 [#uses=1] + %v96 = cast int 0 to long ; [#uses=2] + %ptr18 = getelementptr [32 x sbyte]* %1, long %v96 ; <[32 x sbyte]*> [#uses=1] + %tmp.0.i4.sub9 = getelementptr [32 x sbyte]* %ptr18, long 0, long %v96 ; [#uses=4] + call sbyte* %memset( sbyte* %tmp.0.i4.sub9, ubyte 0, ulong 32 ) ; :3 [#uses=0] + %tmp.13 = seteq sbyte* %tmp.0.i4.sub9, null ; [#uses=1] + %copyConst = cast int 10000000 to int ; [#uses=1] + br bool %tmp.13, label %then.0, label %loopentry.preheader + + then.0: ; preds = %cond_true, %cond_continue + "addrOfGlobal:.str_1" = getelementptr [14 x sbyte]* %.str_1, long 0 ; <[14 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_1" = getelementptr [14 x sbyte]* "addrOfGlobal:.str_1", long 0, long 0 ; [#uses=1] + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_1" ) + call void %exit( int 1 ) + ret int 0 + + loopentry.preheader: ; preds = %cond_true, %cond_continue + %mem_tmp.0.1.ph.ph.ph = phi int [ %tmp.3, %cond_true ], [ %copyConst, %cond_continue ] ; [#uses=2] + %strbuf.1.ph = phi sbyte* [ %tmp.0.i.sub3, %cond_true ], [ %tmp.0.i4.sub9, %cond_continue ] ; [#uses=1] + %strend.0.ph = phi sbyte* [ %tmp.0.i.sub3, %cond_true ], [ %tmp.0.i4.sub9, %cond_continue ] ; [#uses=1] + %v913 = cast int 6 to long ; [#uses=1] + br label %loopentry + + loopentry: ; preds = %loopentry.preheader, %backEdgeInst + %strbuf.1 = phi sbyte* [ %strbuf.1.0, %backEdgeInst ], [ %strbuf.1.ph, %loopentry.preheader ] ; [#uses=2] + %buflen.1 = phi int [ %buflen.1.0, %backEdgeInst ], [ 32, %loopentry.preheader ] ; [#uses=1] + %i.0 = phi int [ %inc, %backEdgeInst ], [ 0, %loopentry.preheader ] ; [#uses=2] + %strend.0 = phi sbyte* [ %tmp.56, %backEdgeInst ], [ %strend.0.ph, %loopentry.preheader ] ; [#uses=1] + %tmp.18 = setlt int %i.0, %mem_tmp.0.1.ph.ph.ph ; [#uses=1] + br bool %tmp.18, label %no_exit.preheader, label %loopexit + + no_exit.preheader: ; preds = %loopentry + br label %no_exit + + no_exit: ; preds = %no_exit.preheader, %backEdgeInst1 + %indvar = phi uint [ %indvar.next, %backEdgeInst1 ], [ 0, %no_exit.preheader ] ; [#uses=2] + %strbuf.1.0 = phi sbyte* [ %tmp.36, %backEdgeInst1 ], [ %strbuf.1, %no_exit.preheader ] ; [#uses=3] + %buflen.1.0 = phi int [ %tmp.35, %backEdgeInst1 ], [ %buflen.1, %no_exit.preheader ] ; [#uses=3] + %strend.0.0 = phi sbyte* [ %tmp.564, %backEdgeInst1 ], [ %strend.0, %no_exit.preheader ] ; [#uses=3] + %indvar = cast uint %indvar to int ; [#uses=1] + %i.0.0 = add int %indvar, %i.0 ; [#uses=2] + %v910 = cast int %buflen.1.0 to long ; [#uses=1] + %tmp.24 = getelementptr sbyte* %strbuf.1.0, long %v910 ; [#uses=1] + %tmp.25 = cast sbyte* %tmp.24 to long ; [#uses=1] + %tmp.27 = cast sbyte* %strend.0.0 to long ; [#uses=1] + %tmp.27.neg = sub long 0, %tmp.27 ; [#uses=1] + %tmp.28 = add long %tmp.25, %tmp.27.neg ; [#uses=1] + %tmp.32 = setlt long %tmp.28, 7 ; [#uses=1] + br bool %tmp.32, label %then.1, label %endif.1 + + then.1: ; preds = %no_exit + %tmp.35 = shl int %buflen.1.0, ubyte 1 ; [#uses=2] + %tmp.39 = cast int %tmp.35 to ulong ; [#uses=1] + %tmp.36 = call sbyte* %realloc( sbyte* %strbuf.1.0, ulong %tmp.39 ) ; [#uses=7] + %tmp.41 = seteq sbyte* %tmp.36, null ; [#uses=1] + br bool %tmp.41, label %then.2, label %endif.2 + + then.2: ; preds = %then.1 + "addrOfGlobal:.str_2" = getelementptr [15 x sbyte]* %.str_2, long 0 ; <[15 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_2" = getelementptr [15 x sbyte]* "addrOfGlobal:.str_2", long 0, long 0 ; [#uses=1] + call void %perror( sbyte* "constantGEP:addrOfGlobal:.str_2" ) + call void %exit( int 1 ) + ret int 0 + + endif.2: ; preds = %then.1 + %tmp.14.i5 = load sbyte* %tmp.36 ; [#uses=1] + %tmp.25.i6 = seteq sbyte %tmp.14.i5, 0 ; [#uses=1] + br bool %tmp.25.i6, label %strlen.entry16, label %no_exit.i7.preheader + + no_exit.i7.preheader: ; preds = %endif.2 + br label %no_exit.i7 + + no_exit.i7: ; preds = %no_exit.i7.preheader, %backEdgeInst2 + %Count.0.0.i8 = phi ulong [ %inc.0.i10, %backEdgeInst2 ], [ 0, %no_exit.i7.preheader ] ; [#uses=2] + %Str_addr.0.0.rec.i9 = cast ulong %Count.0.0.i8 to long ; [#uses=1] + %inc.0.i10 = add ulong %Count.0.0.i8, 1 ; [#uses=2] + %inc.1.rec.i11 = add long %Str_addr.0.0.rec.i9, 1 ; [#uses=1] + %inc.1.i12 = getelementptr sbyte* %tmp.36, long %inc.1.rec.i11 ; [#uses=1] + %tmp.1.i13 = load sbyte* %inc.1.i12 ; [#uses=1] + %tmp.2.i14 = seteq sbyte %tmp.1.i13, 0 ; [#uses=1] + br bool %tmp.2.i14, label %strlen.entry16.loopexit, label %backEdgeInst2 + + strlen.entry16.loopexit: ; preds = %no_exit.i7 + br label %strlen.entry16 + + strlen.entry16: ; preds = %endif.2, %strlen.entry16.loopexit + %Count.0.1.i15 = phi ulong [ 0, %endif.2 ], [ %inc.0.i10, %strlen.entry16.loopexit ] ; [#uses=2] + %v911 = cast ulong %Count.0.1.i15 to long ; [#uses=1] + %tmp.48 = getelementptr sbyte* %tmp.36, long %v911 ; [#uses=1] + call void %strcat( sbyte* %tmp.48 ) + %tmp.48.sum = add ulong %Count.0.1.i15, 6 ; [#uses=1] + %v912 = cast ulong %tmp.48.sum to long ; [#uses=1] + %tmp.564 = getelementptr sbyte* %tmp.36, long %v912 ; [#uses=1] + %inc5 = add int %i.0.0, 1 ; [#uses=1] + %tmp.1818 = setlt int %inc5, %mem_tmp.0.1.ph.ph.ph ; [#uses=1] + %indvar.next = add uint %indvar, 1 ; [#uses=1] + br bool %tmp.1818, label %backEdgeInst1, label %loopexit.loopexit + + endif.1: ; preds = %no_exit + call void %strcat( sbyte* %strend.0.0 ) + %tmp.56 = getelementptr sbyte* %strend.0.0, long %v913 ; [#uses=1] + %inc = add int %i.0.0, 1 ; [#uses=1] + br label %backEdgeInst + + loopexit.loopexit: ; preds = %strlen.entry16 + br label %loopexit + + loopexit: ; preds = %loopentry, %loopexit.loopexit + %strbuf.1.1 = phi sbyte* [ %strbuf.1, %loopentry ], [ %tmp.36, %loopexit.loopexit ] ; [#uses=3] + %tmp.14.i = load sbyte* %strbuf.1.1 ; [#uses=1] + %tmp.25.i = seteq sbyte %tmp.14.i, 0 ; [#uses=1] + br bool %tmp.25.i, label %strlen.entry, label %no_exit.i1.preheader + + no_exit.i1.preheader: ; preds = %loopexit + br label %no_exit.i1 + + no_exit.i1: ; preds = %no_exit.i1.preheader, %backEdgeInst3 + %Count.0.0.i = phi ulong [ %inc.0.i, %backEdgeInst3 ], [ 0, %no_exit.i1.preheader ] ; [#uses=2] + %Str_addr.0.0.rec.i = cast ulong %Count.0.0.i to long ; [#uses=1] + %inc.0.i = add ulong %Count.0.0.i, 1 ; [#uses=2] + %inc.1.rec.i = add long %Str_addr.0.0.rec.i, 1 ; [#uses=1] + %inc.1.i = getelementptr sbyte* %strbuf.1.1, long %inc.1.rec.i ; [#uses=1] + %tmp.1.i = load sbyte* %inc.1.i ; [#uses=1] + %tmp.2.i = seteq sbyte %tmp.1.i, 0 ; [#uses=1] + br bool %tmp.2.i, label %strlen.entry.loopexit, label %backEdgeInst3 + + strlen.entry.loopexit: ; preds = %no_exit.i1 + br label %strlen.entry + + strlen.entry: ; preds = %loopexit, %strlen.entry.loopexit + %Count.0.1.i = phi ulong [ 0, %loopexit ], [ %inc.0.i, %strlen.entry.loopexit ] ; [#uses=1] + %tmp.62 = cast ulong %Count.0.1.i to int ; [#uses=1] + "addrOfGlobal:.str_4" = getelementptr [4 x sbyte]* %.str_4, long 0 ; <[4 x sbyte]*> [#uses=1] + "constantGEP:addrOfGlobal:.str_4" = getelementptr [4 x sbyte]* "addrOfGlobal:.str_4", long 0, long 0 ; [#uses=1] + %tmp.58 = call int (sbyte*, ...)* %printf( sbyte* "constantGEP:addrOfGlobal:.str_4", int %tmp.62 ) ; [#uses=0] + call void %free( sbyte* %strbuf.1.1 ) + ret int 0 + + backEdgeInst: ; preds = %endif.1 + call void %llvm_first_trigger( ) + br label %loopentry + + backEdgeInst1: ; preds = %strlen.entry16 + call void %llvm_first_trigger( ) + br label %no_exit + + backEdgeInst2: ; preds = %no_exit.i7 + call void %llvm_first_trigger( ) + br label %no_exit.i7 + + backEdgeInst3: ; preds = %no_exit.i1 + call void %llvm_first_trigger( ) + br label %no_exit.i1 + } + + declare int %atoi(sbyte*) + + declare void %perror(sbyte*) + + declare sbyte* %realloc(sbyte*, ulong) + + declare void %llvm.memset(sbyte*, ubyte, ulong, uint) + + declare int %llvm.setjmp([200 x sbyte*]*) + + declare void %llvm.longjmp([200 x sbyte*]*, int) + + declare void %abort() + + declare void %write(int, sbyte*, int) + + declare void %llvm_first_trigger() + + declare int %reoptimizerInitialize(int, sbyte**, uint*, uint) + + declare sbyte* %malloc(uint) + + declare void %free(sbyte*) + + declare sbyte* %memset(sbyte*, ubyte, ulong) Index: reopt/test/TTFTestCases/strcat.main.trace18.txt diff -c /dev/null reopt/test/TTFTestCases/strcat.main.trace18.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/strcat.main.trace18.txt Wed Sep 8 16:34:25 2004 *************** *** 0 **** --- 1,2 ---- + main + 14 26 Index: reopt/test/TTFTestCases/strcat.main.trace19.txt diff -c /dev/null reopt/test/TTFTestCases/strcat.main.trace19.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/strcat.main.trace19.txt Wed Sep 8 16:34:25 2004 *************** *** 0 **** --- 1,2 ---- + main + 7 8 9 17 24 Index: reopt/test/TTFTestCases/strcat.main.trace20.txt diff -c /dev/null reopt/test/TTFTestCases/strcat.main.trace20.txt:1.1 *** /dev/null Wed Sep 8 16:34:38 2004 --- reopt/test/TTFTestCases/strcat.main.trace20.txt Wed Sep 8 16:34:25 2004 *************** *** 0 **** --- 1,2 ---- + main + 21 27 Index: reopt/test/TTFTestCases/strcat.strcat.trace1.txt diff -c /dev/null reopt/test/TTFTestCases/strcat.strcat.trace1.txt:1.1 *** /dev/null Wed Sep 8 16:34:39 2004 --- reopt/test/TTFTestCases/strcat.strcat.trace1.txt Wed Sep 8 16:34:25 2004 *************** *** 0 **** --- 1,2 ---- + strcat + 5 8 From gaeke at cs.uiuc.edu Wed Sep 8 16:35:21 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 8 Sep 2004 16:35:21 -0500 (CDT) Subject: [llvm-commits] CVS: reopt/test/TTFTestHarness.pl Message-ID: <200409082135.QAA11871@seraph.cs.uiuc.edu> Changes in directory reopt/test: TTFTestHarness.pl updated: 1.3 -> 1.4 --- Log message: add brief usage note --- Diffs of the changes: (+6 -2) Index: reopt/test/TTFTestHarness.pl diff -u reopt/test/TTFTestHarness.pl:1.3 reopt/test/TTFTestHarness.pl:1.4 --- reopt/test/TTFTestHarness.pl:1.3 Mon Aug 16 14:24:17 2004 +++ reopt/test/TTFTestHarness.pl Wed Sep 8 16:35:11 2004 @@ -1,4 +1,7 @@ #!/usr/bin/perl +# To use this script, change to the TTFTestCases directory and run it: +# % perl ../TTFTestHarness.pl +# print "looking for ttftest\n"; if ( -x "../../tools/Debug/ttftest" ) { $TTFTEST = "../../tools/Debug/ttftest"; } @@ -76,8 +79,9 @@ } my @tests = @ARGV; if ($#tests == -1) { - #@tests = <*.ll>; - @tests = <*.bc>; + @lltests = <*.ll>; + @bctests = <*.bc>; + @tests = (@lltests, @bctests); } my ($ntests, $fail) = (0, 0); foreach my $test (@tests) { From lattner at cs.uiuc.edu Wed Sep 8 21:38:13 2004 From: lattner at cs.uiuc.edu (Chris Lattner) Date: Wed, 8 Sep 2004 21:38:13 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/DenseMap.h Message-ID: <200409090238.VAA12079@apoc.cs.uiuc.edu> Changes in directory llvm/include/llvm/ADT: DenseMap.h updated: 1.7 -> 1.8 --- Log message: Add missing #include --- Diffs of the changes: (+1 -0) Index: llvm/include/llvm/ADT/DenseMap.h diff -u llvm/include/llvm/ADT/DenseMap.h:1.7 llvm/include/llvm/ADT/DenseMap.h:1.8 --- llvm/include/llvm/ADT/DenseMap.h:1.7 Wed Sep 1 22:24:45 2004 +++ llvm/include/llvm/ADT/DenseMap.h Wed Sep 8 21:37:56 2004 @@ -22,6 +22,7 @@ #include #include +#include namespace llvm { From brukman at cs.uiuc.edu Thu Sep 9 11:18:51 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 9 Sep 2004 11:18:51 -0500 Subject: [llvm-commits] CVS: llvm/docs/index.html Message-ID: <200409091618.LAA29690@zion.cs.uiuc.edu> Changes in directory llvm/docs: index.html updated: 1.29 -> 1.30 --- Log message: Fix broken link to the 2004 CGO paper. --- Diffs of the changes: (+5 -5) Index: llvm/docs/index.html diff -u llvm/docs/index.html:1.29 llvm/docs/index.html:1.30 --- llvm/docs/index.html:1.29 Mon Sep 6 18:00:01 2004 +++ llvm/docs/index.html Thu Sep 9 11:18:40 2004 @@ -28,10 +28,10 @@
      -
    • LLVM: A Compilation Framework for -Lifelong Program Analysis & Transformation: - Describes -the LLVM instruction set and compilation strategy. This should be the first -document you read to get an overview of LLVM.
    • +
    • LLVM: A +Compilation Framework for Lifelong Program Analysis & Transformation: - +Describes the LLVM instruction set and compilation strategy. This should be the +first document you read to get an overview of LLVM.
    • LLVM Reference Manual - Defines the LLVM intermediate representation, the assembly form of the different nodes, and @@ -205,6 +205,6 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"> LLVM Compiler Infrastructure
      - Last modified: $Date: 2004/09/06 23:00:01 $ + Last modified: $Date: 2004/09/09 16:18:40 $ From brukman at cs.uiuc.edu Thu Sep 9 11:36:57 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 9 Sep 2004 11:36:57 -0500 Subject: [llvm-commits] CVS: llvm/docs/FAQ.html Message-ID: <200409091636.LAA29973@zion.cs.uiuc.edu> Changes in directory llvm/docs: FAQ.html updated: 1.23 -> 1.24 --- Log message: If updating from CVS gives error "No rule to make target", it's faster to just delete .d files than to rebuild from scratch. --- Diffs of the changes: (+34 -1) Index: llvm/docs/FAQ.html diff -u llvm/docs/FAQ.html:1.23 llvm/docs/FAQ.html:1.24 --- llvm/docs/FAQ.html:1.23 Tue Jun 1 13:51:03 2004 +++ llvm/docs/FAQ.html Thu Sep 9 11:36:47 2004 @@ -51,6 +51,8 @@
    • Compiling LLVM with GCC 3.3.2 fails, what should I do?
    • When I use the test suite, all of the C Backend tests fail. What is wrong?
    • +
    • After CVS update, rebuilding gives the error "No rule to make + target".
    • Using the GCC Front End @@ -373,6 +375,37 @@

    +
    +

    After CVS update, rebuilding gives the error "No rule to make target".

    +
    + +
    +

    If the error is of the form:

    + +
    + +gmake[2]: *** No rule to make target `/path/to/somefile', needed by +`/path/to/another/file.d'.
    +Stop. +
    +
    + +

    This may occur anytime files are moved within the CVS repository or removed +entirely. In this case, the best solution is to erase all .d files, +which list dependencies for source files, and rebuild:

    + +
    +
    +% cd $LLVM_OBJ_DIR
    +% rm -f `find . -name \*\.d` 
    +% gmake 
    +
    +
    + +

    In other cases, it may be necessary to run make clean before +rebuilding.

    +
    +
    Using the GCC Front End @@ -526,7 +559,7 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"> LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/06/01 18:51:03 $ + Last modified: $Date: 2004/09/09 16:36:47 $ From alkis at cs.uiuc.edu Thu Sep 9 14:24:49 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Thu, 9 Sep 2004 14:24:49 -0500 Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200409091924.OAA31871@zion.cs.uiuc.edu> Changes in directory llvm/lib/CodeGen: LiveIntervalAnalysis.cpp updated: 1.125 -> 1.126 --- Log message: Grow the map on entry so that we don't crash if joinIntervals never runs (if coalescing is disabled for example). --- Diffs of the changes: (+1 -2) Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.125 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.126 --- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.125 Tue Sep 7 22:01:50 2004 +++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp Thu Sep 9 14:24:38 2004 @@ -88,6 +88,7 @@ mri_ = tm_->getRegisterInfo(); lv_ = &getAnalysis(); allocatableRegs_ = mri_->getAllocatableSet(fn); + r2rMap_.grow(mf_->getSSARegMap()->getLastVirtReg()); // number MachineInstrs unsigned miIndex = 0; @@ -619,8 +620,6 @@ void LiveIntervals::joinIntervals() { DEBUG(std::cerr << "********** JOINING INTERVALS ***********\n"); - // reserve space for the reg2reg map - r2rMap_.grow(mf_->getSSARegMap()->getLastVirtReg()); const LoopInfo &LI = getAnalysis(); if (LI.begin() == LI.end()) { From brukman at cs.uiuc.edu Thu Sep 9 15:34:23 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 9 Sep 2004 15:34:23 -0500 Subject: [llvm-commits] CVS: llvm/docs/CompilerDriver.html Message-ID: <200409092034.PAA01014@zion.cs.uiuc.edu> Changes in directory llvm/docs: CompilerDriver.html updated: 1.7 -> 1.8 --- Log message: Fix broken internal links (one found by seventwentyfour.com spider) --- Diffs of the changes: (+3 -3) Index: llvm/docs/CompilerDriver.html diff -u llvm/docs/CompilerDriver.html:1.7 llvm/docs/CompilerDriver.html:1.8 --- llvm/docs/CompilerDriver.html:1.7 Sun Aug 29 18:20:42 2004 +++ llvm/docs/CompilerDriver.html Thu Sep 9 15:34:13 2004 @@ -54,8 +54,8 @@
    -

    The llvmc tool is a configurable compiler - driver. As such, it isn't a compiler, optimizer, +

    The llvmc tool is a configurable compiler + driver. As such, it isn't a compiler, optimizer, or a linker itself but it drives (invokes) other software that perform those tasks. If you are familiar with the GNU Compiler Collection's gcc tool, llvmc is very similar.

    @@ -813,7 +813,7 @@ src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!">Reid Spencer
    The LLVM Compiler Infrastructure
    -Last modified: $Date: 2004/08/29 23:20:42 $ +Last modified: $Date: 2004/09/09 20:34:13 $ From alkis at cs.uiuc.edu Thu Sep 9 23:17:09 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Thu, 9 Sep 2004 23:17:09 -0500 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp Message-ID: <200409100417.XAA03400@zion.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Constants.cpp updated: 1.104 -> 1.105 --- Log message: Add assertion descriptiosn on type mismatches when creating ConstantArray and ConstantPacked objects. --- Diffs of the changes: (+8 -6) Index: llvm/lib/VMCore/Constants.cpp diff -u llvm/lib/VMCore/Constants.cpp:1.104 llvm/lib/VMCore/Constants.cpp:1.105 --- llvm/lib/VMCore/Constants.cpp:1.104 Wed Sep 1 17:55:37 2004 +++ llvm/lib/VMCore/Constants.cpp Thu Sep 9 23:16:59 2004 @@ -247,9 +247,10 @@ const std::vector &V) : Constant(T) { Operands.reserve(V.size()); for (unsigned i = 0, e = V.size(); i != e; ++i) { - assert(V[i]->getType() == T->getElementType() || - (T->isAbstract() && - V[i]->getType()->getTypeID() == T->getElementType()->getTypeID())); + assert((V[i]->getType() == T->getElementType() || + (T->isAbstract() && + V[i]->getType()->getTypeID() == T->getElementType()->getTypeID())) && + "Initializer for array element doesn't match array element type!"); Operands.push_back(Use(V[i], this)); } } @@ -273,9 +274,10 @@ const std::vector &V) : Constant(T) { Operands.reserve(V.size()); for (unsigned i = 0, e = V.size(); i != e; ++i) { - assert(V[i]->getType() == T->getElementType() || - (T->isAbstract() && - V[i]->getType()->getTypeID() == T->getElementType()->getTypeID())); + assert((V[i]->getType() == T->getElementType() || + (T->isAbstract() && + V[i]->getType()->getTypeID() == T->getElementType()->getTypeID())) && + "Initializer for packed element doesn't match packed element type!"); Operands.push_back(Use(V[i], this)); } } From criswell at cs.uiuc.edu Fri Sep 10 09:19:18 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 09:19:18 -0500 Subject: [llvm-commits] CVS: llvm-test/LICENSE.TXT Message-ID: <200409101419.JAA17364@choi.cs.uiuc.edu> Changes in directory llvm-test: LICENSE.TXT updated: 1.1 -> 1.2 --- Log message: Prepare for the entrance of Hexxagon! --- Diffs of the changes: (+1 -0) Index: llvm-test/LICENSE.TXT diff -u llvm-test/LICENSE.TXT:1.1 llvm-test/LICENSE.TXT:1.2 --- llvm-test/LICENSE.TXT:1.1 Wed Sep 1 10:05:36 2004 +++ llvm-test/LICENSE.TXT Fri Sep 10 09:18:59 2004 @@ -79,6 +79,7 @@ treecc: llvm-test/MultiSource/Applications/treecc kimwitu++: llvm-test/MultiSource/Applications/kimwitu++ obsequi: llvm-test/MultiSource/Applications/obsequi +Hexxagon: llvm-test/MultiSource/Applications/hexxagon Fhourstones: llvm-test/MultiSource/Benchmarks/Fhourstones McCat: llvm-test/MultiSource/Benchmarks/McCat Olden: llvm-test/MultiSource/Benchmarks/Olden From criswell at cs.uiuc.edu Fri Sep 10 09:19:33 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 09:19:33 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/hexxagon/ Message-ID: <200409101419.JAA17371@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications/hexxagon: --- Log message: Directory /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/hexxagon added to the repository --- Diffs of the changes: (+0 -0) From criswell at cs.uiuc.edu Fri Sep 10 09:26:06 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 09:26:06 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/hexxagon/COPYING LICENSE.TXT Makefile bitboard64.cpp bitboard64.h hexxagon.cpp hexxagonboard.cpp hexxagonboard.h hexxagongame.cpp hexxagongame.h hexxagonmove.cpp hexxagonmove.h input libhexx.h Message-ID: <200409101426.JAA17556@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications/hexxagon: COPYING added (r1.1) LICENSE.TXT added (r1.1) Makefile added (r1.1) bitboard64.cpp added (r1.1) bitboard64.h added (r1.1) hexxagon.cpp added (r1.1) hexxagonboard.cpp added (r1.1) hexxagonboard.h added (r1.1) hexxagongame.cpp added (r1.1) hexxagongame.h added (r1.1) hexxagonmove.cpp added (r1.1) hexxagonmove.h added (r1.1) input added (r1.1) libhexx.h added (r1.1) --- Log message: Misha informed me that Oscar's missed my commits to the LLVM tree, so here goes: Adding the hexxagon program to the test suite. Hexxagon can play a board game against itself (I believe the game is Ataxx) and takes about 15-20 seconds to run on Choi. Hopefully it's run time and algorithms will be ideal for testing optimizations (maybe even Pool Allocator someday). --- Diffs of the changes: (+2236 -0) Index: llvm-test/MultiSource/Applications/hexxagon/COPYING diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/COPYING:1.1 *** /dev/null Fri Sep 10 09:26:03 2004 --- llvm-test/MultiSource/Applications/hexxagon/COPYING Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,339 ---- + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + License is intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Library General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether + gratis or for a fee, you must give the recipients all the rights that + you have. You must make sure that they, too, receive or can get the + source code. And you must show them these terms so they know their + rights. + + We protect your rights with two steps: (1) copyright the software, and + (2) offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain + that everyone understands that there is no warranty for this free + software. If the software is modified by someone else and passed on, we + want its recipients to know that what they have is not the original, so + that any problems introduced by others will not reflect on the original + authors' reputations. + + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains + a notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". + + Activities other than copying, distribution and modification are not + covered by this License; they are outside its scope. The act of + running the Program is not restricted, and the output from the Program + is covered only if its contents constitute a work based on the + Program (independent of having been made by running the Program). + Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's + source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any warranty; + and give any other recipients of the Program a copy of this License + along with the Program. + + You may charge a fee for the physical act of transferring a copy, and + you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion + of it, thus forming a work based on the Program, and copy and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work based + on the Program, the distribution of the whole must be on the terms of + this License, whose permissions for other licensees extend to the + entire whole, and thus to each and every part regardless of who wrote it. + + Thus, it is not the intent of this section to claim rights or contest + your rights to work written entirely by you; rather, the intent is to + exercise the right to control the distribution of derivative or + collective works based on the Program. + + In addition, mere aggregation of another work not based on the Program + with the Program (or with a work based on the Program) on a volume of + a storage or distribution medium does not bring the other work under + the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, + under Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + + The source code for a work means the preferred form of the work for + making modifications to it. For an executable work, complete source + code means all the source code for all modules it contains, plus any + associated interface definition files, plus the scripts used to + control compilation and installation of the executable. However, as a + special exception, the source code distributed need not include + anything that is normally distributed (in either source or binary + form) with the major components (compiler, kernel, and so on) of the + operating system on which the executable runs, unless that component + itself accompanies the executable. + + If distribution of executable or object code is made by offering + access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is + void, and will automatically terminate your rights under this License. + However, parties who have received copies, or rights, from you under + this License will not have their licenses terminated so long as such + parties remain in full compliance. + + 5. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to modify or + distribute the Program or its derivative works. These actions are + prohibited by law if you do not accept this License. Therefore, by + modifying or distributing the Program (or any work based on the + Program), you indicate your acceptance of this License to do so, and + all its terms and conditions for copying, distributing or modifying + the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the + Program), the recipient automatically receives a license from the + original licensor to copy, distribute or modify the Program subject to + these terms and conditions. You may not impose any further + restrictions on the recipients' exercise of the rights granted herein. + You are not responsible for enforcing compliance by third parties to + this License. + + 7. If, as a consequence of a court judgment or allegation of patent + infringement or for any other reason (not limited to patent issues), + conditions are imposed on you (whether by court order, agreement or + otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot + distribute so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you + may not distribute the Program at all. For example, if a patent + license would not permit royalty-free redistribution of the Program by + all those who receive copies directly or indirectly through you, then + the only way you could satisfy both it and this License would be to + refrain entirely from distribution of the Program. + + If any portion of this section is held invalid or unenforceable under + any particular circumstance, the balance of the section is intended to + apply and the section as a whole is intended to apply in other + circumstances. + + It is not the purpose of this section to induce you to infringe any + patents or other property right claims or to contest validity of any + such claims; this section has the sole purpose of protecting the + integrity of the free software distribution system, which is + implemented by public license practices. Many people have made + generous contributions to the wide range of software distributed + through that system in reliance on consistent application of that + system; it is up to the author/donor to decide if he or she is willing + to distribute software through any other system and a licensee cannot + impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions + of the General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free Software + Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the author + to ask for permission. For software which is copyrighted by the Free + Software Foundation, write to the Free Software Foundation; we sometimes + make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS + TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, + REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING + OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED + TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the appropriate + parts of the General Public License. Of course, the commands you use may + be called something other than `show w' and `show c'; they could even be + mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Library General + Public License instead of this License. Index: llvm-test/MultiSource/Applications/hexxagon/LICENSE.TXT diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/LICENSE.TXT:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/LICENSE.TXT Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,26 ---- + Hexxagon + ------------------------------------------------------------------------------ + The Hexxagon code has the following additional copyright and restrictions: + + Copyright (C) 2001 Erik Jonsson. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + Please see the file COPYING for more information. + + This tree is only a subset of the original Hexxagon source. Namely, the X11 + code has been removed, and the source from libhexx has been integrated directly + into the program. + Index: llvm-test/MultiSource/Applications/hexxagon/Makefile diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/Makefile:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/Makefile Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,7 ---- + LEVEL = ../../.. + PROG = hexxagon + REQUIRES_EH_SUPPORT = 1 + LDFLAGS += -lstdc++ -lreadline -ltermcap + LIBS += -lstdc++ -lreadline -ltermcap + STDIN_FILENAME=$(BUILD_SRC_DIR)/input + include ../../Makefile.multisrc Index: llvm-test/MultiSource/Applications/hexxagon/bitboard64.cpp diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/bitboard64.cpp:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/bitboard64.cpp Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,219 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include "bitboard64.h" + #include + #include + #include + + using namespace std; + + BitBoard64 BitBoard64::operator~(void) + { + BitBoard64 ret(~lowbits, ~highbits); + return ret; + } + + BitBoard64 BitBoard64::operator&(const BitBoard64 &right) + { + BitBoard64 ret(lowbits & right.lowbits, highbits & right.highbits); + return ret; + } + + BitBoard64 BitBoard64::operator|(const BitBoard64 &right) + { + BitBoard64 ret(lowbits | right.lowbits, highbits | right.highbits); + return ret; + } + + BitBoard64 BitBoard64::operator=(const BitBoard64 &right) + { + lowbits = right.lowbits; + highbits = right.highbits; + return *this; + } + + BitBoard64 BitBoard64::operator^(const BitBoard64 &right) + { + BitBoard64 ret(lowbits ^ right.lowbits, highbits ^ right.highbits); + return ret; + } + + BitBoard64::operator bool() + { + return (bool)(lowbits || highbits); + } + + void BitBoard64::setBit(int bit) + { + if((bit < 0) || (bit > 63)) + return; + + if(bit < 32) + lowbits |= (1 << bit); + else + highbits |= (1 << (bit-32)); + } + + void BitBoard64::unSetBit(int bit) + { + if((bit < 0) || (bit > 63)) + return; + + if(bit < 32) + lowbits &= ~(1 << bit); + else + highbits &= ~(1 << (bit-32)); + } + + int BitBoard64::getBit(int bit) + { + if((bit < 0) || (bit > 63)) + return -1; + + if(bit < 32) + return lowbits & (1 << bit); + else + return highbits & (1 << (bit-32)); + } + + int BitBoard64::readFromFile(FILE *file) + { + lowbits = 0; + highbits = 0; + + /* Just to get the same byte order. + Could not use htonl; long int could be different sizes. */ + for(int i = 0; i < 4; i++) + { + uint8_t byte = 0; + + if(fread(&byte, 1, 1, file) != 1) + return -1; + + lowbits |= byte << (i * 8); + } + + for(int i = 0; i < 4; i++) + { + uint8_t byte = 0; + + if(fread(&byte, 1, 1, file) != 1) + return -1; + + highbits |= byte << (i * 8); + } + + return 0; + } + + int BitBoard64::writeToFile(FILE *file) + { + /* Just to get the same byte order. */ + for(int i = 0; i < 4; i++) + { + uint8_t byte = 0; + + byte = (lowbits >> (i * 8)) & 0xFF; + + if(fwrite(&byte, 1, 1, file) != 1) + return -1; + + } + + for(int i = 0; i < 4; i++) + { + uint8_t byte = 0; + + byte = (highbits >> (i * 8)) & 0xFF; + + if(fwrite(&byte, 1, 1, file) != 1) + return -1; + + } + + return 0; + } + + + /*********************/ + /* Debug struff */ + int getBFP(int x, int y) + { + int no; + + if(x > 0 && x < 10 && y > 0 && y < 10) + { + if(y < 5) + if(x > (9 - (5 - y))) + return -1; + + if(y > 5) + if(x <= (y - 5)) + return -1; + + no = x+y*9 - 10; + + if(y > 1) no -= 4; + if(y > 2) no -= 3; + if(y > 3) no -= 2; + if(y > 4) no -= 1; + if(y > 5) no -= 1; + if(y > 6) no -= 2; + if(y > 7) no -= 3; + if(y > 8) no -= 4; + + return no; + } + + return -1; + } + + void BitBoard64::print() + { + int x, y, no, off; + + for(y = 1; y < 10; y++) + { + if(y < 5) + { + for(off = 0; off < (5 - y); off++) + cout << " "; + } + for(x = 1; x < 10; x++) + { + if((no = getBFP(x, y)) == -1) + cout << " "; + else + { + if(getBit(no)) + cout << "x "; + else + cout << ". "; + } + } + cout << "\n"; + } + } + + + Index: llvm-test/MultiSource/Applications/hexxagon/bitboard64.h diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/bitboard64.h:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/bitboard64.h Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,57 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #ifndef _BITBOARD64_H + #define _BITBOARD64_H + + #include + #include + + class BitBoard64 + { + public: + BitBoard64(void) {}; + BitBoard64(uint32_t l, uint32_t h) {lowbits = l, highbits = h;}; + + void setBit(int bit); + void unSetBit(int bit); + int getBit(int bit); + + BitBoard64 operator&(const BitBoard64 &right); + BitBoard64 operator|(const BitBoard64 &right); + BitBoard64 operator^(const BitBoard64 &right); + BitBoard64 operator=(const BitBoard64 &right); + BitBoard64 operator~(void); + + BitBoard64::operator bool(); + + void print(void); + + int readFromFile(FILE *file); + int writeToFile(FILE *file); + + private: + + uint32_t lowbits, highbits; + }; + + #endif Index: llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,436 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include + #include + #include + #include + #include + #include + + #include + + void stripFromDblSpace(char *cpfrom) + { + char *cpto = cpfrom; + int space = 1; + + while(*cpfrom) + { + if(!(space && (*cpfrom == ' ' || *cpfrom == '\t'))) + { + *cpto = *cpfrom; + cpto++; + } + + if(*cpfrom == ' ' || *cpfrom == '\t') + space = 1; + else + space = 0; + + cpfrom++; + } + + *cpto = 0; + } + + void printCopy() + { + printf("\n"); + printf("Hexxagon board game.\n"); + printf("Copyright (C) 2001 Erik Jonsson.\n\n"); + + printf("The pieces was drawn by Stefan P?hlson.\n\n"); + + printf("This program is free software; you can redistribute it and/or\n"); + printf("modify it under the terms of the GNU General Public License\n"); + printf("as published by the Free Software Foundation; either version 2\n"); + printf("of the License, or (at your option) any later version.\n\n"); + + printf("This program is distributed in the hope that it will be useful,\n"); + printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n"); + printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"); + printf("GNU General Public License for more details.\n\n"); + + printf("You should have received a copy of the GNU General Public License\n"); + printf("along with this program; if not, write to the Free Software\n"); + printf("Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n\n"); + + printf("Email erik at nesqi.homeip.net\n\n"); + }; + + void printHelp() + { + printf(" __ \n"); + printf(" __/ \\__ \n"); + printf(" __/ \\__/ \\__ Hexxagon v0.3.1 \n"); + printf(" / \\__/ \\__/ \\ Copyright 2001 \n"); + printf(" \\__/ \\__/ \\__/ Erik Jonsson \n"); + printf(" / \\__/ \\__/ \\ \n"); + printf(" \\__/ \\__/ \\__/ \n"); + printf(" \\__/ \\__/ \n"); + printf(" \\__/ \n\n"); + printf(" erik at nesqi.homeip.net\n"); + printf(" http://nesqi.homeip.net/hexxagon\n"); + printf("\n"); + printf(" Common commands:\n"); + printf(" quit : Quit the program.\n"); + printf(" help : Print this help.\n"); + printf(" copyright : Prints copyright information.\n\n"); + printf(" Play related commands:\n"); + printf(" jump [FROM][TO] : Jump from eg. A4 to B4.\n"); + printf(" j [FROM][TO] : Same as jump.\n"); + printf(" clone [TO] : Clone to a position.\n"); + printf(" c [TO] : Same as clone.\n"); + printf(" hint : Let the computer move for you.\n"); + printf(" board : Display the current playboard.\n"); + printf(" undo : Go gack one half move. (Undo)\n"); + printf(" redo : Goto the next half move. (If you have used \"undo\".)\n\n"); + printf(" Game related commands:\n"); + printf(" time [seconds] : Max time for the computer to think.\n"); + printf(" level [level] : Max search depth for the computer the use.\n"); + printf(" load [filename] : Load a game from a save-file.\n"); + printf(" save [filename] : Save a game (with history) to a file.\n"); + printf(" newgame [CC/HC/CH/HH] : Start a new game:\n"); + printf(" HC for human against computer.\n"); + printf(" CH for computer against human.\n"); + printf(" Same as HC but computer starts.\n"); + printf(" CC for computer against computer.\n"); + printf(" HH for human against human.\n\n"); + printf(" If you just hit enter your last command will be repeated.\n"); + printf("\n"); + } + + enum + { + GAME_HC = 1, + GAME_HH + }; + + int parseCords(char *str) + { + if(((*str >= 'a' && *str <= 'i') || + (*str >= 'A' && *str <= 'I')) && (str[1] >= '1' && str[1] <= '9')) + { + int x, y; + + if(*str >= 'a' && *str <= 'i') + x = *str - 'a'; + else if(*str >= 'A' && *str <= 'I') + x = *str - 'A'; + else + return -1; + + y = str[1] - '1'; + + return getHexxagonIndex(x + 1, y + 1); + } + + return -1; + } + + int main(int argc, char *argv[]) + { + int quit = 0; + + int mode = 1; + + int level = 4; + int time = 12; + + printf("Hexxagon board game.\n"); + printf("Copyright 2001.\n"); + printf("Erik Jonsson.\n"); + printf("Type \"copyright\" to see the copyright notice.\n\n"); + + HexxagonGame *game = new HexxagonGame(); + game->displayText(); + + char *input = 0; + + while(!quit) + { + char *tmp = readline("Hexxagon (\"help\" for help):"); + stripFromDblSpace(tmp); + + int len = strlen(tmp); + if(len && tmp[len - 1] == ' ') + tmp[len - 1] = 0; + + if(*tmp == 0) + { + if(input) + printf("Repeating last command.\n"); + free(tmp); + } + else + { + free(input); + input = tmp; + } + + if(!input) + continue; + + if(!strcasecmp("quit", input) || !strcasecmp("exit", input)) + { + quit = 1; + } + else if(!strcasecmp("help", input)) + printHelp(); + else if(!strcasecmp("copyright", input)) + printCopy(); + else if(!strncasecmp("level ", input, 6)) + { + if(!(isdigit(input[6]) && input[7] == 0)) + printf("Invalid input to command \"level\".\nValid values are 0-9.\n"); + else + level = input[6] - '0'; + } + else if(!strcasecmp("level", input)) + printf("The search level is set to: %i.\n", level); + else if(!strncasecmp("time ", input, 5)) + { + char *cp = input + 5; + + while(isdigit(*cp)) + cp++; + + if(cp == input + 5 || (*cp != 0 && !((*cp == ' ') && *(cp + 1) == 0))) + printf("Syntax: time [number]\n"); + else + time = atoi(input + 5); + } + else if(!strcasecmp("time", input)) + printf("The search time is set to %i sec.\n", time); + else if(!strcasecmp("board", input)) + game->displayText(); + else if(!strcasecmp("undo", input)) + { + if(game->prev()) + printf("No more moves left to undo!\n"); + else + game->displayText(); + } + else if(!strcasecmp("redo", input)) + { + if(game->next()) + printf("There is no move to redo!\n"); + else + game->displayText(); + } + else if(!strcasecmp("hint", input)) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + + if(mode != GAME_HH) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + } + } + else if(!strncasecmp("load ", input, 5)) + { + int ret = game->loadGame(input + 5); + if(ret == 0) + { + printf("Game loaded.\n"); + game->displayText(); + } + else if(ret == -1) + printf("Error opening load-file!\n"); + else if(ret == -3) + printf("Unknown file format.\n"); + else + printf("Error reading from load-file!\n"); + } + else if(!strcasecmp("load", input)) + printf("The load command needs a filename as argument.\n"); + else if(!strncasecmp("save ", input, 5)) + { + int ret = game->saveGame(input + 5); + if(ret == 0) + printf("Game saved.\n"); + else if(ret == -1) + printf("Error opening save-file!\n"); + else + printf("Error writing to save-file!\n"); + } + else if(!strcasecmp("save", input)) + printf("The save command needs a filename as argument.\n"); + else if(!strncasecmp("newgame ", input, 8)) + { + if(((input[8] == 'c' || input[8] == 'C') || (input[8] == 'h' || input[8] == 'H')) && + ((input[9] == 'c' || input[9] == 'C') || (input[9] == 'h' || input[8] == '9')) && + (input[10] == 0 || (input[10] == ' ' && input[11] == 0))) + { + delete game; + game = new HexxagonGame(); + game->displayText(); + + if((input[8] == 'h' || input[8] == 'H') && + (input[9] == 'c' || input[9] == 'C')) + mode = GAME_HC; + else if((input[8] == 'c' || input[8] == 'C') && + (input[9] == 'h' || input[9] == 'H')) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + mode = GAME_HC; + } + else if((input[8] == 'h' || input[8] == 'H') && + (input[9] == 'h' || input[9] == 'H')) + mode = GAME_HH; + else if((input[8] == 'c' || input[8] == 'C') && + (input[9] == 'c' || input[9] == 'C')) + { + while(!game->endOfGame()) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + } + + mode = GAME_HC; + } + else + printf("You have found a bug in Hexxagon! This code should never be called!!\n"); + } + else + printf("Syntax: newgame HC/CH/CC/HH\n"); + } + else if(!strcasecmp("newgame", input)) + { + printf("Syntax: newgame HC/CH/CC/HH\n"); + } + else if(!strncasecmp("jump ", input, 5) || + !strncasecmp("j ", input, 2)) + { + char *cp = input; + + if(!strncasecmp("j ", input, 2)) + cp += 2; + else + cp += 5; + + HexxagonMove move; + + int len = strlen(cp); + if(len == 5) + { + move.from = parseCords(cp); + move.to = parseCords(cp + 3); + } else if(len == 4) + { + move.from = parseCords(cp); + move.to = parseCords(cp + 2); + } + else + move.from = -1; + + if(move.from != -1 && move.to != -1) + { + if(game->isMoveValid(move)) + { + game->applyMove(move); + game->displayText(); + + if(mode != GAME_HH) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + } + } + else + printf("Illegal move!\n"); + } + else + { + if(len == 5) + { + if(cp[2] == ' ') + printf("Bad cordinate.\n"); + else + printf("Syntax: jump [FROM][TO]\nEg. \"jump a4b4\"\n"); + } + else if(len == 4) + printf("Bad cordinate.\n"); + else + printf("Syntax: jump [FROM][TO]\nEg. \"jump a4b4\"\n"); + } + } + else if(!strcasecmp("jump", input) || + !strcasecmp("j", input)) + { + printf("Syntax: jump [FROM][TO]\nEg. \"jump a4b4\"\n"); + } + else if(!strncasecmp("clone ", input, 6) || + !strncasecmp("c ", input, 2)) + { + char *cp = input; + + if(!strncasecmp("c ", input, 2)) + cp += 2; + else + cp += 6; + + HexxagonMove move; + + if(strlen(cp) == 2) + { + move.to = parseCords(cp); + move.from = move.to; + + if(move.to != -1) + { + if(game->isMoveValid(move)) + { + game->applyMove(move); + game->displayText(); + + if(mode != GAME_HH) + { + game->computerMove(level, 0, time * 1000); + game->displayText(); + } + } + else + printf("Illegal move!\n"); + } + else + printf("Invalid cordinate.\n"); + } + else + printf("Syntax: clone [TO]\nEg. \"clone b4\"\n"); + + } + else if(!strcasecmp("clone", input) || + !strcasecmp("c", input)) + { + printf("Syntax: clone [TO]\nEg. \"clone b4\"\n"); + } + else + printf("Unknown command, try \"help\" for a list of commands.\n"); + } + + free(input); + } Index: llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.cpp diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.cpp:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.cpp Fri Sep 10 09:25:52 2004 *************** *** 0 **** --- 1,435 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include "hexxagonboard.h" + #include "hexxagonmove.h" + #include + #include + + using namespace std; + + BitBoard64 *clone_lookups = 0; + BitBoard64 *jump_lookups = 0; + + int getHexxagonIndex(int x, int y) + { + int no; + + if(x > 0 && x < 10 && y > 0 && y < 10) + { + if(y < 5) + if(x > (9 - (5 - y))) + return -1; + + if(y > 5) + if(x <= (y - 5)) + return -1; + + no = x+y*9 - 10; + + if(y > 1) no -= 4; + if(y > 2) no -= 3; + if(y > 3) no -= 2; + if(y > 4) no -= 1; + if(y > 5) no -= 1; + if(y > 6) no -= 2; + if(y > 7) no -= 3; + if(y > 8) no -= 4; + + return no; + } + + return -1; + } + + void initCloneLookups() + { + clone_lookups = new BitBoard64[61]; + + int no = 0; + + for(int i = 0; i < 61; i++) + clone_lookups[i] = BitBoard64(0,0); + + // Clone. + for(int y = 1; y <= 9; y++) + { + for(int x = 1; x <= 9; x++) + { + int out = 0; + + if(x > 0 && x < 10 && y > 0 && y < 10) + { + if(y < 5) + if(x > (9 - (5 - y))) + out = 1; + + if(y > 5) + if(x <= (y - 5)) + out = 1; + } + + if(!out) + { + clone_lookups[no].setBit(getHexxagonIndex(x-1, y-1)); + clone_lookups[no].setBit(getHexxagonIndex(x , y-1)); + clone_lookups[no].setBit(getHexxagonIndex(x-1, y )); + clone_lookups[no].setBit(getHexxagonIndex(x+1, y )); + clone_lookups[no].setBit(getHexxagonIndex(x , y+1)); + clone_lookups[no].setBit(getHexxagonIndex(x+1, y+1)); + no++; + } + } + } + } + + void initJumpLookups() + { + jump_lookups = new BitBoard64[61]; + + int no = 0; + + for(int i = 0; i < 61; i++) + jump_lookups[i] = BitBoard64(0,0); + + // Jump. + for(int y = 1; y <= 9; y++) + { + for(int x = 1; x <= 9; x++) + { + int out = 0; + + if(x > 0 && x < 10 && y > 0 && y < 10) + { + if(y < 5) + if(x > (9 - (5 - y))) + out = 1; + + if(y > 5) + if(x <= (y - 5)) + out = 1; + } + + if(!out) + { + jump_lookups[no].setBit(getHexxagonIndex(x-2, y-2)); + jump_lookups[no].setBit(getHexxagonIndex(x-1, y-2)); + jump_lookups[no].setBit(getHexxagonIndex( x, y-2)); + jump_lookups[no].setBit(getHexxagonIndex(x-2, y-1)); + jump_lookups[no].setBit(getHexxagonIndex(x+1, y-1)); + jump_lookups[no].setBit(getHexxagonIndex(x-2, y )); + jump_lookups[no].setBit(getHexxagonIndex(x+2, y )); + jump_lookups[no].setBit(getHexxagonIndex(x-1, y+1)); + jump_lookups[no].setBit(getHexxagonIndex(x+2, y+1)); + jump_lookups[no].setBit(getHexxagonIndex(x , y+2)); + jump_lookups[no].setBit(getHexxagonIndex(x+1, y+2)); + jump_lookups[no].setBit(getHexxagonIndex(x+2, y+2)); + no++; + } + } + } + } + + HexxagonBoard::HexxagonBoard(const HexxagonBoard ©) + { + board = copy.board; + color = copy.color; + } + + HexxagonBoard HexxagonBoard::operator=(const HexxagonBoard &right) + { + color = right.color; + board = right.board; + + return *this; + } + + void HexxagonBoard::init(void) + { + board = BitBoard64(0,0); + color = BitBoard64(0,0); + + board.setBit( 0); color.setBit(0); + board.setBit(34); color.setBit(34); + board.setBit(56); color.setBit(56); + board.setBit( 4); + board.setBit(26); + board.setBit(60); + } + + int HexxagonBoard::countBricks(int player) + { + int good = 0, bad = 0; + + for(int i = 0; i < 61; i++) + { + if(board.getBit(i)) + { + if(color.getBit(i)) + good++; + else + bad++; + } + } + + if(player == 0) + return good - bad; + else if(player == 1) + return good; + else if(player == 2) + return bad; + + return 0; + } + + int HexxagonBoard::evaluate(void) + { + int good = 0; + int bad = 0; + int count = 0; + + for(int i = 0; i < 61; i++) + { + if(board.getBit(i)) + { + count++; + if(color.getBit(i)) + good++; + else + bad++; + } + } + + int score = good - bad; + + if(good == 0 || bad == 0 || count == 61) /* Game is over... */ + { + if(good == 0) + score -= SCR_WIN; + + if(bad == 0) + score += SCR_WIN; + + if(count == 61) + { + if(good > bad) + score += SCR_WIN; + + if(good <= bad) + score -= SCR_WIN; + } + } + + return score; + } + + int HexxagonBoard::getHexxagon(int i) + { + if(board.getBit(i)) + { + if(color.getBit(i)) + return pl1; + else + return pl2; + } else + return empty; + } + + int HexxagonBoard::applyMove(HexxagonMove &move) + { + board.setBit(move.to); + color.setBit(move.to); + + color = color | clone_lookups[move.to]; + + if(move.from != move.to) // Jump. + board.unSetBit(move.from); + + color = ~color; + + return 0; + } + + int HexxagonBoard::isMoveValid(HexxagonMove &move) + { + BitBoard64 mine = color & board; + + if(!board.getBit(move.to)) + { + if(move.from == move.to) // clone + { + if(mine & clone_lookups[move.to]) + return 1; + } + else // Jump + { + BitBoard64 tmp(0,0); + tmp.setBit(move.from); + + if(tmp & jump_lookups[move.to] & mine) + return 1; + } + } + + return 0; + } + + HexxagonMoveList *HexxagonBoard::generateMoveList() + { + HexxagonMoveList *list = new HexxagonMoveList(); + + if(!list) + { + printf("Out of memory !\n"); + exit(-1); + } + + for(int i = 0; i < 61; i++) + { + if(!board.getBit(i)) // Found place to clone / jump. + { + if(color.operator&((board.operator&(clone_lookups[i])))) // Clone. + { + HexxagonMove move = HexxagonMove(i); + list->addMove(move); + } + + BitBoard64 moves; + if((moves = ((board & jump_lookups[i]) & color))) // Jump. + { + for(int j = 0; j < 61; j++) + { + if(moves.getBit(j)) + { + HexxagonMove move = HexxagonMove(j, i); + list->addMove(move); + } + } + } + } + } + + if(list->getNrMoves()) + return list; + + delete list; + return 0; + } + + int HexxagonBoard::endOfGame() + { + HexxagonMoveList *movelist; + + movelist = generateMoveList(); + + if(!movelist) + return 1; + + delete movelist; + + return 0; + } + + int HexxagonBoard::computerMove(int depth, void (*callback)(), int maxtime) + { + HexxagonMoveList *movelist; + + if(!(movelist = generateMoveList())) + { + printf("No more moves.\n"); + return -1; + } + + movelist->scoreAllMoves(*this, depth, callback, maxtime); + applyMove(*(movelist->getBestMove())); + + delete movelist; + + return 0; + } + + int HexxagonBoard::readFromFile(FILE *file) + { + if(color.readFromFile(file) || board.readFromFile(file)) + return -1; + else + return 0; + } + + int HexxagonBoard::writeToFile(FILE *file) + { + if(color.writeToFile(file) || board.writeToFile(file)) + return -1; + else + return 0; + } + + void HexxagonBoard::displayBoardText(int turn) + { + BitBoard64 c(color); + + if(!turn) + c = ~c; + + cout << " A B C D E F G H I\n"; + cout << " / / / / / / / / /\n"; + + for(int y = 1; y < 10; y++) + { + cout << y << "- "; + + if(y < 5) + { + for(int off = 0; off < (5 - y); off++) + cout << " "; + } + + for(int x = 1; x < 10; x++) + { + int no; + + if((no = getHexxagonIndex(x, y)) == -1) + cout << " "; + else + { + if(board.getBit(no)) + { + if(c.getBit(getHexxagonIndex(x, y))) + cout << "x "; + else + cout << "o "; + } else + cout << ". "; + } + } + cout << "\n"; + } + + int empty = 61 - ((turn ? countBricks(1) : countBricks(2)) + + (turn ? countBricks(2) : countBricks(1))); + + cout << "\nBricks: x " << (turn ? countBricks(1) : countBricks(2)); + cout << ", o " << (turn ? countBricks(2) : countBricks(1)); + cout << ". Empty " << empty << ".\n"; + cout << "Next to move: " << (turn ? "x" : "o"); + cout << (endOfGame() ? ", Game over." : "") << "\n"; + } Index: llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.h diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.h:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagonboard.h Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,84 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #ifndef _HEXXAGONBOARD_H + #define _HEXXAGONBOARD_H + + #include "bitboard64.h" + + class HexxagonMove; + class HexxagonMoveList; + + enum + { + SCR_WIN = 20000, + SCR_INFINITY = 32000 + }; + + /* Hexxagon type */ + enum + { + pl1 = 1, + pl2, + empty, + removed + }; + + int getHexxagonIndex(int x, int y); + void initCloneLookups(); + void initJumpLookups(); + + class HexxagonBoard + { + public: + + HexxagonBoard(void) {}; + HexxagonBoard(const HexxagonBoard ©); + + void init(void); + int evaluate(void); + int countBricks(int player); + int getHexxagon(int i); + int applyMove(HexxagonMove &move); + + HexxagonMoveList *generateMoveList(); + + int computerMove(int depth, void (*callback)(), int maxtime); + int endOfGame(); + int isMoveValid(HexxagonMove &move); + + BitBoard64 getBBBoard() {return board;}; + BitBoard64 getBBColor() {return color;}; + + HexxagonBoard operator=(const HexxagonBoard &right); + + int readFromFile(FILE *file); + int writeToFile(FILE *file); + + void displayBoardText(int turn); + + protected: + BitBoard64 board; + BitBoard64 color; + }; + + #endif Index: llvm-test/MultiSource/Applications/hexxagon/hexxagongame.cpp diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagongame.cpp:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagongame.cpp Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,273 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include "hexxagongame.h" + #include + #include + + extern BitBoard64 *clone_lookups; + extern BitBoard64 *jump_lookups; + + HexxagonGame::HexxagonGame() + { + if(!clone_lookups) + initCloneLookups(); + + if(!jump_lookups) + initJumpLookups(); + + GameList *tmp = new GameList(0); + + tmp->init(); + + first = tmp; + curr = tmp; + + turn = 1; + } + + int HexxagonGame::next() + { + if(curr->next) + { + turn = !turn; + curr = curr->next; + return 0; + } + + return -1; + } + + int HexxagonGame::prev() + { + if(curr->prev) + { + turn = !turn; + curr = curr->prev; + return 0; + } + + return -1; + } + + void HexxagonGame::reset() + { + while(!prev()) + ; + + destroyRest(); + } + + void HexxagonGame::destroyRest() + { + GameList *step = curr->next; + + while(step) + { + GameList *tmp = step; + delete step; + step = tmp->next; + } + + curr->next = 0; + } + + int HexxagonGame::applyMove(HexxagonMove &move) + { + GameList *tmp = new GameList(curr); + + tmp->HexxagonBoard::operator=(*curr); + + int ret = tmp->applyMove(move); + + if(!ret) + { + curr->next = tmp; + next(); + } + else + delete tmp; + + return ret; + } + + int HexxagonGame::computerMove(int depth, void (*callback)(), int maxtime) + { + GameList *tmp = new GameList(curr); + + tmp->HexxagonBoard::operator=(*curr); + + int ret = tmp->computerMove(depth, callback, maxtime); + + if(!ret) + { + curr->next = tmp; + next(); + } + else + delete tmp; + + return ret; + } + + // File format + //---------------- + // + // Hex2agon 1.0\n + // 32bit networkorder integer : boards + // datablocks.... + // EOF + + int HexxagonGame::noBoards() + { + GameList *step = first; + int sum = 0; + + while(step) + { + sum++; + step = step->next; + } + + return sum; + } + + #define FILE_HDR "Hex2agon 1.1\n" + + int HexxagonGame::loadGame(char *filename) + { + FILE *loadfile; + + loadfile = fopen(filename, "rb"); + + if(!loadfile) + return -1; + + char str[64]; + if(fread(str, strlen(FILE_HDR), 1, loadfile) != 1) + { + fclose(loadfile); + return -2; + } + + if(memcmp(str, FILE_HDR, strlen(FILE_HDR))) + { + fclose(loadfile); + return -3; + } + + long int no; + if(fread(&no, sizeof(long int), 1, loadfile) != 1) + { + fclose(loadfile); + return -2; + } + + no = ntohl(no); + + curr = first; + destroyRest(); + delete first; + first = 0; + turn = 1; + while(no) + { + GameList *tmp; + + if(first == 0) + { + tmp = new GameList(0); + + first = tmp; + curr = tmp; + } + else + { + tmp = new GameList(curr); + curr->next = tmp; + + next(); + } + + int ret = tmp->readFromFile(loadfile); + + if(ret) + { + prev(); + destroyRest(); + return ret; + } + + no--; + } + + fclose(loadfile); + + return 0; + } + + int HexxagonGame::saveGame(char *filename) + { + FILE *savefile; + + savefile = fopen(filename, "wb"); + + if(!savefile) + return -1; + + if(fwrite(FILE_HDR, strlen(FILE_HDR), 1, savefile) != 1) + { + fclose(savefile); + return -2; + } + + long int no; + + no = htonl(noBoards()); + + // BUG ?? The size can be different. + if(fwrite(&no, sizeof(long int), 1, savefile) != 1) + { + fclose(savefile); + return -2; + } + + GameList *step = first; + while(step) + { + if(step->writeToFile(savefile)) + { + fclose(savefile); + return -2; + } + + step = step->next; + } + + fclose(savefile); + + return 0; + } + + + + Index: llvm-test/MultiSource/Applications/hexxagon/hexxagongame.h diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagongame.h:1.1 *** /dev/null Fri Sep 10 09:26:05 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagongame.h Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,74 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #ifndef _HEXXAGONGAME_H + #define _HEXXAGONGAME_H + + #include "hexxagonboard.h" + + class GameList : public HexxagonBoard + { + public: + GameList(GameList *p) {prev = p; next = 0;}; + + GameList *next; + GameList *prev; + }; + + class HexxagonGame + { + public: + HexxagonGame(); + ~HexxagonGame() {destroyRest(); delete first;}; + + int getTurn() {return turn;}; + + int next(); + int prev(); + + void reset(); + void destroyRest(); + + int applyMove(HexxagonMove &move); + int computerMove(int depth, void (*callback)(), int maxtime); + + int noBoards(); + + HexxagonBoard *getBoard() {return (HexxagonBoard*) curr; }; + + int endOfGame() {return curr->endOfGame();}; + int isMoveValid(HexxagonMove &move){ return curr->isMoveValid(move);}; + + void displayText() {curr->displayBoardText(turn);}; + + int saveGame(char *filename); + int loadGame(char *filename); + + protected: + int turn; + + GameList *first; + GameList *curr; + }; + + #endif // _HEXXAGONGAME_H + Index: llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.cpp diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.cpp:1.1 *** /dev/null Fri Sep 10 09:26:06 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.cpp Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,191 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include "hexxagonboard.h" + #include "hexxagonmove.h" + + #include + #include + #include + #include + + using namespace std; + + void HexxagonMoveList::addMove(HexxagonMove &move) + { + if(!(nr_moves & 0xF)) /* Only check every 16:th (Extra speed) */ + { + for(int i = NO_MOVES_BEGIN; i <= nr_moves; i *= 2) + { + if(nr_moves == i) + { + HexxagonMove *tmp = new HexxagonMove[i * 2]; + memcpy(tmp, moves, i * sizeof(class HexxagonMove)); + delete moves; + moves = tmp; + } + } + } + + moves[nr_moves] = move; + nr_moves++; + } + + int compare(const void *mp1, const void *mp2) + { + return ((HexxagonMove*)mp2)->score - ((HexxagonMove*)mp1)->score; + } + + void HexxagonMoveList::sortListQuick() + { + qsort(moves, nr_moves, sizeof(moves[0]), &compare); + } + + void HexxagonMoveList::sortList() + { + int move = 1; + + while(move) + { + move = 0; + for(int i = 0; i < (nr_moves - 1); i++) + { + if(moves[i].score < moves[i+1].score) + { + move = 1; + HexxagonMove tmp; + memcpy(&tmp, &moves[i], sizeof(HexxagonMove)); + memcpy(&moves[i], &moves[i+1], sizeof(HexxagonMove)); + memcpy(&moves[i+1], &tmp, sizeof(HexxagonMove)); + } + } + } + } + + int getTime() + { + struct timeb tb; + + ftime(&tb); + return (tb.time * 1000) + tb.millitm; + } + + HexxagonMove *HexxagonMoveList::getMove(int i) + { + return &moves[i]; + } + + int HexxagonMoveList::getNrMoves() + { + return nr_moves; + } + + char hexx_count; + int alphaBeta(HexxagonBoard &board, int level, int alpha, int beta, void (*callback)()) + { + int best = -SCR_INFINITY; + + if(!level) + return board.evaluate(); + + HexxagonMoveList *moves = board.generateMoveList(); + + if(!moves) // The game is over. + { + int score = board.countBricks(0); // Add win or loss points to score. + + if(score > 0) + return score + SCR_WIN; + else if(score < 0) + return score - SCR_WIN; + else + return board.evaluate(); + } + + hexx_count++; + if(!hexx_count && callback) + callback(); + + for(int i = 0; (i < moves->getNrMoves()) && (best < beta); i++) + { + if(best > alpha) + alpha = best; + + HexxagonBoard newboard = HexxagonBoard(board); + newboard.applyMove(*(moves->getMove(i))); + int value = -alphaBeta(newboard, level - 1, -beta, -alpha, callback); + + if(value > best) + best = value; + } + + delete moves; + + return best; + } + + void HexxagonMoveList::scoreAllMoves(HexxagonBoard board, int depth, void (*callback)(), int maxtime) + { + int t = getTime(); + + for(int i = 1; (i < depth) && (getTime() - t <= maxtime); i++) + { + int best = -SCR_INFINITY; + int alpha = -SCR_INFINITY; + int beta = SCR_INFINITY; + + for(int j = 0; (j < getNrMoves()) && (getTime() - t <= maxtime) && (best < beta); j++) + { + if(best > alpha) + alpha = best; + + HexxagonBoard newboard = HexxagonBoard(board); + newboard.applyMove(*getMove(j)); + int value = -alphaBeta(newboard, i, -beta, -alpha, callback); + + getMove(j)->score = value; + + if(value > best) + best = value; + } + + sortList(); + } + + #if 0 + cout << "Move computed in " << ((double)getTime() - t) / (double)1000 << " seconds.\n"; + #endif + } + + HexxagonMove *HexxagonMoveList::getBestMove() + { + srandom(getTime()); + + if(nr_moves) + return getMove(0); + + return NULL; + } + + + + Index: llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.h diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.h:1.1 *** /dev/null Fri Sep 10 09:26:06 2004 --- llvm-test/MultiSource/Applications/hexxagon/hexxagonmove.h Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,66 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #ifndef _HEXXAGONMOVE_H + #define _HEXXAGONMOVE_H + + #include "hexxagonboard.h" + + #define NO_MOVES_BEGIN 16 + + class HexxagonBoard; + + class HexxagonMove + { + public: + HexxagonMove() {}; + HexxagonMove(int t) {from = t; to = t;}; + HexxagonMove(int f, int t) {from = f; to = t;}; + + char from, to; + int score; + }; + + class HexxagonMoveList + { + public: + HexxagonMoveList() { moves = new HexxagonMove[NO_MOVES_BEGIN]; nr_moves = 0; }; + ~HexxagonMoveList() { delete moves; }; + + void scoreAllMoves(HexxagonBoard board, int depth, void (*callback)(), int maxtime); + void sortList(); + void sortListQuick(); /* Not used... (slower) */ + + int getNrMoves(); + + void addMove(HexxagonMove &move); + HexxagonMove *getMove(int i); + + HexxagonMove *getBestMove(); + + private: + + int nr_moves; + HexxagonMove *moves; + }; + + #endif // _HEXXAGONMOVE_H Index: llvm-test/MultiSource/Applications/hexxagon/input diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/input:1.1 *** /dev/null Fri Sep 10 09:26:06 2004 --- llvm-test/MultiSource/Applications/hexxagon/input Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,3 ---- + newgame cc + quit + Index: llvm-test/MultiSource/Applications/hexxagon/libhexx.h diff -c /dev/null llvm-test/MultiSource/Applications/hexxagon/libhexx.h:1.1 *** /dev/null Fri Sep 10 09:26:06 2004 --- llvm-test/MultiSource/Applications/hexxagon/libhexx.h Fri Sep 10 09:25:53 2004 *************** *** 0 **** --- 1,26 ---- + /* + * Hexxagon board game. + * Copyright (C) 2001 Erik Jonsson. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Email erik at nesqi.homeip.net + * + */ + + #include "bitboard64.h" + #include "hexxagonmove.h" + #include "hexxagonboard.h" + #include "hexxagongame.h" From criswell at cs.uiuc.edu Fri Sep 10 09:26:33 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 09:26:33 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/Makefile Message-ID: <200409101426.JAA17567@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications: Makefile updated: 1.12 -> 1.13 --- Log message: Add hexxagon to the list of programs to test for Linux/x86. --- Diffs of the changes: (+1 -1) Index: llvm-test/MultiSource/Applications/Makefile diff -u llvm-test/MultiSource/Applications/Makefile:1.12 llvm-test/MultiSource/Applications/Makefile:1.13 --- llvm-test/MultiSource/Applications/Makefile:1.12 Wed Sep 1 09:33:20 2004 +++ llvm-test/MultiSource/Applications/Makefile Fri Sep 10 09:26:21 2004 @@ -6,7 +6,7 @@ PARALLEL_DIRS = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc ifeq ($(OS),Linux) -PARALLEL_DIRS += kimwitu++ obsequi +PARALLEL_DIRS += kimwitu++ obsequi hexxagon endif include $(LEVEL)/Makefile.programs From alkis at cs.uiuc.edu Fri Sep 10 12:11:32 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Fri, 10 Sep 2004 12:11:32 -0500 Subject: [llvm-commits] CVS: llvm-java/lib/ClassFile/ClassFile.cpp Message-ID: <200409101711.MAA23820@zion.cs.uiuc.edu> Changes in directory llvm-java/lib/ClassFile: ClassFile.cpp updated: 1.25 -> 1.26 --- Log message: Use lower_bound instead of upper_bound. upper_bound cuases us to return the iterator after the match and as such each classfile was reparsed from scratch. --- Diffs of the changes: (+2 -1) Index: llvm-java/lib/ClassFile/ClassFile.cpp diff -u llvm-java/lib/ClassFile/ClassFile.cpp:1.25 llvm-java/lib/ClassFile/ClassFile.cpp:1.26 --- llvm-java/lib/ClassFile/ClassFile.cpp:1.25 Wed Sep 1 23:52:13 2004 +++ llvm-java/lib/ClassFile/ClassFile.cpp Fri Sep 10 12:11:21 2004 @@ -216,7 +216,8 @@ typedef std::map Name2ClassMap; static Name2ClassMap n2cMap_; - Name2ClassMap::iterator it = n2cMap_.upper_bound(classname); + Name2ClassMap::iterator it = n2cMap_.lower_bound(classname); + if (it == n2cMap_.end() || it->first != classname) { std::ifstream in(getFileForClass(classname).c_str()); it = n2cMap_.insert(it, std::make_pair(classname, readClassFile(in))); From gaeke at cs.uiuc.edu Fri Sep 10 13:01:59 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Fri, 10 Sep 2004 13:01:59 -0500 (CDT) Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp Message-ID: <200409101801.NAA21148@seraph.cs.uiuc.edu> Changes in directory llvm/lib/Target/SparcV9: SparcV9AsmPrinter.cpp updated: 1.121 -> 1.122 --- Log message: Roll back constant printing changes until the problems with larger programs and C++ can be looked at in detail. --- Diffs of the changes: (+434 -35) Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.121 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.122 --- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.121 Wed Sep 1 17:55:36 2004 +++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp Fri Sep 10 13:01:45 2004 @@ -23,7 +23,6 @@ #include "llvm/Module.h" #include "llvm/Pass.h" #include "llvm/Assembly/Writer.h" -#include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstr.h" @@ -37,45 +36,203 @@ namespace { Statistic<> EmittedInsts("asm-printer", "Number of machine instrs printed"); -} + + //===--------------------------------------------------------------------===// + // Utility functions + + /// getAsCString - Return the specified array as a C compatible string, only + /// if the predicate isString() is true. + /// + std::string getAsCString(const ConstantArray *CVA) { + assert(CVA->isString() && "Array is not string compatible!"); + + std::string Result = "\""; + for (unsigned i = 0; i != CVA->getNumOperands(); ++i) { + unsigned char C = cast(CVA->getOperand(i))->getRawValue(); + + if (C == '"') { + Result += "\\\""; + } else if (C == '\\') { + Result += "\\\\"; + } else if (isprint(C)) { + Result += C; + } else { + Result += '\\'; // print all other chars as octal value + // Convert C to octal representation + Result += ((C >> 6) & 7) + '0'; + Result += ((C >> 3) & 7) + '0'; + Result += ((C >> 0) & 7) + '0'; + } + } + Result += "\""; + + return Result; + } + + inline bool ArrayTypeIsString(const ArrayType* arrayType) { + return (arrayType->getElementType() == Type::UByteTy || + arrayType->getElementType() == Type::SByteTy); + } + + unsigned findOptimalStorageSize(const TargetMachine &TM, const Type *Ty) { + // All integer types smaller than ints promote to 4 byte integers. + if (Ty->isIntegral() && Ty->getPrimitiveSize() < 4) + return 4; + + return TM.getTargetData().getTypeSize(Ty); + } + + + inline const std::string + TypeToDataDirective(const Type* type) { + switch(type->getTypeID()) { + case Type::BoolTyID: case Type::UByteTyID: case Type::SByteTyID: + return ".byte"; + case Type::UShortTyID: case Type::ShortTyID: + return ".half"; + case Type::UIntTyID: case Type::IntTyID: + return ".word"; + case Type::ULongTyID: case Type::LongTyID: case Type::PointerTyID: + return ".xword"; + case Type::FloatTyID: + return ".word"; + case Type::DoubleTyID: + return ".xword"; + case Type::ArrayTyID: + if (ArrayTypeIsString((ArrayType*) type)) + return ".ascii"; + else + return ""; + default: + return ""; + } + } + + /// Get the size of the constant for the given target. + /// If this is an unsized array, return 0. + /// + inline unsigned int + ConstantToSize(const Constant* CV, const TargetMachine& target) { + if (const ConstantArray* CVA = dyn_cast(CV)) { + const ArrayType *aty = cast(CVA->getType()); + if (ArrayTypeIsString(aty)) + return 1 + CVA->getNumOperands(); + } + + return findOptimalStorageSize(target, CV->getType()); + } + + /// Align data larger than one L1 cache line on L1 cache line boundaries. + /// Align all smaller data on the next higher 2^x boundary (4, 8, ...). + /// + inline unsigned int + SizeToAlignment(unsigned int size, const TargetMachine& target) { + const unsigned short cacheLineSize = 16; + if (size > (unsigned) cacheLineSize / 2) + return cacheLineSize; + else + for (unsigned sz=1; /*no condition*/; sz *= 2) + if (sz >= size) + return sz; + } + + /// Get the size of the type and then use SizeToAlignment. + /// + inline unsigned int + TypeToAlignment(const Type* type, const TargetMachine& target) { + return SizeToAlignment(findOptimalStorageSize(target, type), target); + } + + /// Get the size of the constant and then use SizeToAlignment. + /// Handles strings as a special case; + inline unsigned int + ConstantToAlignment(const Constant* CV, const TargetMachine& target) { + if (const ConstantArray* CVA = dyn_cast(CV)) + if (ArrayTypeIsString(cast(CVA->getType()))) + return SizeToAlignment(1 + CVA->getNumOperands(), target); + + return TypeToAlignment(CV->getType(), target); + } + +} // End anonymous namespace namespace { - struct SparcV9AsmPrinter : public AsmPrinter { + enum Sections { + Unknown, + Text, + ReadOnlyData, + InitRWData, + ZeroInitRWData, + }; + + class AsmPrinter { + // Mangle symbol names appropriately + Mangler *Mang; + public: - enum Sections { - Unknown, - Text, - ReadOnlyData, - InitRWData, - ZeroInitRWData, - } CurSection; - - SparcV9AsmPrinter(std::ostream &OS, TargetMachine &TM) - : AsmPrinter(OS, TM), CurSection(Unknown) { - ZeroDirective = 0; // No way to get zeros. - Data16bitsDirective = "\t.half\t"; - Data32bitsDirective = "\t.word\t"; - Data64bitsDirective = "\t.xword\t"; - CommentString = "!"; + std::ostream &O; + const TargetMachine &TM; + + enum Sections CurSection; + + AsmPrinter(std::ostream &os, const TargetMachine &T) + : /* idTable(0), */ O(os), TM(T), CurSection(Unknown) {} + + ~AsmPrinter() { + delete Mang; } - const char *getPassName() const { - return "SparcV9 Assembly Printer"; + // (start|end)(Module|Function) - Callback methods invoked by subclasses + void startModule(Module &M) { + Mang = new Mangler(M); + } + + void PrintZeroBytesToPad(int numBytes) { + // + // Always use single unsigned bytes for padding. We don't know upon + // what data size the beginning address is aligned, so using anything + // other than a byte may cause alignment errors in the assembler. + // + while (numBytes--) + printSingleConstantValue(Constant::getNullValue(Type::UByteTy)); } + /// Print a single constant value. + /// + void printSingleConstantValue(const Constant* CV); + + /// Print a constant value or values (it may be an aggregate). + /// Uses printSingleConstantValue() to print each individual value. + /// + void printConstantValueOnly(const Constant* CV, int numPadBytesAfter = 0); + // Print a constant (which may be an aggregate) prefixed by all the // appropriate directives. Uses printConstantValueOnly() to print the // value or values. - void printConstant(const Constant* CV, const std::string &valID) { - emitAlignment(TM.getTargetData().getTypeAlignmentShift(CV->getType())); + void printConstant(const Constant* CV, std::string valID = "") { + if (valID.length() == 0) + valID = getID(CV); + + O << "\t.align\t" << ConstantToAlignment(CV, TM) << "\n"; + + // Print .size and .type only if it is not a string. + if (const ConstantArray *CVA = dyn_cast(CV)) + if (CVA->isString()) { + // print it as a string and return + O << valID << ":\n"; + O << "\t" << ".ascii" << "\t" << getAsCString(CVA) << "\n"; + return; + } + O << "\t.type" << "\t" << valID << ",#object\n"; - unsigned constSize = TM.getTargetData().getTypeSize(CV->getType()); - O << "\t.size" << "\t" << valID << "," << constSize << "\n"; + unsigned int constSize = ConstantToSize(CV, TM); + if (constSize) + O << "\t.size" << "\t" << valID << "," << constSize << "\n"; O << valID << ":\n"; - emitGlobalConstant(CV); + printConstantValueOnly(CV); } // enterSection - Use this method to enter a different section of the output @@ -122,19 +279,258 @@ return ""; } - virtual bool runOnMachineFunction(MachineFunction &MF) { - setupMachineFunction(MF); - emitFunction(MF); + // Combines expressions + inline std::string ConstantArithExprToString(const ConstantExpr* CE, + const TargetMachine &TM, + const std::string &op) { + return "(" + valToExprString(CE->getOperand(0), TM) + op + + valToExprString(CE->getOperand(1), TM) + ")"; + } + + /// ConstantExprToString() - Convert a ConstantExpr to an asm expression + /// and return this as a string. + /// + std::string ConstantExprToString(const ConstantExpr* CE, + const TargetMachine& target); + + /// valToExprString - Helper function for ConstantExprToString(). + /// Appends result to argument string S. + /// + std::string valToExprString(const Value* V, const TargetMachine& target); + }; +} // End anonymous namespace + + +/// Print a single constant value. +/// +void AsmPrinter::printSingleConstantValue(const Constant* CV) { + assert(CV->getType() != Type::VoidTy && + CV->getType() != Type::LabelTy && + "Unexpected type for Constant"); + + assert((!isa(CV) && ! isa(CV)) + && "Aggregate types should be handled outside this function"); + + O << "\t" << TypeToDataDirective(CV->getType()) << "\t"; + + if (const GlobalValue* GV = dyn_cast(CV)) { + O << getID(GV) << "\n"; + } else if (isa(CV)) { + // Null pointer value + O << "0\n"; + } else if (const ConstantExpr* CE = dyn_cast(CV)) { + // Constant expression built from operators, constants, and symbolic addrs + O << ConstantExprToString(CE, TM) << "\n"; + } else if (CV->getType()->isPrimitiveType()) { + // Check primitive types last + if (CV->getType()->isFloatingPoint()) { + // FP Constants are printed as integer constants to avoid losing + // precision... + double Val = cast(CV)->getValue(); + if (CV->getType() == Type::FloatTy) { + float FVal = (float)Val; + char *ProxyPtr = (char*)&FVal; // Abide by C TBAA rules + O << *(unsigned int*)ProxyPtr; + } else if (CV->getType() == Type::DoubleTy) { + char *ProxyPtr = (char*)&Val; // Abide by C TBAA rules + O << *(uint64_t*)ProxyPtr; + } else { + assert(0 && "Unknown floating point type!"); + } + + O << "\t! " << CV->getType()->getDescription() + << " value: " << Val << "\n"; + } else if (const ConstantBool *CB = dyn_cast(CV)) { + O << (int)CB->getValue() << "\n"; + } else { + WriteAsOperand(O, CV, false, false) << "\n"; + } + } else { + assert(0 && "Unknown elementary type for constant"); + } +} + +/// Print a constant value or values (it may be an aggregate). +/// Uses printSingleConstantValue() to print each individual value. +/// +void AsmPrinter::printConstantValueOnly(const Constant* CV, + int numPadBytesAfter) { + if (const ConstantArray *CVA = dyn_cast(CV)) { + if (CVA->isString()) { + // print the string alone and return + O << "\t" << ".ascii" << "\t" << getAsCString(CVA) << "\n"; + } else { + // Not a string. Print the values in successive locations + for (unsigned i = 0, e = CVA->getNumOperands(); i != e; ++i) + printConstantValueOnly(CVA->getOperand(i)); + } + } else if (const ConstantStruct *CVS = dyn_cast(CV)) { + // Print the fields in successive locations. Pad to align if needed! + const StructLayout *cvsLayout = + TM.getTargetData().getStructLayout(CVS->getType()); + unsigned sizeSoFar = 0; + for (unsigned i = 0, e = CVS->getNumOperands(); i != e; ++i) { + const Constant* field = CVS->getOperand(i); + + // Check if padding is needed and insert one or more 0s. + unsigned fieldSize = + TM.getTargetData().getTypeSize(field->getType()); + int padSize = ((i == e-1? cvsLayout->StructSize + : cvsLayout->MemberOffsets[i+1]) + - cvsLayout->MemberOffsets[i]) - fieldSize; + sizeSoFar += (fieldSize + padSize); + + // Now print the actual field value + printConstantValueOnly(field, padSize); + } + assert(sizeSoFar == cvsLayout->StructSize && + "Layout of constant struct may be incorrect!"); + } else if (isa(CV)) { + PrintZeroBytesToPad(TM.getTargetData().getTypeSize(CV->getType())); + } else + printSingleConstantValue(CV); + + if (numPadBytesAfter) + PrintZeroBytesToPad(numPadBytesAfter); +} + +/// ConstantExprToString() - Convert a ConstantExpr to an asm expression +/// and return this as a string. +/// +std::string AsmPrinter::ConstantExprToString(const ConstantExpr* CE, + const TargetMachine& target) { + std::string S; + switch(CE->getOpcode()) { + case Instruction::GetElementPtr: + { // generate a symbolic expression for the byte address + const Value* ptrVal = CE->getOperand(0); + std::vector idxVec(CE->op_begin()+1, CE->op_end()); + const TargetData &TD = target.getTargetData(); + S += "(" + valToExprString(ptrVal, target) + ") + (" + + utostr(TD.getIndexedOffset(ptrVal->getType(),idxVec)) + ")"; + break; + } + + case Instruction::Cast: + // Support only non-converting casts for now, i.e., a no-op. + // This assertion is not a complete check. + assert(target.getTargetData().getTypeSize(CE->getType()) == + target.getTargetData().getTypeSize(CE->getOperand(0)->getType())); + S += "(" + valToExprString(CE->getOperand(0), target) + ")"; + break; + + case Instruction::Add: + S += ConstantArithExprToString(CE, target, ") + ("); + break; + + case Instruction::Sub: + S += ConstantArithExprToString(CE, target, ") - ("); + break; + + case Instruction::Mul: + S += ConstantArithExprToString(CE, target, ") * ("); + break; + + case Instruction::Div: + S += ConstantArithExprToString(CE, target, ") / ("); + break; + + case Instruction::Rem: + S += ConstantArithExprToString(CE, target, ") % ("); + break; + + case Instruction::And: + // Logical && for booleans; bitwise & otherwise + S += ConstantArithExprToString(CE, target, + ((CE->getType() == Type::BoolTy)? ") && (" : ") & (")); + break; + + case Instruction::Or: + // Logical || for booleans; bitwise | otherwise + S += ConstantArithExprToString(CE, target, + ((CE->getType() == Type::BoolTy)? ") || (" : ") | (")); + break; + + case Instruction::Xor: + // Bitwise ^ for all types + S += ConstantArithExprToString(CE, target, ") ^ ("); + break; + + default: + assert(0 && "Unsupported operator in ConstantExprToString()"); + break; + } + + return S; +} + +/// valToExprString - Helper function for ConstantExprToString(). +/// Appends result to argument string S. +/// +std::string AsmPrinter::valToExprString(const Value* V, + const TargetMachine& target) { + std::string S; + bool failed = false; + if (const GlobalValue* GV = dyn_cast(V)) { + S += getID(GV); + } else if (const Constant* CV = dyn_cast(V)) { // symbolic or known + if (const ConstantBool *CB = dyn_cast(CV)) + S += std::string(CB == ConstantBool::True ? "1" : "0"); + else if (const ConstantSInt *CI = dyn_cast(CV)) + S += itostr(CI->getValue()); + else if (const ConstantUInt *CI = dyn_cast(CV)) + S += utostr(CI->getValue()); + else if (const ConstantFP *CFP = dyn_cast(CV)) + S += ftostr(CFP->getValue()); + else if (isa(CV)) + S += "0"; + else if (const ConstantExpr *CE = dyn_cast(CV)) + S += ConstantExprToString(CE, target); + else + failed = true; + } else + failed = true; + + if (failed) { + assert(0 && "Cannot convert value to string"); + S += ""; + } + return S; +} + +namespace { + + struct SparcV9AsmPrinter : public FunctionPass, public AsmPrinter { + inline SparcV9AsmPrinter(std::ostream &os, const TargetMachine &t) + : AsmPrinter(os, t) {} + + const Function *currFunction; + + const char *getPassName() const { + return "Output SparcV9 Assembly for Functions"; + } + + virtual bool doInitialization(Module &M) { + startModule(M); + return false; + } + + virtual bool runOnFunction(Function &F) { + currFunction = &F; + emitFunction(F); return false; } virtual bool doFinalization(Module &M) { emitGlobals(M); - AsmPrinter::doFinalization(M); return false; } - void emitFunction(MachineFunction &F); + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesAll(); + } + + void emitFunction(const Function &F); private : void emitBasicBlock(const MachineBasicBlock &MBB); void emitMachineInst(const MachineInstr *MI); @@ -241,7 +637,8 @@ case MachineOperand::MO_ConstantPoolIndex: { - O << ".CPI_" << CurrentFnName << "_" << mop.getConstantPoolIndex(); + O << ".CPI_" << getID(currFunction) + << "_" << mop.getConstantPoolIndex(); break; } @@ -315,7 +712,9 @@ O << "\n"; // Separate BB's with newlines } -void SparcV9AsmPrinter::emitFunction(MachineFunction &MF) { +void SparcV9AsmPrinter::emitFunction(const Function &F) { + std::string CurrentFnName = getID(&F); + MachineFunction &MF = MachineFunction::get(&F); O << "!****** Outputing Function: " << CurrentFnName << " ******\n"; // Emit constant pool for this function @@ -354,11 +753,11 @@ if (GV->hasInitializer() && ! GV->getInitializer()->isNullValue()) { printConstant(GV->getInitializer(), getID(GV)); } else { - const Type *ValTy = GV->getType()->getElementType(); - emitAlignment(TM.getTargetData().getTypeAlignmentShift(ValTy)); + O << "\t.align\t" << TypeToAlignment(GV->getType()->getElementType(), + TM) << "\n"; O << "\t.type\t" << getID(GV) << ",#object\n"; O << "\t.reserve\t" << getID(GV) << "," - << TM.getTargetData().getTypeSize(GV->getType()->getElementType()) + << findOptimalStorageSize(TM, GV->getType()->getElementType()) << "\n"; } } From gaeke at cs.uiuc.edu Fri Sep 10 14:20:17 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Fri, 10 Sep 2004 14:20:17 -0500 Subject: [llvm-commits] CVS: llvm/autoconf/config.guess config.sub Message-ID: <200409101920.OAA25504@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: config.guess updated: 1.1 -> 1.2 config.sub updated: 1.1 -> 1.2 --- Log message: Update to latest versions of config.guess and config.sub from http://savannah.gnu.org/projects/config --- Diffs of the changes: (+194 -69) Index: llvm/autoconf/config.guess diff -u llvm/autoconf/config.guess:1.1 llvm/autoconf/config.guess:1.2 --- llvm/autoconf/config.guess:1.1 Tue Jul 22 14:13:20 2003 +++ llvm/autoconf/config.guess Fri Sep 10 14:20:06 2004 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-02-22' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -106,6 +106,7 @@ : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; @@ -196,15 +197,21 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -220,25 +227,33 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -276,11 +291,12 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -303,6 +319,9 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -320,6 +339,9 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -392,6 +414,9 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -727,7 +752,7 @@ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -735,6 +760,11 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -745,18 +775,7 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -767,8 +786,8 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -789,17 +808,34 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -875,6 +911,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -932,6 +971,9 @@ LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 @@ -962,6 +1004,9 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1031,9 +1076,9 @@ M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1131,9 +1176,10 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1148,7 +1194,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1189,6 +1235,19 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 Index: llvm/autoconf/config.sub diff -u llvm/autoconf/config.sub:1.1 llvm/autoconf/config.sub:1.2 --- llvm/autoconf/config.sub:1.1 Tue Jul 22 14:13:20 2003 +++ llvm/autoconf/config.sub Fri Sep 10 14:20:06 2004 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2003-02-22' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -118,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -228,14 +229,15 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -247,6 +249,7 @@ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ @@ -259,9 +262,9 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -297,15 +300,15 @@ | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -319,11 +322,13 @@ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -332,7 +337,7 @@ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -359,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -373,6 +381,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -432,12 +446,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -638,10 +667,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -722,10 +747,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -737,6 +758,10 @@ basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -768,18 +793,24 @@ pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -838,6 +869,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -845,6 +880,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -919,10 +957,6 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -948,6 +982,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1021,6 +1059,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1043,7 +1084,7 @@ sh64) basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1116,19 +1157,20 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1152,6 +1194,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1164,6 +1209,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1185,6 +1233,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1207,6 +1258,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1274,6 +1328,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1320,6 +1377,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1452,9 +1512,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; From criswell at cs.uiuc.edu Fri Sep 10 15:04:24 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 15:04:24 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/kimwitu++/main.cc Message-ID: <200409102004.PAA29173@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications/kimwitu++: main.cc updated: 1.1 -> 1.2 --- Log message: Remove the use of getopt_long() (which we don't use for testing anyway). This allows kimwitu++ to easily compile on other platforms. --- Diffs of the changes: (+3 -3) Index: llvm-test/MultiSource/Applications/kimwitu++/main.cc diff -u llvm-test/MultiSource/Applications/kimwitu++/main.cc:1.1 llvm-test/MultiSource/Applications/kimwitu++/main.cc:1.2 --- llvm-test/MultiSource/Applications/kimwitu++/main.cc:1.1 Tue Apr 6 15:25:13 2004 +++ llvm-test/MultiSource/Applications/kimwitu++/main.cc Fri Sep 10 15:04:11 2004 @@ -39,7 +39,7 @@ #ifndef RCSMAKEID # define RCSMAKEID "@(#) Makefile version unknown" #endif -static char kimwc_cAccesSid[] = "@(#)$Id: main.cc,v 1.1 2004/04/06 20:25:13 criswell Exp $"; +static char kimwc_cAccesSid[] = "@(#)$Id: main.cc,v 1.2 2004/09/10 20:04:11 criswell Exp $"; static char kimwitu_release[] = KIMWITURELEASE; // defined in Makefile static char kimwitu_version[] = KIMWITUVERSIONSTRING; // defined in Makefile static char Makefile_AccesSid[] = RCSMAKEID; // defined in Makefile @@ -297,7 +297,7 @@ }; int c; - while ((c = getopt_long (argc, argv, + while ((c = getopt (argc, argv, "c" "r" "u" @@ -320,7 +320,7 @@ "W::" "h" "V" - , long_options, 0)) != -1) + )) != -1) switch (c) { case 'V': print_version(); From criswell at cs.uiuc.edu Fri Sep 10 15:06:09 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 15:06:09 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/Makefile Message-ID: <200409102006.PAA29185@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications: Makefile updated: 1.13 -> 1.14 --- Log message: Upgrade kimwitu++ to full test status. I believe the native kimwitu++ compiles on Linux, Solaris, and MacOS X. --- Diffs of the changes: (+2 -2) Index: llvm-test/MultiSource/Applications/Makefile diff -u llvm-test/MultiSource/Applications/Makefile:1.13 llvm-test/MultiSource/Applications/Makefile:1.14 --- llvm-test/MultiSource/Applications/Makefile:1.13 Fri Sep 10 09:26:21 2004 +++ llvm-test/MultiSource/Applications/Makefile Fri Sep 10 15:05:56 2004 @@ -4,9 +4,9 @@ include $(LEVEL)/Makefile.common -PARALLEL_DIRS = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc +PARALLEL_DIRS = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc kimwitu++ ifeq ($(OS),Linux) -PARALLEL_DIRS += kimwitu++ obsequi hexxagon +PARALLEL_DIRS += obsequi hexxagon endif include $(LEVEL)/Makefile.programs From alkis at cs.uiuc.edu Fri Sep 10 15:15:37 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Fri, 10 Sep 2004 15:15:37 -0500 Subject: [llvm-commits] CVS: llvm-java/docs/object-layout.txt Message-ID: <200409102015.PAA26239@zion.cs.uiuc.edu> Changes in directory llvm-java/docs: object-layout.txt updated: 1.3 -> 1.4 --- Log message: Update the struct types. --- Diffs of the changes: (+10 -7) Index: llvm-java/docs/object-layout.txt diff -u llvm-java/docs/object-layout.txt:1.3 llvm-java/docs/object-layout.txt:1.4 --- llvm-java/docs/object-layout.txt:1.3 Wed Sep 8 15:10:09 2004 +++ llvm-java/docs/object-layout.txt Fri Sep 10 15:15:27 2004 @@ -46,10 +46,13 @@ this interface in the objects interfaces array. struct llvm_java_object_typeinfo { - uint depth; - struct llvm_java_object_vtable* vtables; - uint lastIface; - struct llvm_java_object_vtable* interfaces; + unsigned depth; + struct llvm_java_object_vtable** vtables; + unsigned lastIface; + union { + struct llvm_java_object_vtable** interfaces; + unsigned interfaceFlag; + }; }; The structure of llvm_java_object_typeinfo allows constant time @@ -61,11 +64,11 @@ if (objClazz == clazz) return 1; // we are checking against a class' typeinfo - if (clazz->typeinfo.interfaces != (struct llvm_java_object_vtable*)-1) + if (clazz->typeinfo.interfaceFlag != (unsigned)-1) return objClazz->typeinfo.depth > clazz->typeinfo.depth && - &objClazz->typeinfo.vtables[clazz->typeinfo.depth] == clazz; + objClazz->typeinfo.vtables[clazz->typeinfo.depth] == clazz; // otherwise we are checking against an interface's typeinfo else return objClazz->typeinfo.lastIface >= clazz->typeinfo.lastIface && - &objClazz->typeinfo.interfaces[clazz->typeinfo.lastIface]; + objClazz->typeinfo.interfaces[clazz->typeinfo.lastIface]; } From alkis at cs.uiuc.edu Fri Sep 10 15:21:27 2004 From: alkis at cs.uiuc.edu (Alkis Evlogimenos) Date: Fri, 10 Sep 2004 15:21:27 -0500 Subject: [llvm-commits] CVS: llvm-java/docs/object-layout.txt Message-ID: <200409102021.PAA26352@zion.cs.uiuc.edu> Changes in directory llvm-java/docs: object-layout.txt updated: 1.4 -> 1.5 --- Log message: Update to how typeinfo is implemented. --- Diffs of the changes: (+6 -4) Index: llvm-java/docs/object-layout.txt diff -u llvm-java/docs/object-layout.txt:1.4 llvm-java/docs/object-layout.txt:1.5 --- llvm-java/docs/object-layout.txt:1.4 Fri Sep 10 15:15:27 2004 +++ llvm-java/docs/object-layout.txt Fri Sep 10 15:21:16 2004 @@ -43,15 +43,17 @@ used to differentiate between class typeinfo's and interface typeinfo's. More specifically if interfaces == -1 then this typeinfo is for an interface and the lastIface field is the unique number of -this interface in the objects interfaces array. +this interface in the objects interfaces array. The field lastIface is +the max index of all implemented interfaces. For a class that doesn't +implement any it is -1. struct llvm_java_object_typeinfo { unsigned depth; struct llvm_java_object_vtable** vtables; - unsigned lastIface; + int lastIface; union { struct llvm_java_object_vtable** interfaces; - unsigned interfaceFlag; + int interfaceFlag; }; }; @@ -64,7 +66,7 @@ if (objClazz == clazz) return 1; // we are checking against a class' typeinfo - if (clazz->typeinfo.interfaceFlag != (unsigned)-1) + if (clazz->typeinfo.interfaceFlag != -1) return objClazz->typeinfo.depth > clazz->typeinfo.depth && objClazz->typeinfo.vtables[clazz->typeinfo.depth] == clazz; // otherwise we are checking against an interface's typeinfo From criswell at cs.uiuc.edu Fri Sep 10 15:56:33 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 15:56:33 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/hexxagon/Makefile hexxagon.cpp Message-ID: <200409102056.PAA00426@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications/hexxagon: Makefile updated: 1.1 -> 1.2 hexxagon.cpp updated: 1.1 -> 1.2 --- Log message: Removed the need for GNU readline. --- Diffs of the changes: (+7 -12) Index: llvm-test/MultiSource/Applications/hexxagon/Makefile diff -u llvm-test/MultiSource/Applications/hexxagon/Makefile:1.1 llvm-test/MultiSource/Applications/hexxagon/Makefile:1.2 --- llvm-test/MultiSource/Applications/hexxagon/Makefile:1.1 Fri Sep 10 09:25:52 2004 +++ llvm-test/MultiSource/Applications/hexxagon/Makefile Fri Sep 10 15:56:20 2004 @@ -1,7 +1,7 @@ LEVEL = ../../.. PROG = hexxagon REQUIRES_EH_SUPPORT = 1 -LDFLAGS += -lstdc++ -lreadline -ltermcap -LIBS += -lstdc++ -lreadline -ltermcap +LDFLAGS += -lstdc++ -ltermcap +LIBS += -lstdc++ -ltermcap STDIN_FILENAME=$(BUILD_SRC_DIR)/input include ../../Makefile.multisrc Index: llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp diff -u llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp:1.1 llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp:1.2 --- llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp:1.1 Fri Sep 10 09:25:52 2004 +++ llvm-test/MultiSource/Applications/hexxagon/hexxagon.cpp Fri Sep 10 15:56:20 2004 @@ -22,8 +22,6 @@ #include #include -#include -#include #include #include @@ -157,6 +155,8 @@ int level = 4; int time = 12; + int llvm_index; + printf("Hexxagon board game.\n"); printf("Copyright 2001.\n"); printf("Erik Jonsson.\n"); @@ -167,11 +167,10 @@ char *input = 0; - while(!quit) + for (llvm_index = 0; llvm_index < 1; llvm_index++) { - char *tmp = readline("Hexxagon (\"help\" for help):"); - stripFromDblSpace(tmp); - + char * tmp = "newgame CC"; + int len = strlen(tmp); if(len && tmp[len - 1] == ' ') tmp[len - 1] = 0; @@ -180,11 +179,9 @@ { if(input) printf("Repeating last command.\n"); - free(tmp); } else { - free(input); input = tmp; } @@ -431,6 +428,4 @@ else printf("Unknown command, try \"help\" for a list of commands.\n"); } - - free(input); } From criswell at cs.uiuc.edu Fri Sep 10 17:08:16 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Fri, 10 Sep 2004 17:08:16 -0500 Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/Makefile Message-ID: <200409102208.RAA12545@choi.cs.uiuc.edu> Changes in directory llvm-test/MultiSource/Applications: Makefile updated: 1.14 -> 1.15 --- Log message: Enabled hexxagon for all platforms except Darwin (now ftime(). Tsk, tsk). Keep Obsequi as a Linux only program, as it appears to have been written with only Linux in mind. Both of these issues can be fixed, but it will take more time. --- Diffs of the changes: (+8 -1) Index: llvm-test/MultiSource/Applications/Makefile diff -u llvm-test/MultiSource/Applications/Makefile:1.14 llvm-test/MultiSource/Applications/Makefile:1.15 --- llvm-test/MultiSource/Applications/Makefile:1.14 Fri Sep 10 15:05:56 2004 +++ llvm-test/MultiSource/Applications/Makefile Fri Sep 10 17:08:03 2004 @@ -5,8 +5,15 @@ include $(LEVEL)/Makefile.common PARALLEL_DIRS = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc kimwitu++ + +# All platforms except Darwin should be able to handle hexxagon +ifneq ($(OS),Darwin) +PARALLEL_DIRS += hexxagon +endif + +# Obsequi uses Linux-only features; need to fix that ifeq ($(OS),Linux) -PARALLEL_DIRS += obsequi hexxagon +PARALLEL_DIRS += obsequi endif include $(LEVEL)/Makefile.programs From reid at x10sys.com Fri Sep 10 23:14:18 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:14:18 -0500 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/Analyzer.cpp Message-ID: <200409110414.XAA27859@zion.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: Analyzer.cpp updated: 1.16 -> 1.17 --- Log message: Print the dependent libraries when dumping bytecode. --- Diffs of the changes: (+2 -0) Index: llvm/lib/Bytecode/Reader/Analyzer.cpp diff -u llvm/lib/Bytecode/Reader/Analyzer.cpp:1.16 llvm/lib/Bytecode/Reader/Analyzer.cpp:1.17 --- llvm/lib/Bytecode/Reader/Analyzer.cpp:1.16 Thu Aug 26 19:43:51 2004 +++ llvm/lib/Bytecode/Reader/Analyzer.cpp Fri Sep 10 23:14:07 2004 @@ -224,6 +224,8 @@ virtual void handleDependentLibrary(const std::string& libName) { bca.numLibraries++; bca.libSize += libName.size() + (libName.size() < 128 ? 1 : 2); + if (os) + *os << " Library: '" << libName << "'\n"; } virtual void handleModuleGlobalsEnd() { From reid at x10sys.com Fri Sep 10 23:15:20 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:15:20 -0500 Subject: [llvm-commits] CVS: llvm/projects/Stacker/test/Makefile Message-ID: <200409110415.XAA27879@zion.cs.uiuc.edu> Changes in directory llvm/projects/Stacker/test: Makefile updated: 1.5 -> 1.6 --- Log message: Use llvm-link to link the .bc with testing.bc. This helps test the new llvm-link dependent libraries feature. --- Diffs of the changes: (+5 -4) Index: llvm/projects/Stacker/test/Makefile diff -u llvm/projects/Stacker/test/Makefile:1.5 llvm/projects/Stacker/test/Makefile:1.6 --- llvm/projects/Stacker/test/Makefile:1.5 Sat Sep 4 15:13:54 2004 +++ llvm/projects/Stacker/test/Makefile Fri Sep 10 23:15:09 2004 @@ -43,13 +43,14 @@ @$(ECHO) "Compiling And Optimizing $< to $*.bc" $(VERB)$(STKRC_EXEC) -f -O4 -s 2048 -o $*.bc $(BUILD_SRC_DIR)/$*.st -%.s : %.bc +%.s : %.bc testing.bc @$(ECHO) "Assembling $< to $*.s" - $(VERB)$(LLC) -f -o $*.s $*.bc + $(VERB)$(LLINK) $*.bc testing.bc -o $*.bcl + $(VERB)$(LLC) -f -o $*.s $*.bcl -% : %.s testing.s +% : %.s @$(ECHO) "Linking $*" - $(VERB)$(CC) -ggdb -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) testing.s -lstkr_runtime -o $* $*.s + $(VERB)$(CC) -ggdb -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) -lstkr_runtime -o $* $*.s %.ll : %.bc @$(ECHO) "Disassembling $< to $*.ll" From reid at x10sys.com Fri Sep 10 23:18:16 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:18:16 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/System/Process.h Message-ID: <200409110418.XAA27915@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/System: Process.h added (r1.1) --- Log message: Add methods for detecting different kinds of files by their magic number, getting the suffix for shared objects, and extracting the basename from a path. --- Diffs of the changes: (+42 -0) Index: llvm/include/llvm/System/Process.h diff -c /dev/null llvm/include/llvm/System/Process.h:1.1 *** /dev/null Fri Sep 10 23:18:15 2004 --- llvm/include/llvm/System/Process.h Fri Sep 10 23:18:05 2004 *************** *** 0 **** --- 1,42 ---- + //===- llvm/System/Process.h ------------------------------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file declares the llvm::sys::Process class. + // + //===----------------------------------------------------------------------===// + + #ifndef LLVM_SYSTEM_PROCESS_H + #define LLVM_SYSTEM_PROCESS_H + + namespace llvm { + namespace sys { + + /// This class provides an abstraction for getting information about the + /// currently executing process. + /// @since 1.4 + /// @brief An abstraction for operating system processes. + class Process { + /// @name Accessors + /// @{ + public: + /// This static function will return the operating system's virtual memory + /// page size. + /// @returns The number of bytes in a virtual memory page. + /// @throws nothing + /// @brief Get the virtual memory page size + static unsigned GetPageSize(); + + /// @} + }; + } + } + + // vim: sw=2 + + #endif From reid at x10sys.com Fri Sep 10 23:19:28 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:19:28 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/System/Path.h Message-ID: <200409110419.XAA27929@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/System: Path.h updated: 1.4 -> 1.5 --- Log message: Add methods for detecting file types by magic number, getting the file name suffix for shared objects, and stripping a path down to its base name. --- Diffs of the changes: (+38 -1) Index: llvm/include/llvm/System/Path.h diff -u llvm/include/llvm/System/Path.h:1.4 llvm/include/llvm/System/Path.h:1.5 --- llvm/include/llvm/System/Path.h:1.4 Sun Aug 29 00:24:00 2004 +++ llvm/include/llvm/System/Path.h Fri Sep 10 23:19:17 2004 @@ -1,4 +1,4 @@ -//===- llvm/System/Path.h ---------------------------------------*- C++ -*-===// +//===- llvm/System/Path.h - Path Operating System Concept -------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -104,6 +104,14 @@ /// @brief Construct a path to the current user's "home" directory static Path GetUserHomeDirectory(); + /// Return the suffix commonly used on file names that contain a shared + /// object, shared archive, or dynamic link library. Such files are + /// linked at runtime into a process and their code images are shared + /// between processes. + /// @returns The dynamic link library suffix for the current platform. + /// @brief Return the dynamic link library suffix. + static std::string GetDLLSuffix(); + /// This is one of the very few ways in which a path can be constructed /// with a syntactically invalid name. The only *legal* invalid name is an /// empty one. Other invalid names are not permitted. Empty paths are @@ -207,6 +215,28 @@ /// @brief Determines if the path references the root directory. bool is_root_directory() const; + /// This function opens the file associated with the path name provided by + /// the Path object and reads its magic number. If the magic number at the + /// start of the file matches \p magic, true is returned. In all other + /// cases (file not found, file not accessible, etc.) it returns false. + /// @returns true if the magic number of the file matches \p magic. + /// @brief Determine if file has a specific magic number + bool has_magic_number(const std::string& magic) const; + + /// This function determines if the path name in the object references an + /// archive file by looking at its magic number. + /// @returns true if the file starts with the magic number for an archive + /// file. + /// @brief Determine if the path references an archive file. + bool is_archive() const; + + /// This function determines if the path name in the object references an + /// LLVM Bytecode file by looking at its magic number. + /// @returns true if the file starts with the magic number for LLVM + /// bytecode files. + /// @brief Determine if the path references a bytecode file. + bool is_bytecode_file() const; + /// This function determines if the path name references an existing file /// or directory in the file system. Unlike is_file and is_directory, this /// function actually checks for the existence of the file or directory. @@ -258,6 +288,13 @@ /// @brief Returns the last component of the path name. std::string getLast() const; + /// This function strips off the path and suffix of the file name and + /// returns just the basename. + /// @returns std::string containing the basename of the path + /// @throws nothing + /// @brief Get the base name of the path + std::string get_basename() const; + /// @returns a c string containing the path name. /// @brief Returns the path as a C string. const char* const c_str() const { return path.c_str(); } From reid at x10sys.com Fri Sep 10 23:21:08 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:21:08 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/System/Memory.h Message-ID: <200409110421.XAA27957@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/System: Memory.h added (r1.1) --- Log message: Initial commit of a file to declare the interface for platform independent support for various memory allocation operations. --- Diffs of the changes: (+53 -0) Index: llvm/include/llvm/System/Memory.h diff -c /dev/null llvm/include/llvm/System/Memory.h:1.1 *** /dev/null Fri Sep 10 23:21:08 2004 --- llvm/include/llvm/System/Memory.h Fri Sep 10 23:20:58 2004 *************** *** 0 **** --- 1,53 ---- + //===- llvm/System/Memory.h - Memory Support --------------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file declares the llvm::sys::Memory class. + // + //===----------------------------------------------------------------------===// + + #ifndef LLVM_SYSTEM_PATH_H + #define LLVM_SYSTEM_PATH_H + + #include + + namespace llvm { + namespace sys { + + /// This class provides an abstraction for various memory handling functions + /// @since 1.4 + /// @brief An abstraction for operating system paths. + class Memory { + /// @name Functions + /// @{ + public: + Memory() { Address = 0; AllocSize = 0; } + ~Memory() { ReleaseRWX(*this); } + + /// @throws std::string if an error occurred + static void* AllocateRWX(Memory& block, unsigned NumBytes); + + /// @throws std::string if an error occurred + static void ReleaseRWX(Memory& block); + + char* base() const { return reinterpret_cast(Address); } + unsigned size() const { return AllocSize; } + /// @} + /// @name Data + /// @{ + private: + void * Address; // Address of first byte of memory area + unsigned AllocSize; // Size, in bytes of the memory area + /// @} + }; + } + } + + // vim: sw=2 + + #endif From reid at x10sys.com Fri Sep 10 23:22:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:22:24 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/Module.h Message-ID: <200409110422.XAA27974@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm: Module.h updated: 1.49 -> 1.50 --- Log message: Make the dependent libraries list use a SetVector instead of a regular vector so that duplicate libraries never occur within a module. --- Diffs of the changes: (+4 -3) Index: llvm/include/llvm/Module.h diff -u llvm/include/llvm/Module.h:1.49 llvm/include/llvm/Module.h:1.50 --- llvm/include/llvm/Module.h:1.49 Tue Aug 24 17:47:39 2004 +++ llvm/include/llvm/Module.h Fri Sep 10 23:22:14 2004 @@ -21,6 +21,7 @@ #include "llvm/Function.h" #include "llvm/GlobalVariable.h" +#include "llvm/ADT/SetVector.h" namespace llvm { @@ -47,7 +48,7 @@ public: typedef iplist GlobalListType; typedef iplist FunctionListType; - typedef std::vector LibraryListType; + typedef SetVector LibraryListType; // Global Variable iterators... typedef GlobalListType::iterator giterator; @@ -238,10 +239,10 @@ inline unsigned lib_size() const { return LibraryList.size(); } /// @brief Add a library to the list of dependent libraries - inline void addLibrary(const std::string& Lib){ LibraryList.push_back(Lib); } + inline void addLibrary(const std::string& Lib){ LibraryList.insert(Lib); } /// @brief Remove a library from the list of dependent libraries - inline void removeLibrary(const std::string& Lib); + inline void removeLibrary(const std::string& Lib) { LibraryList.remove(Lib); } /// @brief Get all the libraries inline const LibraryListType& getLibraries() const { return LibraryList; } From reid at x10sys.com Fri Sep 10 23:23:08 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:23:08 -0500 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Message-ID: <200409110423.XAA27986@zion.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReaderWrappers.cpp updated: 1.29 -> 1.30 --- Log message: Change interface to use correct typedef so it will always compile. --- Diffs of the changes: (+1 -1) Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.29 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.30 --- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.29 Wed Sep 1 17:55:35 2004 +++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Fri Sep 10 23:22:58 2004 @@ -332,7 +332,7 @@ } bool llvm::GetBytecodeDependentLibraries(const std::string &fname, - std::vector& deplibs) { + Module::LibraryListType& deplibs) { try { std::auto_ptr AMP( getBytecodeModuleProvider(fname)); Module* M = AMP->releaseModule(); From reid at x10sys.com Fri Sep 10 23:25:27 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:25:27 -0500 Subject: [llvm-commits] CVS: llvm/lib/VMCore/Linker.cpp Message-ID: <200409110425.XAA28018@zion.cs.uiuc.edu> Changes in directory llvm/lib/VMCore: Linker.cpp updated: 1.84 -> 1.85 --- Log message: Implement support for dependent libraries. The "source" module's dependent libraries list is merged into the "destination" module's list. Also, if the source module is one of the dependent libraries, it is removed from the list. --- Diffs of the changes: (+21 -0) Index: llvm/lib/VMCore/Linker.cpp diff -u llvm/lib/VMCore/Linker.cpp:1.84 llvm/lib/VMCore/Linker.cpp:1.85 --- llvm/lib/VMCore/Linker.cpp:1.84 Fri Aug 20 19:50:59 2004 +++ llvm/lib/VMCore/Linker.cpp Fri Sep 10 23:25:17 2004 @@ -23,6 +23,7 @@ #include "llvm/SymbolTable.h" #include "llvm/Instructions.h" #include "llvm/Assembly/Writer.h" +#include "llvm/System/Path.h" #include #include using namespace llvm; @@ -835,6 +836,9 @@ // shouldn't be relied on to be consistent. // bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { + assert(Dest != 0 && "Invalid Destination module"); + assert(Src != 0 && "Invalid Source Module"); + if (Dest->getEndianness() == Module::AnyEndianness) Dest->setEndianness(Src->getEndianness()); if (Dest->getPointerSize() == Module::AnyPointerSize) @@ -847,6 +851,16 @@ Dest->getPointerSize() != Src->getPointerSize()) std::cerr << "WARNING: Linking two modules of different pointer size!\n"; + // Update the destination module's dependent libraries list with the libraries + // from the source module. There's no opportunity for duplicates here as the + // Module ensures that duplicate insertions are discarded. + Module::lib_iterator SI = Src->lib_begin(); + Module::lib_iterator SE = Src->lib_end(); + while ( SI != SE ) { + Dest->addLibrary(*SI); + ++SI; + } + // LinkTypes - Go through the symbol table of the Src module and see if any // types are named in the src module that are not named in the Dst module. // Make sure there are no type name conflicts. @@ -915,6 +929,13 @@ // if (LinkAppendingVars(Dest, AppendingVars, ErrorMsg)) return true; + // If the source library's module id is in the dependent library list of the + // destination library, remove it since that module is now linked in. + sys::Path modId; + modId.set_file(Src->getModuleIdentifier()); + if (!modId.is_empty()) + Dest->removeLibrary(modId.get_basename()); + return false; } From reid at x10sys.com Fri Sep 10 23:26:08 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:26:08 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/SetVector.h Message-ID: <200409110426.XAA28032@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/ADT: SetVector.h updated: 1.6 -> 1.7 --- Log message: Implement the remove method for deleting entries from the SetVector. --- Diffs of the changes: (+11 -0) Index: llvm/include/llvm/ADT/SetVector.h diff -u llvm/include/llvm/ADT/SetVector.h:1.6 llvm/include/llvm/ADT/SetVector.h:1.7 --- llvm/include/llvm/ADT/SetVector.h:1.6 Wed Sep 1 17:55:34 2004 +++ llvm/include/llvm/ADT/SetVector.h Fri Sep 10 23:25:58 2004 @@ -20,6 +20,7 @@ #include #include #include +#include namespace llvm { @@ -108,6 +109,16 @@ vector_.push_back(*Start); } + /// @brief Remove an item from the set vector. + void remove(const value_type& X) { + if (0 < set_.erase(X)) { + iterator I = find(vector_.begin(),vector_.end(),X); + if (I != vector_.end()) + vector_.erase(I); + } + } + + /// @returns 0 if the element is not in the SetVector, 1 if it is. /// @brief Count the number of elements of a given key in the SetVector. size_type count(const key_type &key) const { From reid at x10sys.com Fri Sep 10 23:29:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:29:24 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/Bytecode/Reader.h Message-ID: <200409110429.XAA28053@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Bytecode: Reader.h updated: 1.18 -> 1.19 --- Log message: Correct the interface of a function to use the correct typedef for an argument so that it will always compile. --- Diffs of the changes: (+2 -2) Index: llvm/include/llvm/Bytecode/Reader.h diff -u llvm/include/llvm/Bytecode/Reader.h:1.18 llvm/include/llvm/Bytecode/Reader.h:1.19 --- llvm/include/llvm/Bytecode/Reader.h:1.18 Tue Aug 24 17:49:07 2004 +++ llvm/include/llvm/Bytecode/Reader.h Fri Sep 10 23:29:13 2004 @@ -20,8 +20,8 @@ #define LLVM_BYTECODE_READER_H #include "llvm/ModuleProvider.h" +#include "llvm/Module.h" #include -#include namespace llvm { @@ -60,7 +60,7 @@ /// @returns true on success, false otherwise /// @brief Get the list of dependent libraries from a bytecode file. bool GetBytecodeDependentLibraries(const std::string &fileName, - std::vector& deplibs); + Module::LibraryListType& deplibs); /// Read bytecode files from the specfied archive (.a) file, convert them /// to Module* and provide them in the \p Objects argument. If an error From reid at x10sys.com Fri Sep 10 23:29:55 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:29:55 -0500 Subject: [llvm-commits] CVS: llvm/examples/HowToUseJIT/Makefile Message-ID: <200409110429.XAA28074@zion.cs.uiuc.edu> Changes in directory llvm/examples/HowToUseJIT: Makefile updated: 1.3 -> 1.4 --- Log message: Add library LLVMsystem.a because the JIT now needs it. --- Diffs of the changes: (+1 -1) Index: llvm/examples/HowToUseJIT/Makefile diff -u llvm/examples/HowToUseJIT/Makefile:1.3 llvm/examples/HowToUseJIT/Makefile:1.4 --- llvm/examples/HowToUseJIT/Makefile:1.3 Mon Aug 23 14:29:54 2004 +++ llvm/examples/HowToUseJIT/Makefile Fri Sep 10 23:29:44 2004 @@ -10,6 +10,6 @@ TOOLNAME = HowToUseJIT USEDLIBS = lli-jit lli-interpreter codegen executionengine x86 selectiondag \ scalaropts analysis.a transformutils.a bcreader target.a vmcore \ - support.a + support.a LLVMsystem.a include $(LEVEL)/Makefile.common From reid at x10sys.com Fri Sep 10 23:29:55 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:29:55 -0500 Subject: [llvm-commits] CVS: llvm/examples/Fibonacci/Makefile Message-ID: <200409110429.XAA28077@zion.cs.uiuc.edu> Changes in directory llvm/examples/Fibonacci: Makefile updated: 1.2 -> 1.3 --- Log message: Add library LLVMsystem.a because the JIT now needs it. --- Diffs of the changes: (+2 -2) Index: llvm/examples/Fibonacci/Makefile diff -u llvm/examples/Fibonacci/Makefile:1.2 llvm/examples/Fibonacci/Makefile:1.3 --- llvm/examples/Fibonacci/Makefile:1.2 Mon Aug 23 14:29:54 2004 +++ llvm/examples/Fibonacci/Makefile Fri Sep 10 23:29:44 2004 @@ -1,4 +1,4 @@ -##===- projects/HowToUseJIT/Makefile -----------------------*- Makefile -*-===## +##===- projects/Fibonacci/Makefile -------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -10,6 +10,6 @@ TOOLNAME = Fibonacci USEDLIBS = lli-jit lli-interpreter codegen executionengine x86 selectiondag \ scalaropts analysis.a transformutils.a bcreader target.a vmcore \ - support.a + support.a LLVMsystem.a include $(LEVEL)/Makefile.common From reid at x10sys.com Fri Sep 10 23:29:55 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:29:55 -0500 Subject: [llvm-commits] CVS: llvm/examples/ModuleMaker/Makefile Message-ID: <200409110429.XAA28080@zion.cs.uiuc.edu> Changes in directory llvm/examples/ModuleMaker: Makefile updated: 1.3 -> 1.4 --- Log message: Add library LLVMsystem.a because the JIT now needs it. --- Diffs of the changes: (+1 -1) Index: llvm/examples/ModuleMaker/Makefile diff -u llvm/examples/ModuleMaker/Makefile:1.3 llvm/examples/ModuleMaker/Makefile:1.4 --- llvm/examples/ModuleMaker/Makefile:1.3 Mon Aug 23 14:29:54 2004 +++ llvm/examples/ModuleMaker/Makefile Fri Sep 10 23:29:44 2004 @@ -8,6 +8,6 @@ ##===----------------------------------------------------------------------===## LEVEL=../.. TOOLNAME=ModuleMaker -USEDLIBS= bcwriter vmcore support.a +USEDLIBS= bcwriter vmcore support.a LLVMsystem.a include $(LEVEL)/Makefile.common From reid at x10sys.com Fri Sep 10 23:31:14 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:31:14 -0500 Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Emitter.cpp Message-ID: <200409110431.XAA28106@zion.cs.uiuc.edu> Changes in directory llvm/lib/ExecutionEngine/JIT: Emitter.cpp updated: 1.43 -> 1.44 --- Log message: Convert the Emitter to use the lib/System "Memory" interface instead of the old SystemUtils.h interface to allocate RWX blocks of memory. --- Diffs of the changes: (+5 -2) Index: llvm/lib/ExecutionEngine/JIT/Emitter.cpp diff -u llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.43 llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.44 --- llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.43 Wed Sep 1 17:55:35 2004 +++ llvm/lib/ExecutionEngine/JIT/Emitter.cpp Fri Sep 10 23:31:03 2004 @@ -22,7 +22,8 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/Debug.h" #include "llvm/ADT/Statistic.h" -#include "llvm/Support/SystemUtils.h" +#include "llvm/System/Memory.h" + using namespace llvm; namespace { @@ -37,6 +38,7 @@ /// are emitting is. This never bothers to release the memory, because when /// we are ready to destroy the JIT, the program exits. class JITMemoryManager { + sys::Memory MemBlock; // Virtual memory block allocated RWX unsigned char *MemBase; // Base of block of memory, start of stub mem unsigned char *FunctionBase; // Start of the function body area unsigned char *CurStubPtr, *CurFunctionPtr; @@ -51,7 +53,8 @@ JITMemoryManager::JITMemoryManager() { // Allocate a 16M block of memory... - MemBase = (unsigned char*)AllocateRWXMemory(16 << 20); + sys::Memory::AllocateRWX(MemBlock,(16 << 20)); + MemBase = reinterpret_cast(MemBlock.base()); FunctionBase = MemBase + 512*1024; // Use 512k for stubs // Allocate stubs backwards from the function base, allocate functions forward From reid at x10sys.com Fri Sep 10 23:32:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:32:53 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp Message-ID: <200409110432.XAA28126@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-link: llvm-link.cpp updated: 1.40 -> 1.41 --- Log message: Implement dependent library processing and search paths for them. --- Diffs of the changes: (+144 -17) Index: llvm/tools/llvm-link/llvm-link.cpp diff -u llvm/tools/llvm-link/llvm-link.cpp:1.40 llvm/tools/llvm-link/llvm-link.cpp:1.41 --- llvm/tools/llvm-link/llvm-link.cpp:1.40 Wed Sep 1 17:55:37 2004 +++ llvm/tools/llvm-link/llvm-link.cpp Fri Sep 10 23:32:42 2004 @@ -20,6 +20,8 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" +#include "llvm/System/Path.h" +#include "llvm/ADT/SetVector.h" #include #include #include @@ -46,30 +48,56 @@ LibPaths("L", cl::desc("Specify a library search path"), cl::ZeroOrMore, cl::value_desc("directory"), cl::Prefix); +static cl::list +Libraries("l", cl::desc("Specify library names to link with"), cl::ZeroOrMore, + cl::Prefix, cl::value_desc("library name")); + +// GetModule - This function is just factored out of the functions below +static inline Module* GetModule(const sys::Path& Filename) { + if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; + std::string ErrorMessage; + if (Filename.exists()) { + Module* Result = ParseBytecodeFile(Filename.get(), &ErrorMessage); + if (Result) return Result; // Load successful! + + if (Verbose) { + std::cerr << "Error opening bytecode file: '" << Filename.c_str() << "'"; + if (ErrorMessage.size()) std::cerr << ": " << ErrorMessage; + std::cerr << "\n"; + } + } else { + std::cerr << "Bytecode file: '" << Filename.c_str() + << "' does not exist.\n"; + } + return 0; +} + // LoadFile - Read the specified bytecode file in and return it. This routine // searches the link path for the specified file to try to find it... // static inline std::auto_ptr LoadFile(const std::string &FN) { - std::string Filename = FN; - std::string ErrorMessage; + sys::Path Filename; + if (!Filename.set_file(FN)) { + std::cerr << "Invalid file name: '" << Filename.c_str() << "'\n"; + return std::auto_ptr(); + } - unsigned NextLibPathIdx = 0; - bool FoundAFile = false; + if (Module* Result = GetModule(Filename)) + return std::auto_ptr(Result); - while (1) { - if (Verbose) std::cerr << "Loading '" << Filename << "'\n"; - if (getFileSize(Filename) != -1) FoundAFile = true; - Module *Result = ParseBytecodeFile(Filename, &ErrorMessage); - if (Result) return std::auto_ptr(Result); // Load successful! + bool FoundAFile = false; - if (Verbose) { - std::cerr << "Error opening bytecode file: '" << Filename << "'"; - if (ErrorMessage.size()) std::cerr << ": " << ErrorMessage; - std::cerr << "\n"; + for (unsigned i = 0; i < LibPaths.size(); i++) { + if (!Filename.set_directory(LibPaths[i])) { + std::cerr << "Invalid library path: '" << LibPaths[i] << "'\n"; + } else if (!Filename.append_file(FN)) { + std::cerr << "Invalid library path: '" << LibPaths[i] + << "/" << FN.c_str() << "'\n"; + } else if (Filename.exists()) { + FoundAFile = true; + if (Module *Result = GetModule(Filename)) + return std::auto_ptr(Result); // Load successful! } - - if (NextLibPathIdx == LibPaths.size()) break; - Filename = LibPaths[NextLibPathIdx++] + "/" + FN; } if (FoundAFile) @@ -80,8 +108,79 @@ return std::auto_ptr(); } +sys::Path GetPathForLinkageItem(const std::string& link_item, + const std::string& dir) { + sys::Path fullpath; + fullpath.set_directory(dir); + + // Try *.o + fullpath.append_file(link_item); + fullpath.append_suffix("o"); + if (fullpath.readable()) + return fullpath; + + // Try *.bc + fullpath.elide_suffix(); + fullpath.append_suffix("bc"); + if (fullpath.readable()) + return fullpath; + + // Try *.so + fullpath.elide_suffix(); + fullpath.append_suffix(sys::Path::GetDLLSuffix()); + if (fullpath.readable()) + return fullpath; + + // Try lib*.a + fullpath.set_directory(dir); + fullpath.append_file(std::string("lib") + link_item); + fullpath.append_suffix("a"); + if (fullpath.readable()) + return fullpath; + + // Didn't find one. + fullpath.clear(); + return fullpath; +} +static inline bool LoadLibrary(const std::string &FN, Module*& Result) { + Result = 0; + sys::Path Filename; + if (!Filename.set_file(FN)) { + return false; + } + if (Filename.readable() && Filename.is_bytecode_file()) { + if (Result = GetModule(Filename)) + return true; + } + + bool foundAFile = false; + + for (unsigned I = 0; I < LibPaths.size(); I++) { + sys::Path path = GetPathForLinkageItem(FN,LibPaths[I]); + if (!path.is_empty()) { + if (path.is_bytecode_file()) { + if (Result = GetModule(path)) { + return true; + } else { + // We found file but its not a valid bytecode file so we + // return false and leave Result null. + return false; + } + } else { + // We found a file, but its not a bytecode file so we return + // false and leave Result null. + return false; + } + } + } + + // We didn't find a file so we leave Result null and return + // false to indicate that the library should be just left in the + // emitted module as resolvable at runtime. + return false; +} int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); @@ -101,12 +200,40 @@ if (Verbose) std::cerr << "Linking in '" << InputFilenames[i] << "'\n"; if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - std::cerr << argv[0] << ": error linking in '" << InputFilenames[i] + std::cerr << argv[0] << ": link error in '" << InputFilenames[i] << "': " << ErrorMessage << "\n"; return 1; } } + // Get the list of dependent libraries from the composite module + const Module::LibraryListType& libs = Composite.get()->getLibraries(); + + // Iterate over the list of dependent libraries, linking them in as we + // find them + Module::LibraryListType::const_iterator I = libs.begin(); + while (I != libs.end()) { + Module* Mod = 0; + if (LoadLibrary(*I,Mod)) { + if (Mod != 0) { + std::auto_ptr M(Mod); + if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { + std::cerr << argv[0] << ": link error in '" << *I + << "': " << ErrorMessage << "\n"; + return 1; + } + } else { + std::cerr << argv[0] << ": confused loading library '" << *I + << "'. Aborting\n"; + return 2; + } + } + ++I; + } + + // TODO: Iterate over the -l list and link in any modules containing + // global symbols that have not been resolved so far. + if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get(); std::ostream *Out = &std::cout; // Default to printing to stdout... From reid at x10sys.com Fri Sep 10 23:54:17 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:54:17 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/SUS/Process.cpp Message-ID: <200409110454.XAA28236@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix/SUS: Process.cpp added (r1.1) --- Log message: Implementation of Process concept for SUSv2 platforms. --- Diffs of the changes: (+31 -0) Index: llvm/lib/System/Unix/SUS/Process.cpp diff -c /dev/null llvm/lib/System/Unix/SUS/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:54:16 2004 --- llvm/lib/System/Unix/SUS/Process.cpp Fri Sep 10 23:54:06 2004 *************** *** 0 **** --- 1,31 ---- + //===- Unix/SUS/Process.cpp - Linux Process Implementation ---- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Linux specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + #include + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only code specific to the + //=== SUS (Single Unix Specification). + //===----------------------------------------------------------------------===// + + namespace llvm { + using namespace sys; + + unsigned + Process::GetPageSize() { + static const long page_size = sysconf(_SC_PAGE_SIZE); + return static_cast(page_size); + } + + } + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:55:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:55:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Path.cpp Message-ID: <200409110455.XAA28256@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Path.cpp updated: 1.4 -> 1.5 --- Log message: Implemented support for detecting file types by magic number, stripping path and suffix to leave basename, and getting the DLL suffix. --- Diffs of the changes: (+48 -0) Index: llvm/lib/System/Unix/Path.cpp diff -u llvm/lib/System/Unix/Path.cpp:1.4 llvm/lib/System/Unix/Path.cpp:1.5 --- llvm/lib/System/Unix/Path.cpp:1.4 Wed Sep 1 17:55:35 2004 +++ llvm/lib/System/Unix/Path.cpp Fri Sep 10 23:55:08 2004 @@ -20,6 +20,7 @@ #include "Unix.h" #include #include +#include namespace llvm { using namespace sys; @@ -78,6 +79,53 @@ } bool +Path::is_file() const { + return (is_valid() && path[path.length()-1] != '/'); +} + +bool +Path::is_directory() const { + return (is_valid() && path[path.length()-1] == '/'); +} + +std::string +Path::get_basename() const { + // Find the last slash + size_t slash = path.rfind('/'); + if (slash == std::string::npos) + slash = 0; + else + slash++; + + return path.substr(slash, path.rfind('.')); +} + +bool Path::has_magic_number(const std::string &Magic) const { + size_t len = Magic.size(); + char buf[ 1 + len]; + std::ifstream f(path.c_str()); + f.read(buf, len); + buf[len] = '\0'; + return Magic == buf; +} + +bool +Path::is_bytecode_file() const { + if (readable()) { + return has_magic_number("llvm"); + } + return false; +} + +bool +Path::is_archive() const { + if (readable()) { + return has_magic_number("!\012"); + } + return false; +} + +bool Path::exists() const { return 0 == access(path.c_str(), F_OK ); } From reid at x10sys.com Fri Sep 10 23:57:07 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:57:07 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Process.cpp Message-ID: <200409110457.XAA28280@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Process.cpp added (r1.1) --- Log message: Provide a generic unix implementation of the Process abstraction. --- Diffs of the changes: (+34 -0) Index: llvm/lib/System/Unix/Process.cpp diff -c /dev/null llvm/lib/System/Unix/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:57:06 2004 --- llvm/lib/System/Unix/Process.cpp Fri Sep 10 23:56:56 2004 *************** *** 0 **** --- 1,34 ---- + //===- Unix/Process.cpp - Unix Process Implementation --------- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the generic Unix implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + #include + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only generic UNIX code that + //=== is guaranteed to work on *all* UNIX variants. + //===----------------------------------------------------------------------===// + + namespace llvm { + using namespace sys; + + unsigned + Process::GetPageSize() { + // NOTE: The getpagesize function doesn't exist in POSIX 1003.1 and is + // "deprecated" in SUSv2. Platforms including this implementation should + // consider sysconf(_SC_PAGE_SIZE) if its available. + static const int page_size = getpagesize(); + return static_cast(page_size); + } + + } + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:57:35 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:57:35 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Memory.cpp Message-ID: <200409110457.XAA28297@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Memory.cpp added (r1.1) --- Log message: Provide a generic Unix implementation of the Memory concept. --- Diffs of the changes: (+20 -0) Index: llvm/lib/System/Unix/Memory.cpp diff -c /dev/null llvm/lib/System/Unix/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:57:35 2004 --- llvm/lib/System/Unix/Memory.cpp Fri Sep 10 23:57:25 2004 *************** *** 0 **** --- 1,20 ---- + //===- Unix/Memory.cpp - Generic UNIX System Configuration ------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file defines some functions for various memory management utilities. + // + //===----------------------------------------------------------------------===// + + #include "Unix.h" + + namespace llvm { + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Linux/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28388@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Linux: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.3 -> 1.4 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+89 -0) Index: llvm/lib/System/Linux/Memory.cpp diff -c /dev/null llvm/lib/System/Linux/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Linux/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,62 ---- + //===- Linux/Memory.cpp - Linux Memory Implementation -----*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Linux specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Linux specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + /// AllocateRWXMemory - Allocate a slab of memory with read/write/execute + /// permissions. This is typically used for JIT applications where we want + /// to emit code to the memory then jump to it. Getting this type of memory + /// is very OS specific. + /// + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, 0, 0); + if (pa == MAP_FAILED) { + char msg[MAXPATHLEN]; + strerror_r(errno, msg, MAXPATHLEN-1); + throw std::string("Can't allocate RWX Memory: ") + msg; + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + char msg[MAXPATHLEN]; + strerror_r(errno, msg, MAXPATHLEN-1); + throw std::string("Can't release RWX Memory: ") + msg; + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Linux/Process.cpp diff -c /dev/null llvm/lib/System/Linux/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Linux/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- Linux/Process.cpp - Linux Process Implementation ------- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Linux specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/SUS/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Linux specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Linux/Path.cpp diff -u llvm/lib/System/Linux/Path.cpp:1.3 llvm/lib/System/Linux/Path.cpp:1.4 --- llvm/lib/System/Linux/Path.cpp:1.3 Mon Aug 30 16:46:55 2004 +++ llvm/lib/System/Linux/Path.cpp Fri Sep 10 23:59:30 2004 @@ -45,6 +45,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "so"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28383@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/SunOS: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.2 -> 1.3 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+81 -0) Index: llvm/lib/System/SunOS/Memory.cpp diff -c /dev/null llvm/lib/System/SunOS/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/SunOS/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,54 ---- + //===- SunOS/Memory.cpp - SunOS Memory Implementation -----------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the SunOS specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only SunOS specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (pa == (void*)-1) { + throw std::string("Can't allocate RWX Memory: ") + strerror(errno); + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + throw std::string("Can't release RWX Memory: ") + sterror(errno); + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/SunOS/Process.cpp diff -c /dev/null llvm/lib/System/SunOS/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/SunOS/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- SunOS/Process.cpp - SunOS Process Implementation ------- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the SunOS specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only SunOS specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/SunOS/Path.cpp diff -u llvm/lib/System/SunOS/Path.cpp:1.2 llvm/lib/System/SunOS/Path.cpp:1.3 --- llvm/lib/System/SunOS/Path.cpp:1.2 Mon Aug 30 16:46:55 2004 +++ llvm/lib/System/SunOS/Path.cpp Fri Sep 10 23:59:30 2004 @@ -47,6 +47,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "so"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/AIX/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28392@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/AIX: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.3 -> 1.4 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+81 -0) Index: llvm/lib/System/AIX/Memory.cpp diff -c /dev/null llvm/lib/System/AIX/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/AIX/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,54 ---- + //===- AIX/Memory.cpp - AIX Memory Implementation ---------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the AIX specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only AIX specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (pa == (void*)-1) { + throw std::string("Can't allocate RWX Memory: ") + strerror(errno); + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + throw std::string("Can't release RWX Memory: ") + sterror(errno); + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/AIX/Process.cpp diff -c /dev/null llvm/lib/System/AIX/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/AIX/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- AIX/Process.cpp - AIX Process Implementation ----------- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the AIX specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only AIX specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/AIX/Path.cpp diff -u llvm/lib/System/AIX/Path.cpp:1.3 llvm/lib/System/AIX/Path.cpp:1.4 --- llvm/lib/System/AIX/Path.cpp:1.3 Mon Aug 30 16:46:55 2004 +++ llvm/lib/System/AIX/Path.cpp Fri Sep 10 23:59:30 2004 @@ -43,6 +43,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "so"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28391@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Cygwin: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.2 -> 1.3 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+81 -0) Index: llvm/lib/System/Cygwin/Memory.cpp diff -c /dev/null llvm/lib/System/Cygwin/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Cygwin/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,54 ---- + //===- Cygwin/Memory.cpp - Cygwin Memory Implementation ---------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Cygwin specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Cygwin specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (pa == (void*)-1) { + throw std::string("Can't allocate RWX Memory: ") + strerror(errno); + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + throw std::string("Can't release RWX Memory: ") + sterror(errno); + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Cygwin/Process.cpp diff -c /dev/null llvm/lib/System/Cygwin/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Cygwin/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- Cygwin/Process.cpp - Cygwin Process Implementation ----- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Cygwin specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Cygwin specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Cygwin/Path.cpp diff -u llvm/lib/System/Cygwin/Path.cpp:1.2 llvm/lib/System/Cygwin/Path.cpp:1.3 --- llvm/lib/System/Cygwin/Path.cpp:1.2 Wed Sep 1 15:29:35 2004 +++ llvm/lib/System/Cygwin/Path.cpp Fri Sep 10 23:59:30 2004 @@ -47,6 +47,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "dll.a"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Memory.cpp Path.cpp Message-ID: <200409110459.XAA28382@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: Memory.cpp added (r1.1) Path.cpp added (r1.1) --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+77 -0) Index: llvm/lib/System/Win32/Memory.cpp diff -c /dev/null llvm/lib/System/Win32/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Win32/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,44 ---- + //===- Win32/Memory.cpp - Win32 Memory Implementation -----------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Win32 specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + #include + #include "windows.h" + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Win32 specific code. + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory&M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + unsigned pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + void *P = VirtualAlloc(0, NumPages*pageSize, MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (P == 0) { + throw std::string("Couldn't allocate ") + utostr(NumBytes) + + " bytes of executable memory!"; + } + M.Address = P; + M.AllocSize = NumBytes; + return P; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 ) return; + VirtualFree(M.Address, M.AllocSize, MEM_DECOMMIT, PAGE_NOACCESS); + } Index: llvm/lib/System/Win32/Path.cpp diff -c /dev/null llvm/lib/System/Win32/Path.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Win32/Path.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,33 ---- + //===- Win32/Path.cpp - Win32 Path Implementation ---------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Win32 specific implementation of the Path class. + // + //===----------------------------------------------------------------------===// + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Win32 specific code + //=== and must not be generic UNIX code (see ../Unix/Path.cpp) + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Path.cpp" + + namespace llvm { + using namespace sys; + + + std::string + Path::GetDLLSuffix() { + return "dll"; + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28418@zion.cs.uiuc.edu> Changes in directory llvm/lib/System: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.5 -> 1.6 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+59 -10) Index: llvm/lib/System/Memory.cpp diff -c /dev/null llvm/lib/System/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,30 ---- + //===- Memory.cpp - Memory Handling Support ---------------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file defines some helpful functions for allocating memory and dealing + // with memory mapped files + // + //===----------------------------------------------------------------------===// + + #include "llvm/System/Memory.h" + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only TRULY operating system + //=== independent code. + //===----------------------------------------------------------------------===// + + } + + // Include the platform-specific parts of this class. + #include "platform/Memory.cpp" + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Process.cpp diff -c /dev/null llvm/lib/System/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,29 ---- + //===-- Process.cpp - Implement OS Process Concept --------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This header file implements the operating system Process concept. + // + //===----------------------------------------------------------------------===// + + #include "llvm/System/Process.h" + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only TRULY operating system + //=== independent code. + //===----------------------------------------------------------------------===// + + } + + // Include the platform-specific parts of this class. + #include "platform/Process.cpp" + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Path.cpp diff -u llvm/lib/System/Path.cpp:1.5 llvm/lib/System/Path.cpp:1.6 --- llvm/lib/System/Path.cpp:1.5 Sun Aug 29 14:24:53 2004 +++ llvm/lib/System/Path.cpp Fri Sep 10 23:59:30 2004 @@ -21,16 +21,6 @@ //=== independent code. //===----------------------------------------------------------------------===// -bool -Path::is_file() const { - return (is_valid() && path[path.length()-1] != '/'); -} - -bool -Path::is_directory() const { - return (is_valid() && path[path.length()-1] == '/'); -} - } // Include the truly platform-specific parts of this class. From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Interix/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28419@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Interix: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.1 -> 1.2 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+80 -0) Index: llvm/lib/System/Interix/Memory.cpp diff -c /dev/null llvm/lib/System/Interix/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Interix/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,53 ---- + //===- Interix/Memory.cpp - Interix Memory Implementation -------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Interix specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Interix specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANON|MAP_NOCORE, -1, 0); + if (pa == (void*)-1) { + throw std::string("Can't allocate RWX Memory: ") + strerror(errno); + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + throw std::string("Can't release RWX Memory: ") + sterror(errno); + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Interix/Process.cpp diff -c /dev/null llvm/lib/System/Interix/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Interix/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- Interix/Process.cpp - Interix Process Implementation --- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Interix specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Interix specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Interix/Path.cpp diff -u llvm/lib/System/Interix/Path.cpp:1.1 llvm/lib/System/Interix/Path.cpp:1.2 --- llvm/lib/System/Interix/Path.cpp:1.1 Tue Aug 31 13:03:23 2004 +++ llvm/lib/System/Interix/Path.cpp Fri Sep 10 23:59:30 2004 @@ -45,6 +45,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "dll"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28397@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/FreeBSD: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.1 -> 1.2 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+80 -0) Index: llvm/lib/System/FreeBSD/Memory.cpp diff -c /dev/null llvm/lib/System/FreeBSD/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/FreeBSD/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,53 ---- + //===- FreeBSD/Memory.cpp - FreeBSD Memory Implementation -------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the FreeBSD specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only FreeBSD specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANON|MAP_NOCORE, -1, 0); + if (pa == (void*)-1) { + throw std::string("Can't allocate RWX Memory: ") + strerror(errno); + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + throw std::string("Can't release RWX Memory: ") + sterror(errno); + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/FreeBSD/Process.cpp diff -c /dev/null llvm/lib/System/FreeBSD/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/FreeBSD/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- FreeBSD/Process.cpp - FreeBSD Process Implementation --- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the FreeBSD specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only FreeBSD specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/FreeBSD/Path.cpp diff -u llvm/lib/System/FreeBSD/Path.cpp:1.1 llvm/lib/System/FreeBSD/Path.cpp:1.2 --- llvm/lib/System/FreeBSD/Path.cpp:1.1 Tue Aug 31 13:09:35 2004 +++ llvm/lib/System/FreeBSD/Path.cpp Fri Sep 10 23:59:30 2004 @@ -45,6 +45,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "so"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Sep 10 23:59:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 10 Sep 2004 23:59:42 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/Memory.cpp Process.cpp Path.cpp Message-ID: <200409110459.XAA28424@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Darwin: Memory.cpp added (r1.1) Process.cpp added (r1.1) Path.cpp updated: 1.2 -> 1.3 --- Log message: Provide initial implementations of Memory and Process concepts for various platforms. Implement GetLLVMSuffix function for the Path concept. --- Diffs of the changes: (+89 -0) Index: llvm/lib/System/Darwin/Memory.cpp diff -c /dev/null llvm/lib/System/Darwin/Memory.cpp:1.1 *** /dev/null Fri Sep 10 23:59:40 2004 --- llvm/lib/System/Darwin/Memory.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,62 ---- + //===- Darwin/Memory.cpp - Darwin Memory Implementation ---------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Darwin specific implementation of various Memory + // management utilities + // + //===----------------------------------------------------------------------===// + + // Include the generic unix implementation + #include "../Unix/Memory.cpp" + #include "llvm/System/Process.h" + #include + + namespace llvm { + using namespace sys; + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Darwin specific code + //=== and must not be generic UNIX code (see ../Unix/Memory.cpp) + //===----------------------------------------------------------------------===// + + /// AllocateRWXMemory - Allocate a slab of memory with read/write/execute + /// permissions. This is typically used for JIT applications where we want + /// to emit code to the memory then jump to it. Getting this type of memory + /// is very OS specific. + /// + void* Memory::AllocateRWX(Memory& M, unsigned NumBytes) { + if (NumBytes == 0) return 0; + + static const long pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + + void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_PRIVATE|MAP_ANON, -1, 0); + if (pa == MAP_FAILED) { + char msg[MAXPATHLEN]; + strerror_r(errno, msg, MAXPATHLEN-1); + throw std::string("Can't allocate RWX Memory: ") + msg; + } + M.Address = pa; + M.AllocSize = NumPages*pageSize; + return pa; + } + + void Memory::ReleaseRWX(Memory& M) { + if (M.Address == 0 || M.AllocSize == 0) return; + if (0 != munmap(M.Address, M.AllocSize)) { + char msg[MAXPATHLEN]; + strerror_r(errno, msg, MAXPATHLEN-1); + throw std::string("Can't release RWX Memory: ") + msg; + } + } + + } + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Darwin/Process.cpp diff -c /dev/null llvm/lib/System/Darwin/Process.cpp:1.1 *** /dev/null Fri Sep 10 23:59:42 2004 --- llvm/lib/System/Darwin/Process.cpp Fri Sep 10 23:59:30 2004 *************** *** 0 **** --- 1,22 ---- + //===- Darwin/Process.cpp - Darwin Process Implementation ----- -*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by Reid Spencer and is distributed under the + // University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file provides the Darwin specific implementation of the Process class. + // + //===----------------------------------------------------------------------===// + + // Include the generic Unix implementation + #include "../Unix/Process.cpp" + + //===----------------------------------------------------------------------===// + //=== WARNING: Implementation here must contain only Darwin specific code + //=== and must not be generic UNIX code (see ../Unix/Process.cpp) + //===----------------------------------------------------------------------===// + + // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Darwin/Path.cpp diff -u llvm/lib/System/Darwin/Path.cpp:1.2 llvm/lib/System/Darwin/Path.cpp:1.3 --- llvm/lib/System/Darwin/Path.cpp:1.2 Mon Aug 30 16:46:55 2004 +++ llvm/lib/System/Darwin/Path.cpp Fri Sep 10 23:59:30 2004 @@ -43,6 +43,11 @@ return result; } +std::string +Path::GetDLLSuffix() { + return "dyld"; +} + } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Sat Sep 11 02:13:01 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 00:13:01 -0700 Subject: [llvm-commits] lib/System Changes Message-ID: <1094886780.2161.11.camel@bashful.x10sys.com> Folks, I have recently committed several lib/System changes. As with previous commits, the changes work on Linux but for other platforms I'm only "guessing" at the implementation based on available documentation. Your mileage might vary. If this breaks compilation on your platform, please correct the implementation and check it in or submit patches to me and I'll check it in. Here's the details of my recent additions .. (1) Allocating RWX memory is used by the JIT Emitter for code generation and execution. The JIT software is now platform independent in this regard by using the new sys::Memory::AllocateRWX function. This function has been implemented to use variants of mmap on Unix platforms and VirtualAlloc on Win32. (2) The functions in "FileUtilities.h" for checking magic numbers and determining the type of a function have been added to the Path class. There are three new methods: has_magic_number, is_bytecode_file, and is_archive. These have been implemented as "generic Unix" functions in the lib/System/Unix directory. They *should* work on all Unix platforms. The functions haven't been implemented for Win32. (3) The sys::Process::GetPageSize() method has been implemented in two ways. Older unix systems can use the lib/System/Unix/Process.cpp implementation that is based on the old getpagesize(3) function. This has been deprecated in SUSv2 and doesn't exist in POSIX 1003.1. The new way to get this value is with sysconf(_SC_PAGE_SIZE). That implementation can be found in lib/System/Unix/SUS/Process.cpp file. If your platform supports sysconf(2), please convert the #include in platform/Process.cpp from: #include "../Unix/Process.cpp" to: #include "../Unix/SUS/Process.cpp" Sorry for the inconvenience if any of this has broken your build. Someday soon, I'll have three or four different types of machines available so I can do this testing myself. Reid. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20040911/e0a89dee/attachment.bin From reid at x10sys.com Sat Sep 11 02:35:12 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 02:35:12 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/Path.cpp Message-ID: <200409110735.CAA29172@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Darwin: Path.cpp updated: 1.3 -> 1.4 --- Log message: Correct the dynamic lib suffix on Darwin. --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/Darwin/Path.cpp diff -u llvm/lib/System/Darwin/Path.cpp:1.3 llvm/lib/System/Darwin/Path.cpp:1.4 --- llvm/lib/System/Darwin/Path.cpp:1.3 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/Darwin/Path.cpp Sat Sep 11 02:35:01 2004 @@ -45,7 +45,7 @@ std::string Path::GetDLLSuffix() { - return "dyld"; + return "dylib"; } } From reid at x10sys.com Sat Sep 11 15:18:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:18:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/Memory.cpp Message-ID: <200409112018.PAA05523@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/FreeBSD: Memory.cpp updated: 1.1 -> 1.2 --- Log message: Fix typo: sterror -> strerror --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/FreeBSD/Memory.cpp diff -u llvm/lib/System/FreeBSD/Memory.cpp:1.1 llvm/lib/System/FreeBSD/Memory.cpp:1.2 --- llvm/lib/System/FreeBSD/Memory.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/FreeBSD/Memory.cpp Sat Sep 11 15:18:08 2004 @@ -44,7 +44,7 @@ void Memory::ReleaseRWX(Memory& M) { if (M.Address == 0 || M.AllocSize == 0) return; if (0 != munmap(M.Address, M.AllocSize)) { - throw std::string("Can't release RWX Memory: ") + sterror(errno); + throw std::string("Can't release RWX Memory: ") + strerror(errno); } } From reid at x10sys.com Sat Sep 11 15:18:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:18:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/Memory.cpp Message-ID: <200409112018.PAA05519@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Cygwin: Memory.cpp updated: 1.1 -> 1.2 --- Log message: Fix typo: sterror -> strerror --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/Cygwin/Memory.cpp diff -u llvm/lib/System/Cygwin/Memory.cpp:1.1 llvm/lib/System/Cygwin/Memory.cpp:1.2 --- llvm/lib/System/Cygwin/Memory.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/Cygwin/Memory.cpp Sat Sep 11 15:18:08 2004 @@ -45,7 +45,7 @@ void Memory::ReleaseRWX(Memory& M) { if (M.Address == 0 || M.AllocSize == 0) return; if (0 != munmap(M.Address, M.AllocSize)) { - throw std::string("Can't release RWX Memory: ") + sterror(errno); + throw std::string("Can't release RWX Memory: ") + strerror(errno); } } From reid at x10sys.com Sat Sep 11 15:18:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:18:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/AIX/Memory.cpp Message-ID: <200409112018.PAA05520@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/AIX: Memory.cpp updated: 1.1 -> 1.2 --- Log message: Fix typo: sterror -> strerror --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/AIX/Memory.cpp diff -u llvm/lib/System/AIX/Memory.cpp:1.1 llvm/lib/System/AIX/Memory.cpp:1.2 --- llvm/lib/System/AIX/Memory.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/AIX/Memory.cpp Sat Sep 11 15:18:08 2004 @@ -45,7 +45,7 @@ void Memory::ReleaseRWX(Memory& M) { if (M.Address == 0 || M.AllocSize == 0) return; if (0 != munmap(M.Address, M.AllocSize)) { - throw std::string("Can't release RWX Memory: ") + sterror(errno); + throw std::string("Can't release RWX Memory: ") + strerror(errno); } } From reid at x10sys.com Sat Sep 11 15:18:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:18:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/Interix/Memory.cpp Message-ID: <200409112018.PAA05524@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Interix: Memory.cpp updated: 1.1 -> 1.2 --- Log message: Fix typo: sterror -> strerror --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/Interix/Memory.cpp diff -u llvm/lib/System/Interix/Memory.cpp:1.1 llvm/lib/System/Interix/Memory.cpp:1.2 --- llvm/lib/System/Interix/Memory.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/Interix/Memory.cpp Sat Sep 11 15:18:08 2004 @@ -44,7 +44,7 @@ void Memory::ReleaseRWX(Memory& M) { if (M.Address == 0 || M.AllocSize == 0) return; if (0 != munmap(M.Address, M.AllocSize)) { - throw std::string("Can't release RWX Memory: ") + sterror(errno); + throw std::string("Can't release RWX Memory: ") + strerror(errno); } } From reid at x10sys.com Sat Sep 11 15:18:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:18:19 -0500 Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/Memory.cpp Message-ID: <200409112018.PAA05527@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/SunOS: Memory.cpp updated: 1.1 -> 1.2 --- Log message: Fix typo: sterror -> strerror --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/SunOS/Memory.cpp diff -u llvm/lib/System/SunOS/Memory.cpp:1.1 llvm/lib/System/SunOS/Memory.cpp:1.2 --- llvm/lib/System/SunOS/Memory.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/SunOS/Memory.cpp Sat Sep 11 15:18:08 2004 @@ -45,7 +45,7 @@ void Memory::ReleaseRWX(Memory& M) { if (M.Address == 0 || M.AllocSize == 0) return; if (0 != munmap(M.Address, M.AllocSize)) { - throw std::string("Can't release RWX Memory: ") + sterror(errno); + throw std::string("Can't release RWX Memory: ") + strerror(errno); } } From reid at x10sys.com Sat Sep 11 15:30:21 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:30:21 -0500 Subject: [llvm-commits] CVS: llvm/examples/ModuleMaker/Makefile ModuleMaker.cpp Message-ID: <200409112030.PAA05620@zion.cs.uiuc.edu> Changes in directory llvm/examples/ModuleMaker: Makefile updated: 1.4 -> 1.5 ModuleMaker.cpp updated: 1.3 -> 1.4 --- Log message: Correct the file header to reflect the new "examples" home for the file. --- Diffs of the changes: (+2 -2) Index: llvm/examples/ModuleMaker/Makefile diff -u llvm/examples/ModuleMaker/Makefile:1.4 llvm/examples/ModuleMaker/Makefile:1.5 --- llvm/examples/ModuleMaker/Makefile:1.4 Fri Sep 10 23:29:44 2004 +++ llvm/examples/ModuleMaker/Makefile Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -##===- examples/ModuleMaker --------------------------------*- Makefile -*-===## +##===- examples/ModuleMaker/Makefile -----------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # Index: llvm/examples/ModuleMaker/ModuleMaker.cpp diff -u llvm/examples/ModuleMaker/ModuleMaker.cpp:1.3 llvm/examples/ModuleMaker/ModuleMaker.cpp:1.4 --- llvm/examples/ModuleMaker/ModuleMaker.cpp:1.3 Sun Jul 4 07:22:14 2004 +++ llvm/examples/ModuleMaker/ModuleMaker.cpp Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -//===- ModuleMaker.cpp - Example project which creates modules --*- C++ -*-===// +//===- examples/ModuleMaker/ModuleMaker.cpp - Example project ---*- C++ -*-===// // // This programs is a simple example that creates an LLVM module "from scratch", // emitting it as a bytecode file to standard out. This is just to show how From reid at x10sys.com Sat Sep 11 15:30:22 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:30:22 -0500 Subject: [llvm-commits] CVS: llvm/examples/HowToUseJIT/HowToUseJIT.cpp Makefile Message-ID: <200409112030.PAA05630@zion.cs.uiuc.edu> Changes in directory llvm/examples/HowToUseJIT: HowToUseJIT.cpp updated: 1.5 -> 1.6 Makefile updated: 1.4 -> 1.5 --- Log message: Correct the file header to reflect the new "examples" home for the file. --- Diffs of the changes: (+2 -2) Index: llvm/examples/HowToUseJIT/HowToUseJIT.cpp diff -u llvm/examples/HowToUseJIT/HowToUseJIT.cpp:1.5 llvm/examples/HowToUseJIT/HowToUseJIT.cpp:1.6 --- llvm/examples/HowToUseJIT/HowToUseJIT.cpp:1.5 Sun Aug 15 18:31:57 2004 +++ llvm/examples/HowToUseJIT/HowToUseJIT.cpp Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -//===--- HowToUseJIT.cpp - An example use of the JIT ----------------------===// +//===-- examples/HowToUseJIT/HowToUseJIT.cpp - An example use of the JIT --===// // // The LLVM Compiler Infrastructure // Index: llvm/examples/HowToUseJIT/Makefile diff -u llvm/examples/HowToUseJIT/Makefile:1.4 llvm/examples/HowToUseJIT/Makefile:1.5 --- llvm/examples/HowToUseJIT/Makefile:1.4 Fri Sep 10 23:29:44 2004 +++ llvm/examples/HowToUseJIT/Makefile Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -##===- projects/HowToUseJIT/Makefile -----------------------*- Makefile -*-===## +##===- examples/HowToUseJIT/Makefile -----------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # From reid at x10sys.com Sat Sep 11 15:30:22 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:30:22 -0500 Subject: [llvm-commits] CVS: llvm/examples/Fibonacci/Makefile fibonacci.cpp Message-ID: <200409112030.PAA05625@zion.cs.uiuc.edu> Changes in directory llvm/examples/Fibonacci: Makefile updated: 1.3 -> 1.4 fibonacci.cpp updated: 1.1 -> 1.2 --- Log message: Correct the file header to reflect the new "examples" home for the file. --- Diffs of the changes: (+2 -2) Index: llvm/examples/Fibonacci/Makefile diff -u llvm/examples/Fibonacci/Makefile:1.3 llvm/examples/Fibonacci/Makefile:1.4 --- llvm/examples/Fibonacci/Makefile:1.3 Fri Sep 10 23:29:44 2004 +++ llvm/examples/Fibonacci/Makefile Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -##===- projects/Fibonacci/Makefile -------------------------*- Makefile -*-===## +##===- examples/Fibonacci/Makefile -------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # Index: llvm/examples/Fibonacci/fibonacci.cpp diff -u llvm/examples/Fibonacci/fibonacci.cpp:1.1 llvm/examples/Fibonacci/fibonacci.cpp:1.2 --- llvm/examples/Fibonacci/fibonacci.cpp:1.1 Thu Aug 19 15:10:04 2004 +++ llvm/examples/Fibonacci/fibonacci.cpp Sat Sep 11 15:30:11 2004 @@ -1,4 +1,4 @@ -//===--- fibonacci.cpp - An example use of the JIT ----------------------===// +//===--- examples/Fibonacci/fibonacci.cpp - An example use of the JIT -----===// // // The LLVM Compiler Infrastructure // From reid at x10sys.com Sat Sep 11 15:38:35 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 11 Sep 2004 15:38:35 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/SetVector.h Message-ID: <200409112038.PAA05655@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/ADT: SetVector.h updated: 1.7 -> 1.8 --- Log message: Fix the replace method to assert if an item was erased from the set but not found in the vector. Previously, it just ignored this condition. --- Diffs of the changes: (+2 -2) Index: llvm/include/llvm/ADT/SetVector.h diff -u llvm/include/llvm/ADT/SetVector.h:1.7 llvm/include/llvm/ADT/SetVector.h:1.8 --- llvm/include/llvm/ADT/SetVector.h:1.7 Fri Sep 10 23:25:58 2004 +++ llvm/include/llvm/ADT/SetVector.h Sat Sep 11 15:38:25 2004 @@ -113,8 +113,8 @@ void remove(const value_type& X) { if (0 < set_.erase(X)) { iterator I = find(vector_.begin(),vector_.end(),X); - if (I != vector_.end()) - vector_.erase(I); + assert(I != vector_.end() && "Corrupted SetVector instances!"); + vector_.erase(I); } } From brukman at cs.uiuc.edu Sun Sep 12 15:47:43 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 15:47:43 -0500 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Message-ID: <200409122047.PAA29800@zion.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReaderWrappers.cpp updated: 1.30 -> 1.31 --- Log message: Fix code spacing/alignment --- Diffs of the changes: (+4 -6) Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.30 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.31 --- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.30 Fri Sep 10 23:22:58 2004 +++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Sun Sep 12 15:47:33 2004 @@ -296,11 +296,10 @@ const std::string &Filename, ///< File to analyze BytecodeAnalysis& bca, ///< Statistical output std::string *ErrorStr, ///< Error output - std::ostream* output ///< Dump output -) + std::ostream* output) ///< Dump output { try { - BytecodeHandler* analyzerHandler = createBytecodeAnalyzerHandler(bca,output); + BytecodeHandler* analyzerHandler =createBytecodeAnalyzerHandler(bca,output); std::auto_ptr AMP( getBytecodeModuleProvider(Filename,analyzerHandler)); return AMP->releaseModule(); @@ -317,8 +316,7 @@ const std::string& ModuleID, ///< Identifier for the module BytecodeAnalysis& bca, ///< The results of the analysis std::string* ErrorStr, ///< Errors, if any. - std::ostream* output ///< Dump output, if any -) + std::ostream* output) ///< Dump output, if any { try { BytecodeHandler* hdlr = createBytecodeAnalyzerHandler(bca, output); @@ -332,7 +330,7 @@ } bool llvm::GetBytecodeDependentLibraries(const std::string &fname, - Module::LibraryListType& deplibs) { + Module::LibraryListType& deplibs) { try { std::auto_ptr AMP( getBytecodeModuleProvider(fname)); Module* M = AMP->releaseModule(); From brukman at cs.uiuc.edu Sun Sep 12 15:56:48 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 15:56:48 -0500 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Message-ID: <200409122056.PAA29991@zion.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReaderWrappers.cpp updated: 1.31 -> 1.32 --- Log message: Unbreak doxygen, according to Reid. --- Diffs of the changes: (+4 -2) Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.31 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.32 --- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.31 Sun Sep 12 15:47:33 2004 +++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Sun Sep 12 15:56:38 2004 @@ -296,7 +296,8 @@ const std::string &Filename, ///< File to analyze BytecodeAnalysis& bca, ///< Statistical output std::string *ErrorStr, ///< Error output - std::ostream* output) ///< Dump output + std::ostream* output ///< Dump output +) { try { BytecodeHandler* analyzerHandler =createBytecodeAnalyzerHandler(bca,output); @@ -316,7 +317,8 @@ const std::string& ModuleID, ///< Identifier for the module BytecodeAnalysis& bca, ///< The results of the analysis std::string* ErrorStr, ///< Errors, if any. - std::ostream* output) ///< Dump output, if any + std::ostream* output ///< Dump output, if any +) { try { BytecodeHandler* hdlr = createBytecodeAnalyzerHandler(bca, output); From brukman at cs.uiuc.edu Sun Sep 12 16:26:14 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 16:26:14 -0500 Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp Message-ID: <200409122126.QAA14059@zion.cs.uiuc.edu> Changes in directory llvm/lib/Target/X86: X86CodeEmitter.cpp updated: 1.64 -> 1.65 --- Log message: Fix filename: Printer.cpp has become X86AsmPrinter.cpp --- Diffs of the changes: (+1 -1) Index: llvm/lib/Target/X86/X86CodeEmitter.cpp diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.64 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.65 --- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.64 Wed Sep 1 17:55:36 2004 +++ llvm/lib/Target/X86/X86CodeEmitter.cpp Sun Sep 12 16:26:04 2004 @@ -205,7 +205,7 @@ }; } -// This function is required by Printer.cpp to workaround gas bugs +// This function is required by X86AsmPrinter.cpp to work around GAS bugs void llvm::X86::emitInstruction(MachineCodeEmitter& mce, const X86InstrInfo& ii, const MachineInstr& mi) From brukman at cs.uiuc.edu Sun Sep 12 17:40:50 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 17:40:50 -0500 Subject: [llvm-commits] CVS: llvm/include/llvm/Config/config.h.in Message-ID: <200409122240.RAA20917@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Config: config.h.in updated: 1.27 -> 1.28 --- Log message: * Fix grammar * Convert tabs to spaces --- Diffs of the changes: (+4 -4) Index: llvm/include/llvm/Config/config.h.in diff -u llvm/include/llvm/Config/config.h.in:1.27 llvm/include/llvm/Config/config.h.in:1.28 --- llvm/include/llvm/Config/config.h.in:1.27 Sun Sep 5 11:41:11 2004 +++ llvm/include/llvm/Config/config.h.in Sun Sep 12 17:40:40 2004 @@ -219,11 +219,11 @@ #undef SHLIBEXT /* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be + direction of stack growth for your system; otherwise, it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if you have the ANSI C header files. */ From brukman at cs.uiuc.edu Sun Sep 12 18:01:34 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 18:01:34 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp Message-ID: <200409122301.SAA24850@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-link: llvm-link.cpp updated: 1.41 -> 1.42 --- Log message: Squelch compilation warnings on Sparc --- Diffs of the changes: (+2 -2) Index: llvm/tools/llvm-link/llvm-link.cpp diff -u llvm/tools/llvm-link/llvm-link.cpp:1.41 llvm/tools/llvm-link/llvm-link.cpp:1.42 --- llvm/tools/llvm-link/llvm-link.cpp:1.41 Fri Sep 10 23:32:42 2004 +++ llvm/tools/llvm-link/llvm-link.cpp Sun Sep 12 18:01:24 2004 @@ -151,7 +151,7 @@ } if (Filename.readable() && Filename.is_bytecode_file()) { - if (Result = GetModule(Filename)) + if ((Result = GetModule(Filename))) return true; } @@ -161,7 +161,7 @@ sys::Path path = GetPathForLinkageItem(FN,LibPaths[I]); if (!path.is_empty()) { if (path.is_bytecode_file()) { - if (Result = GetModule(path)) { + if ((Result = GetModule(path))) { return true; } else { // We found file but its not a valid bytecode file so we From reid at x10sys.com Sun Sep 12 18:08:40 2004 From: reid at x10sys.com (Reid Spencer) Date: Sun, 12 Sep 2004 18:08:40 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp Message-ID: <200409122308.SAA24997@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-link: llvm-link.cpp updated: 1.42 -> 1.43 --- Log message: Excise dependent library linking at Chris' request. llvm-link is intended to provide only the simplest linking of LLVM modules without trying to be complete. Dependent library linking will be added to gccld or its successor --- Diffs of the changes: (+0 -105) Index: llvm/tools/llvm-link/llvm-link.cpp diff -u llvm/tools/llvm-link/llvm-link.cpp:1.42 llvm/tools/llvm-link/llvm-link.cpp:1.43 --- llvm/tools/llvm-link/llvm-link.cpp:1.42 Sun Sep 12 18:01:24 2004 +++ llvm/tools/llvm-link/llvm-link.cpp Sun Sep 12 18:08:29 2004 @@ -18,10 +18,8 @@ #include "llvm/Bytecode/Writer.h" #include "llvm/Support/Linker.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/FileUtilities.h" #include "llvm/System/Signals.h" #include "llvm/System/Path.h" -#include "llvm/ADT/SetVector.h" #include #include #include @@ -48,10 +46,6 @@ LibPaths("L", cl::desc("Specify a library search path"), cl::ZeroOrMore, cl::value_desc("directory"), cl::Prefix); -static cl::list -Libraries("l", cl::desc("Specify library names to link with"), cl::ZeroOrMore, - cl::Prefix, cl::value_desc("library name")); - // GetModule - This function is just factored out of the functions below static inline Module* GetModule(const sys::Path& Filename) { if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; @@ -108,80 +102,6 @@ return std::auto_ptr(); } -sys::Path GetPathForLinkageItem(const std::string& link_item, - const std::string& dir) { - sys::Path fullpath; - fullpath.set_directory(dir); - - // Try *.o - fullpath.append_file(link_item); - fullpath.append_suffix("o"); - if (fullpath.readable()) - return fullpath; - - // Try *.bc - fullpath.elide_suffix(); - fullpath.append_suffix("bc"); - if (fullpath.readable()) - return fullpath; - - // Try *.so - fullpath.elide_suffix(); - fullpath.append_suffix(sys::Path::GetDLLSuffix()); - if (fullpath.readable()) - return fullpath; - - // Try lib*.a - fullpath.set_directory(dir); - fullpath.append_file(std::string("lib") + link_item); - fullpath.append_suffix("a"); - if (fullpath.readable()) - return fullpath; - - // Didn't find one. - fullpath.clear(); - return fullpath; -} - -static inline bool LoadLibrary(const std::string &FN, Module*& Result) { - Result = 0; - sys::Path Filename; - if (!Filename.set_file(FN)) { - return false; - } - - if (Filename.readable() && Filename.is_bytecode_file()) { - if ((Result = GetModule(Filename))) - return true; - } - - bool foundAFile = false; - - for (unsigned I = 0; I < LibPaths.size(); I++) { - sys::Path path = GetPathForLinkageItem(FN,LibPaths[I]); - if (!path.is_empty()) { - if (path.is_bytecode_file()) { - if ((Result = GetModule(path))) { - return true; - } else { - // We found file but its not a valid bytecode file so we - // return false and leave Result null. - return false; - } - } else { - // We found a file, but its not a bytecode file so we return - // false and leave Result null. - return false; - } - } - } - - // We didn't find a file so we leave Result null and return - // false to indicate that the library should be just left in the - // emitted module as resolvable at runtime. - return false; -} - int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, " llvm linker\n"); sys::PrintStackTraceOnErrorSignal(); @@ -206,31 +126,6 @@ } } - // Get the list of dependent libraries from the composite module - const Module::LibraryListType& libs = Composite.get()->getLibraries(); - - // Iterate over the list of dependent libraries, linking them in as we - // find them - Module::LibraryListType::const_iterator I = libs.begin(); - while (I != libs.end()) { - Module* Mod = 0; - if (LoadLibrary(*I,Mod)) { - if (Mod != 0) { - std::auto_ptr M(Mod); - if (LinkModules(Composite.get(), M.get(), &ErrorMessage)) { - std::cerr << argv[0] << ": link error in '" << *I - << "': " << ErrorMessage << "\n"; - return 1; - } - } else { - std::cerr << argv[0] << ": confused loading library '" << *I - << "'. Aborting\n"; - return 2; - } - } - ++I; - } - // TODO: Iterate over the -l list and link in any modules containing // global symbols that have not been resolved so far. From reid at x10sys.com Sun Sep 12 18:39:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Sun, 12 Sep 2004 18:39:53 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp Message-ID: <200409122339.SAA28414@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-link: llvm-link.cpp updated: 1.43 -> 1.44 --- Log message: Excise the -L option since llvm-link should not do library searches. It just links bytecode files together. --- Diffs of the changes: (+12 -43) Index: llvm/tools/llvm-link/llvm-link.cpp diff -u llvm/tools/llvm-link/llvm-link.cpp:1.43 llvm/tools/llvm-link/llvm-link.cpp:1.44 --- llvm/tools/llvm-link/llvm-link.cpp:1.43 Sun Sep 12 18:08:29 2004 +++ llvm/tools/llvm-link/llvm-link.cpp Sun Sep 12 18:39:42 2004 @@ -42,17 +42,21 @@ static cl::opt DumpAsm("d", cl::desc("Print assembly as linked"), cl::Hidden); -static cl::list -LibPaths("L", cl::desc("Specify a library search path"), cl::ZeroOrMore, - cl::value_desc("directory"), cl::Prefix); - -// GetModule - This function is just factored out of the functions below -static inline Module* GetModule(const sys::Path& Filename) { - if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; +// LoadFile - Read the specified bytecode file in and return it. This routine +// searches the link path for the specified file to try to find it... +// +static inline std::auto_ptr LoadFile(const std::string &FN) { + sys::Path Filename; + if (!Filename.set_file(FN)) { + std::cerr << "Invalid file name: '" << FN << "'\n"; + return std::auto_ptr(); + } + std::string ErrorMessage; if (Filename.exists()) { + if (Verbose) std::cerr << "Loading '" << Filename.c_str() << "'\n"; Module* Result = ParseBytecodeFile(Filename.get(), &ErrorMessage); - if (Result) return Result; // Load successful! + if (Result) return std::auto_ptr(Result); // Load successful! if (Verbose) { std::cerr << "Error opening bytecode file: '" << Filename.c_str() << "'"; @@ -63,42 +67,7 @@ std::cerr << "Bytecode file: '" << Filename.c_str() << "' does not exist.\n"; } - return 0; -} - -// LoadFile - Read the specified bytecode file in and return it. This routine -// searches the link path for the specified file to try to find it... -// -static inline std::auto_ptr LoadFile(const std::string &FN) { - sys::Path Filename; - if (!Filename.set_file(FN)) { - std::cerr << "Invalid file name: '" << Filename.c_str() << "'\n"; - return std::auto_ptr(); - } - - if (Module* Result = GetModule(Filename)) - return std::auto_ptr(Result); - - bool FoundAFile = false; - - for (unsigned i = 0; i < LibPaths.size(); i++) { - if (!Filename.set_directory(LibPaths[i])) { - std::cerr << "Invalid library path: '" << LibPaths[i] << "'\n"; - } else if (!Filename.append_file(FN)) { - std::cerr << "Invalid library path: '" << LibPaths[i] - << "/" << FN.c_str() << "'\n"; - } else if (Filename.exists()) { - FoundAFile = true; - if (Module *Result = GetModule(Filename)) - return std::auto_ptr(Result); // Load successful! - } - } - if (FoundAFile) - std::cerr << "Bytecode file '" << FN << "' corrupt! " - << "Use 'llvm-link -v ...' for more info.\n"; - else - std::cerr << "Could not locate bytecode file: '" << FN << "'\n"; return std::auto_ptr(); } From brukman at cs.uiuc.edu Sun Sep 12 20:18:44 2004 From: brukman at cs.uiuc.edu (Michael Brukman) Date: Sun, 12 Sep 2004 20:18:44 -0500 (CDT) Subject: [llvm-commits] CVS: llvm/tools/Makefile Message-ID: <200409130118.UAA27679@kain.cs.uiuc.edu> Changes in directory llvm/tools: Makefile updated: 1.31 -> 1.32 --- Log message: Add LLEE into compilation, but not for Sparc --- Diffs of the changes: (+7 -2) Index: llvm/tools/Makefile diff -u llvm/tools/Makefile:1.31 llvm/tools/Makefile:1.32 --- llvm/tools/Makefile:1.31 Sun Aug 29 14:27:34 2004 +++ llvm/tools/Makefile Sun Sep 12 20:18:30 2004 @@ -10,7 +10,12 @@ LEVEL := .. PARALLEL_DIRS := llvmc llvm-as llvm-dis opt gccas llc llvm-link lli gccld \ llvm-stub analyze extract bugpoint llvm-nm llvm-prof llvm-db \ - llvm-ar llvm-bcanalyzer + llvm-ar llvm-bcanalyzer llee -include $(LEVEL)/Makefile.common +include $(LEVEL)/Makefile.config + +ifeq ($(ARCH), Sparc) +PARALLEL_DIRS := $(filter-out llee, $(PARALLEL_DIRS)) +endif +include $(LEVEL)/Makefile.common From llvm at cs.uiuc.edu Sun Sep 12 20:24:08 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Sun, 12 Sep 2004 20:24:08 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/ Message-ID: <200409130124.UAA03609@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ld: --- Log message: Directory /var/cvs/llvm/llvm/tools/llvm-ld added to the repository --- Diffs of the changes: (+0 -0) From reid at x10sys.com Sun Sep 12 20:28:04 2004 From: reid at x10sys.com (Reid Spencer) Date: Sun, 12 Sep 2004 20:28:04 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/GenerateCode.cpp Linker.cpp Makefile llvm-ld.cpp llvm-ld.h Message-ID: <200409130128.UAA04291@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ld: GenerateCode.cpp added (r1.1) Linker.cpp added (r1.1) Makefile added (r1.1) llvm-ld.cpp added (r1.1) llvm-ld.h added (r1.1) --- Log message: Initial implementation of llvm-ld: stolen from gccld. --- Diffs of the changes: (+1158 -0) Index: llvm/tools/llvm-ld/GenerateCode.cpp diff -c /dev/null llvm/tools/llvm-ld/GenerateCode.cpp:1.1 *** /dev/null Sun Sep 12 20:28:03 2004 --- llvm/tools/llvm-ld/GenerateCode.cpp Sun Sep 12 20:27:53 2004 *************** *** 0 **** --- 1,353 ---- + //===- GenerateCode.cpp - Functions for generating executable files ------===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file contains functions for generating executable files once linking + // has finished. This includes generating a shell script to run the JIT or + // a native executable derived from the bytecode. + // + //===----------------------------------------------------------------------===// + + #include "llvm-ld.h" + #include "llvm/Module.h" + #include "llvm/PassManager.h" + #include "llvm/Analysis/LoadValueNumbering.h" + #include "llvm/Analysis/Passes.h" + #include "llvm/Analysis/Verifier.h" + #include "llvm/Bytecode/WriteBytecodePass.h" + #include "llvm/Target/TargetData.h" + #include "llvm/Transforms/IPO.h" + #include "llvm/Transforms/Scalar.h" + #include "llvm/Support/Linker.h" + #include "llvm/Support/SystemUtils.h" + #include "llvm/Support/CommandLine.h" + using namespace llvm; + + namespace { + cl::opt + DisableInline("disable-inlining", cl::desc("Do not run the inliner pass")); + + cl::opt + Verify("verify", cl::desc("Verify intermediate results of all passes")); + + cl::opt + DisableOptimizations("disable-opt", + cl::desc("Do not run any optimization passes")); + } + + /// CopyEnv - This function takes an array of environment variables and makes a + /// copy of it. This copy can then be manipulated any way the caller likes + /// without affecting the process's real environment. + /// + /// Inputs: + /// envp - An array of C strings containing an environment. + /// + /// Return value: + /// NULL - An error occurred. + /// + /// Otherwise, a pointer to a new array of C strings is returned. Every string + /// in the array is a duplicate of the one in the original array (i.e. we do + /// not copy the char *'s from one array to another). + /// + static char ** CopyEnv(char ** const envp) { + // Count the number of entries in the old list; + unsigned entries; // The number of entries in the old environment list + for (entries = 0; envp[entries] != NULL; entries++) + /*empty*/; + + // Add one more entry for the NULL pointer that ends the list. + ++entries; + + // If there are no entries at all, just return NULL. + if (entries == 0) + return NULL; + + // Allocate a new environment list. + char **newenv = new char* [entries]; + if ((newenv = new char* [entries]) == NULL) + return NULL; + + // Make a copy of the list. Don't forget the NULL that ends the list. + entries = 0; + while (envp[entries] != NULL) { + newenv[entries] = new char[strlen (envp[entries]) + 1]; + strcpy (newenv[entries], envp[entries]); + ++entries; + } + newenv[entries] = NULL; + + return newenv; + } + + + /// RemoveEnv - Remove the specified environment variable from the environment + /// array. + /// + /// Inputs: + /// name - The name of the variable to remove. It cannot be NULL. + /// envp - The array of environment variables. It cannot be NULL. + /// + /// Notes: + /// This is mainly done because functions to remove items from the environment + /// are not available across all platforms. In particular, Solaris does not + /// seem to have an unsetenv() function or a setenv() function (or they are + /// undocumented if they do exist). + /// + static void RemoveEnv(const char * name, char ** const envp) { + for (unsigned index=0; envp[index] != NULL; index++) { + // Find the first equals sign in the array and make it an EOS character. + char *p = strchr (envp[index], '='); + if (p == NULL) + continue; + else + *p = '\0'; + + // Compare the two strings. If they are equal, zap this string. + // Otherwise, restore it. + if (!strcmp(name, envp[index])) + *envp[index] = '\0'; + else + *p = '='; + } + + return; + } + + static inline void addPass(PassManager &PM, Pass *P) { + // Add the pass to the pass manager... + PM.add(P); + + // If we are verifying all of the intermediate steps, add the verifier... + if (Verify) PM.add(createVerifierPass()); + } + + /// GenerateBytecode - generates a bytecode file from the specified module. + /// + /// Inputs: + /// M - The module for which bytecode should be generated. + /// Strip - Flags whether symbols should be stripped from the output. + /// Internalize - Flags whether all symbols should be marked internal. + /// Out - Pointer to file stream to which to write the output. + /// + /// Returns non-zero value on error. + /// + int llvm::GenerateBytecode(Module *M, bool Strip, bool Internalize, + std::ostream *Out) { + // In addition to just linking the input from GCC, we also want to spiff it up + // a little bit. Do this now. + PassManager Passes; + + if (Verify) Passes.add(createVerifierPass()); + + // Add an appropriate TargetData instance for this module... + addPass(Passes, new TargetData("gccld", M)); + + // Often if the programmer does not specify proper prototypes for the + // functions they are calling, they end up calling a vararg version of the + // function that does not get a body filled in (the real function has typed + // arguments). This pass merges the two functions. + addPass(Passes, createFunctionResolvingPass()); + + if (!DisableOptimizations) { + if (Internalize) { + // Now that composite has been compiled, scan through the module, looking + // for a main function. If main is defined, mark all other functions + // internal. + addPass(Passes, createInternalizePass()); + } + + // Now that we internalized some globals, see if we can mark any globals as + // being constant! + addPass(Passes, createGlobalConstifierPass()); + + // Linking modules together can lead to duplicated global constants, only + // keep one copy of each constant... + addPass(Passes, createConstantMergePass()); + + // If the -s command line option was specified, strip the symbols out of the + // resulting program to make it smaller. -s is a GCC option that we are + // supporting. + if (Strip) + addPass(Passes, createSymbolStrippingPass()); + + // Propagate constants at call sites into the functions they call. + addPass(Passes, createIPConstantPropagationPass()); + + // Remove unused arguments from functions... + addPass(Passes, createDeadArgEliminationPass()); + + if (!DisableInline) + addPass(Passes, createFunctionInliningPass()); // Inline small functions + + addPass(Passes, createPruneEHPass()); // Remove dead EH info + addPass(Passes, createGlobalDCEPass()); // Remove dead functions + + // If we didn't decide to inline a function, check to see if we can + // transform it to pass arguments by value instead of by reference. + addPass(Passes, createArgumentPromotionPass()); + + // The IPO passes may leave cruft around. Clean up after them. + addPass(Passes, createInstructionCombiningPass()); + + addPass(Passes, createScalarReplAggregatesPass()); // Break up allocas + + // Run a few AA driven optimizations here and now, to cleanup the code. + addPass(Passes, createGlobalsModRefPass()); // IP alias analysis + + addPass(Passes, createLICMPass()); // Hoist loop invariants + addPass(Passes, createLoadValueNumberingPass()); // GVN for load instrs + addPass(Passes, createGCSEPass()); // Remove common subexprs + addPass(Passes, createDeadStoreEliminationPass()); // Nuke dead stores + + // Cleanup and simplify the code after the scalar optimizations. + addPass(Passes, createInstructionCombiningPass()); + + // Delete basic blocks, which optimization passes may have killed... + addPass(Passes, createCFGSimplificationPass()); + + // Now that we have optimized the program, discard unreachable functions... + addPass(Passes, createGlobalDCEPass()); + } + + // Make sure everything is still good. + Passes.add(createVerifierPass()); + + // Add the pass that writes bytecode to the output file... + addPass(Passes, new WriteBytecodePass(Out)); + + // Run our queue of passes all at once now, efficiently. + Passes.run(*M); + + return 0; + } + + /// GenerateAssembly - generates a native assembly language source file from the + /// specified bytecode file. + /// + /// Inputs: + /// InputFilename - The name of the output bytecode file. + /// OutputFilename - The name of the file to generate. + /// llc - The pathname to use for LLC. + /// envp - The environment to use when running LLC. + /// + /// Return non-zero value on error. + /// + int llvm::GenerateAssembly(const std::string &OutputFilename, + const std::string &InputFilename, + const std::string &llc, + char ** const envp) { + // Run LLC to convert the bytecode file into assembly code. + const char *cmd[6]; + cmd[0] = llc.c_str(); + cmd[1] = "-f"; + cmd[2] = "-o"; + cmd[3] = OutputFilename.c_str(); + cmd[4] = InputFilename.c_str(); + cmd[5] = 0; + + return ExecWait(cmd, envp); + } + + /// GenerateAssembly - generates a native assembly language source file from the + /// specified bytecode file. + int llvm::GenerateCFile(const std::string &OutputFile, + const std::string &InputFile, + const std::string &llc, char ** const envp) { + // Run LLC to convert the bytecode file into C. + const char *cmd[7]; + + cmd[0] = llc.c_str(); + cmd[1] = "-march=c"; + cmd[2] = "-f"; + cmd[3] = "-o"; + cmd[4] = OutputFile.c_str(); + cmd[5] = InputFile.c_str(); + cmd[6] = 0; + return ExecWait(cmd, envp); + } + + /// GenerateNative - generates a native assembly language source file from the + /// specified assembly source file. + /// + /// Inputs: + /// InputFilename - The name of the output bytecode file. + /// OutputFilename - The name of the file to generate. + /// Libraries - The list of libraries with which to link. + /// LibPaths - The list of directories in which to find libraries. + /// gcc - The pathname to use for GGC. + /// envp - A copy of the process's current environment. + /// + /// Outputs: + /// None. + /// + /// Returns non-zero value on error. + /// + int llvm::GenerateNative(const std::string &OutputFilename, + const std::string &InputFilename, + const std::vector &Libraries, + const std::vector &LibPaths, + const std::string &gcc, char ** const envp) { + // Remove these environment variables from the environment of the + // programs that we will execute. It appears that GCC sets these + // environment variables so that the programs it uses can configure + // themselves identically. + // + // However, when we invoke GCC below, we want it to use its normal + // configuration. Hence, we must sanitize its environment. + char ** clean_env = CopyEnv(envp); + if (clean_env == NULL) + return 1; + RemoveEnv("LIBRARY_PATH", clean_env); + RemoveEnv("COLLECT_GCC_OPTIONS", clean_env); + RemoveEnv("GCC_EXEC_PREFIX", clean_env); + RemoveEnv("COMPILER_PATH", clean_env); + RemoveEnv("COLLECT_GCC", clean_env); + + std::vector cmd; + + // Run GCC to assemble and link the program into native code. + // + // Note: + // We can't just assemble and link the file with the system assembler + // and linker because we don't know where to put the _start symbol. + // GCC mysteriously knows how to do it. + cmd.push_back(gcc.c_str()); + cmd.push_back("-fno-strict-aliasing"); + cmd.push_back("-O3"); + cmd.push_back("-o"); + cmd.push_back(OutputFilename.c_str()); + cmd.push_back(InputFilename.c_str()); + + // Adding the library paths creates a problem for native generation. If we + // include the search paths from llvmgcc, then we'll be telling normal gcc + // to look inside of llvmgcc's library directories for libraries. This is + // bad because those libraries hold only bytecode files (not native object + // files). In the end, we attempt to link the bytecode libgcc into a native + // program. + #if 0 + // Add in the library path options. + for (unsigned index=0; index < LibPaths.size(); index++) { + cmd.push_back("-L"); + cmd.push_back(LibPaths[index].c_str()); + } + #endif + + // Add in the libraries to link. + std::vector Libs(Libraries); + for (unsigned index = 0; index < Libs.size(); index++) { + if (Libs[index] != "crtend") { + Libs[index] = "-l" + Libs[index]; + cmd.push_back(Libs[index].c_str()); + } + } + cmd.push_back(NULL); + + // Run the compiler to assembly and link together the program. + return ExecWait(&(cmd[0]), clean_env); + } + Index: llvm/tools/llvm-ld/Linker.cpp diff -c /dev/null llvm/tools/llvm-ld/Linker.cpp:1.1 *** /dev/null Sun Sep 12 20:28:04 2004 --- llvm/tools/llvm-ld/Linker.cpp Sun Sep 12 20:27:53 2004 *************** *** 0 **** --- 1,419 ---- + //===- Linker.cpp - Link together LLVM objects and libraries --------------===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file contains routines to handle linking together LLVM bytecode files, + // and to handle annoying things like static libraries. + // + //===----------------------------------------------------------------------===// + + #include "llvm-ld.h" + #include "llvm/Module.h" + #include "llvm/PassManager.h" + #include "llvm/Bytecode/Reader.h" + #include "llvm/Bytecode/WriteBytecodePass.h" + #include "llvm/Target/TargetData.h" + #include "llvm/Transforms/IPO.h" + #include "llvm/Transforms/Scalar.h" + #include "llvm/Support/Linker.h" + #include "llvm/Config/config.h" + #include "llvm/Support/CommandLine.h" + #include "llvm/Support/FileUtilities.h" + #include "llvm/System/Signals.h" + #include "llvm/Support/SystemUtils.h" + #include + #include + #include + #include + using namespace llvm; + + /// FindLib - Try to convert Filename into the name of a file that we can open, + /// if it does not already name a file we can open, by first trying to open + /// Filename, then libFilename.[suffix] for each of a set of several common + /// library suffixes, in each of the directories in Paths and the directory + /// named by the value of the environment variable LLVM_LIB_SEARCH_PATH. Returns + /// an empty string if no matching file can be found. + /// + std::string llvm::FindLib(const std::string &Filename, + const std::vector &Paths, + bool SharedObjectOnly) { + // Determine if the pathname can be found as it stands. + if (FileOpenable(Filename)) + return Filename; + + // If that doesn't work, convert the name into a library name. + std::string LibName = "lib" + Filename; + + // Iterate over the directories in Paths to see if we can find the library + // there. + for (unsigned Index = 0; Index != Paths.size(); ++Index) { + std::string Directory = Paths[Index] + "/"; + + if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".bc")) + return Directory + LibName + ".bc"; + + if (FileOpenable(Directory + LibName + SHLIBEXT)) + return Directory + LibName + SHLIBEXT; + + if (!SharedObjectOnly && FileOpenable(Directory + LibName + ".a")) + return Directory + LibName + ".a"; + } + + // One last hope: Check LLVM_LIB_SEARCH_PATH. + char *SearchPath = getenv("LLVM_LIB_SEARCH_PATH"); + if (SearchPath == NULL) + return std::string(); + + LibName = std::string(SearchPath) + "/" + LibName; + if (FileOpenable(LibName)) + return LibName; + + return std::string(); + } + + /// GetAllDefinedSymbols - Modifies its parameter DefinedSymbols to contain the + /// name of each externally-visible symbol defined in M. + /// + void llvm::GetAllDefinedSymbols(Module *M, + std::set &DefinedSymbols) { + for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) + if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage()) + DefinedSymbols.insert(I->getName()); + for (Module::giterator I = M->gbegin(), E = M->gend(); I != E; ++I) + if (I->hasName() && !I->isExternal() && !I->hasInternalLinkage()) + DefinedSymbols.insert(I->getName()); + } + + /// GetAllUndefinedSymbols - calculates the set of undefined symbols that still + /// exist in an LLVM module. This is a bit tricky because there may be two + /// symbols with the same name but different LLVM types that will be resolved to + /// each other but aren't currently (thus we need to treat it as resolved). + /// + /// Inputs: + /// M - The module in which to find undefined symbols. + /// + /// Outputs: + /// UndefinedSymbols - A set of C++ strings containing the name of all + /// undefined symbols. + /// + void + llvm::GetAllUndefinedSymbols(Module *M, + std::set &UndefinedSymbols) { + std::set DefinedSymbols; + UndefinedSymbols.clear(); // Start out empty + + for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) + if (I->hasName()) { + if (I->isExternal()) + UndefinedSymbols.insert(I->getName()); + else if (!I->hasInternalLinkage()) + DefinedSymbols.insert(I->getName()); + } + for (Module::giterator I = M->gbegin(), E = M->gend(); I != E; ++I) + if (I->hasName()) { + if (I->isExternal()) + UndefinedSymbols.insert(I->getName()); + else if (!I->hasInternalLinkage()) + DefinedSymbols.insert(I->getName()); + } + + // Prune out any defined symbols from the undefined symbols set... + for (std::set::iterator I = UndefinedSymbols.begin(); + I != UndefinedSymbols.end(); ) + if (DefinedSymbols.count(*I)) + UndefinedSymbols.erase(I++); // This symbol really is defined! + else + ++I; // Keep this symbol in the undefined symbols list + } + + + /// LoadObject - Read in and parse the bytecode file named by FN and return the + /// module it contains (wrapped in an auto_ptr), or 0 and set ErrorMessage if an + /// error occurs. + /// + std::auto_ptr llvm::LoadObject(const std::string &FN, + std::string &ErrorMessage) { + std::string ParserErrorMessage; + Module *Result = ParseBytecodeFile(FN, &ParserErrorMessage); + if (Result) return std::auto_ptr(Result); + ErrorMessage = "Bytecode file '" + FN + "' could not be loaded"; + if (ParserErrorMessage.size()) ErrorMessage += ": " + ParserErrorMessage; + return std::auto_ptr(); + } + + /// LinkInArchive - opens an archive library and link in all objects which + /// provide symbols that are currently undefined. + /// + /// Inputs: + /// M - The module in which to link the archives. + /// Filename - The pathname of the archive. + /// Verbose - Flags whether verbose messages should be printed. + /// + /// Outputs: + /// ErrorMessage - A C++ string detailing what error occurred, if any. + /// + /// Return Value: + /// TRUE - An error occurred. + /// FALSE - No errors. + /// + static bool LinkInArchive(Module *M, + const std::string &Filename, + std::string &ErrorMessage, + bool Verbose) + { + // Find all of the symbols currently undefined in the bytecode program. + // If all the symbols are defined, the program is complete, and there is + // no reason to link in any archive files. + std::set UndefinedSymbols; + GetAllUndefinedSymbols(M, UndefinedSymbols); + if (UndefinedSymbols.empty()) { + if (Verbose) std::cerr << " No symbols undefined, don't link library!\n"; + return false; // No need to link anything in! + } + + // Load in the archive objects. + if (Verbose) std::cerr << " Loading archive file '" << Filename << "'\n"; + std::vector Objects; + if (ReadArchiveFile(Filename, Objects, &ErrorMessage)) + return true; + + // Figure out which symbols are defined by all of the modules in the archive. + std::vector > DefinedSymbols; + DefinedSymbols.resize(Objects.size()); + for (unsigned i = 0; i != Objects.size(); ++i) { + GetAllDefinedSymbols(Objects[i], DefinedSymbols[i]); + } + + // While we are linking in object files, loop. + bool Linked = true; + while (Linked) { + Linked = false; + + for (unsigned i = 0; i != Objects.size(); ++i) { + // Consider whether we need to link in this module... we only need to + // link it in if it defines some symbol which is so far undefined. + // + const std::set &DefSymbols = DefinedSymbols[i]; + + bool ObjectRequired = false; + + // + // If the object defines main() and the program currently has main() + // undefined, then automatically link in the module. Otherwise, look to + // see if it defines a symbol that is currently undefined. + // + if ((M->getMainFunction() == NULL) && + ((DefSymbols.find ("main")) != DefSymbols.end())) { + ObjectRequired = true; + } else { + for (std::set::iterator I = UndefinedSymbols.begin(), + E = UndefinedSymbols.end(); I != E; ++I) + if (DefSymbols.count(*I)) { + if (Verbose) + std::cerr << " Found object '" + << Objects[i]->getModuleIdentifier () + << "' providing symbol '" << *I << "'...\n"; + ObjectRequired = true; + break; + } + } + + // We DO need to link this object into the program... + if (ObjectRequired) { + if (LinkModules(M, Objects[i], &ErrorMessage)) + return true; // Couldn't link in the right object file... + + // Since we have linked in this object, delete it from the list of + // objects to consider in this archive file. + std::swap(Objects[i], Objects.back()); + std::swap(DefinedSymbols[i], DefinedSymbols.back()); + Objects.pop_back(); + DefinedSymbols.pop_back(); + --i; // Do not skip an entry + + // The undefined symbols set should have shrunk. + GetAllUndefinedSymbols(M, UndefinedSymbols); + Linked = true; // We have linked something in! + } + } + } + + return false; + } + + /// LinkInFile - opens a bytecode file and links in all objects which + /// provide symbols that are currently undefined. + /// + /// Inputs: + /// HeadModule - The module in which to link the bytecode file. + /// Filename - The pathname of the bytecode file. + /// Verbose - Flags whether verbose messages should be printed. + /// + /// Outputs: + /// ErrorMessage - A C++ string detailing what error occurred, if any. + /// + /// Return Value: + /// TRUE - An error occurred. + /// FALSE - No errors. + /// + static bool LinkInFile(Module *HeadModule, + const std::string &Filename, + std::string &ErrorMessage, + bool Verbose) + { + std::auto_ptr M(LoadObject(Filename, ErrorMessage)); + if (M.get() == 0) return true; + bool Result = LinkModules(HeadModule, M.get(), &ErrorMessage); + if (Verbose) std::cerr << "Linked in bytecode file '" << Filename << "'\n"; + return Result; + } + + /// LinkFiles - takes a module and a list of files and links them all together. + /// It locates the file either in the current directory, as its absolute + /// or relative pathname, or as a file somewhere in LLVM_LIB_SEARCH_PATH. + /// + /// Inputs: + /// progname - The name of the program (infamous argv[0]). + /// HeadModule - The module under which all files will be linked. + /// Files - A vector of C++ strings indicating the LLVM bytecode filenames + /// to be linked. The names can refer to a mixture of pure LLVM + /// bytecode files and archive (ar) formatted files. + /// Verbose - Flags whether verbose output should be printed while linking. + /// + /// Outputs: + /// HeadModule - The module will have the specified LLVM bytecode files linked + /// in. + /// + /// Return value: + /// FALSE - No errors. + /// TRUE - Some error occurred. + /// + bool llvm::LinkFiles(const char *progname, Module *HeadModule, + const std::vector &Files, bool Verbose) { + // String in which to receive error messages. + std::string ErrorMessage; + + // Full pathname of the file + std::string Pathname; + + // Get the library search path from the environment + char *SearchPath = getenv("LLVM_LIB_SEARCH_PATH"); + + for (unsigned i = 0; i < Files.size(); ++i) { + // Determine where this file lives. + if (FileOpenable(Files[i])) { + Pathname = Files[i]; + } else { + if (SearchPath == NULL) { + std::cerr << progname << ": Cannot find linker input file '" + << Files[i] << "'\n"; + std::cerr << progname + << ": Warning: Your LLVM_LIB_SEARCH_PATH is unset.\n"; + return true; + } + + Pathname = std::string(SearchPath)+"/"+Files[i]; + if (!FileOpenable(Pathname)) { + std::cerr << progname << ": Cannot find linker input file '" + << Files[i] << "'\n"; + return true; + } + } + + // A user may specify an ar archive without -l, perhaps because it + // is not installed as a library. Detect that and link the library. + if (IsArchive(Pathname)) { + if (Verbose) + std::cerr << "Trying to link archive '" << Pathname << "'\n"; + + if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) { + std::cerr << progname << ": Error linking in archive '" << Pathname + << "': " << ErrorMessage << "\n"; + return true; + } + } else if (IsBytecode(Pathname)) { + if (Verbose) + std::cerr << "Trying to link bytecode file '" << Pathname << "'\n"; + + if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) { + std::cerr << progname << ": Error linking in bytecode file '" + << Pathname << "': " << ErrorMessage << "\n"; + return true; + } + } + } + + return false; + } + + /// LinkLibraries - takes the specified library files and links them into the + /// main bytecode object file. + /// + /// Inputs: + /// progname - The name of the program (infamous argv[0]). + /// HeadModule - The module into which all necessary libraries will be linked. + /// Libraries - The list of libraries to link into the module. + /// LibPaths - The list of library paths in which to find libraries. + /// Verbose - Flags whether verbose messages should be printed. + /// Native - Flags whether native code is being generated. + /// + /// Outputs: + /// HeadModule - The module will have all necessary libraries linked in. + /// + /// Return value: + /// FALSE - No error. + /// TRUE - Error. + /// + void llvm::LinkLibraries(const char *progname, Module *HeadModule, + const std::vector &Libraries, + const std::vector &LibPaths, + bool Verbose, bool Native) { + // String in which to receive error messages. + std::string ErrorMessage; + + for (unsigned i = 0; i < Libraries.size(); ++i) { + // Determine where this library lives. + std::string Pathname = FindLib(Libraries[i], LibPaths); + if (Pathname.empty()) { + // If the pathname does not exist, then continue to the next one if + // we're doing a native link and give an error if we're doing a bytecode + // link. + if (!Native) { + std::cerr << progname << ": WARNING: Cannot find library -l" + << Libraries[i] << "\n"; + continue; + } + } + + // A user may specify an ar archive without -l, perhaps because it + // is not installed as a library. Detect that and link the library. + if (IsArchive(Pathname)) { + if (Verbose) + std::cerr << "Trying to link archive '" << Pathname << "' (-l" + << Libraries[i] << ")\n"; + + if (LinkInArchive(HeadModule, Pathname, ErrorMessage, Verbose)) { + std::cerr << progname << ": " << ErrorMessage + << ": Error linking in archive '" << Pathname << "' (-l" + << Libraries[i] << ")\n"; + exit(1); + } + } else if (IsBytecode(Pathname)) { + if (Verbose) + std::cerr << "Trying to link bytecode file '" << Pathname + << "' (-l" << Libraries[i] << ")\n"; + + if (LinkInFile(HeadModule, Pathname, ErrorMessage, Verbose)) { + std::cerr << progname << ": " << ErrorMessage + << ": error linking in bytecode file '" << Pathname << "' (-l" + << Libraries[i] << ")\n"; + exit(1); + } + } + } + } Index: llvm/tools/llvm-ld/Makefile diff -c /dev/null llvm/tools/llvm-ld/Makefile:1.1 *** /dev/null Sun Sep 12 20:28:04 2004 --- llvm/tools/llvm-ld/Makefile Sun Sep 12 20:27:53 2004 *************** *** 0 **** --- 1,16 ---- + ##===- tools/gccld/Makefile --------------------------------*- Makefile -*-===## + # + # The LLVM Compiler Infrastructure + # + # This file was developed by the LLVM research group and is distributed under + # the University of Illinois Open Source License. See LICENSE.TXT for details. + # + ##===----------------------------------------------------------------------===## + + LEVEL = ../.. + + TOOLNAME = llvm-ld + USEDLIBS = ipo.a transforms.a scalaropts.a analysis.a ipa.a transformutils.a \ + target.a bcreader bcwriter vmcore support.a LLVMsystem.a + + include $(LEVEL)/Makefile.common Index: llvm/tools/llvm-ld/llvm-ld.cpp diff -c /dev/null llvm/tools/llvm-ld/llvm-ld.cpp:1.1 *** /dev/null Sun Sep 12 20:28:04 2004 --- llvm/tools/llvm-ld/llvm-ld.cpp Sun Sep 12 20:27:53 2004 *************** *** 0 **** --- 1,303 ---- + //===- llvm-ld.cpp - LLVM 'ld' compatible linker --------------------------===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This utility is intended to be compatible with GCC, and follows standard + // system 'ld' conventions. As such, the default output file is ./a.out. + // Additionally, this program outputs a shell script that is used to invoke LLI + // to execute the program. In this manner, the generated executable (a.out for + // example), is directly executable, whereas the bytecode file actually lives in + // the a.out.bc file generated by this program. Also, Force is on by default. + // + // Note that if someone (or a script) deletes the executable program generated, + // the .bc file will be left around. Considering that this is a temporary hack, + // I'm not too worried about this. + // + //===----------------------------------------------------------------------===// + + #include "llvm-ld.h" + #include "llvm/Module.h" + #include "llvm/PassManager.h" + #include "llvm/Bytecode/Reader.h" + #include "llvm/Bytecode/WriteBytecodePass.h" + #include "llvm/Target/TargetData.h" + #include "llvm/Transforms/IPO.h" + #include "llvm/Transforms/Scalar.h" + #include "llvm/Support/Linker.h" + #include "llvm/Support/CommandLine.h" + #include "llvm/Support/FileUtilities.h" + #include "llvm/System/Signals.h" + #include "llvm/Support/SystemUtils.h" + #include + #include + using namespace llvm; + + enum OptimizationLevels { + OPT_FAST_COMPILE, + OPT_SIMPLE, + OPT_AGGRESSIVE, + OPT_LINK_TIME, + OPT_AGGRESSIVE_LINK_TIME + }; + + namespace { + cl::list + InputFilenames(cl::Positional, cl::desc(""), + cl::OneOrMore); + + cl::opt + OutputFilename("o", cl::desc("Override output filename"), cl::init("a.out"), + cl::value_desc("filename")); + + cl::opt + Verbose("v", cl::desc("Print information about actions taken")); + + cl::list + LibPaths("L", cl::desc("Specify a library search path"), cl::Prefix, + cl::value_desc("directory")); + + cl::list + Libraries("l", cl::desc("Specify libraries to link to"), cl::Prefix, + cl::value_desc("library prefix")); + + cl::opt + Strip("s", cl::desc("Strip symbol info from executable")); + + cl::opt + NoInternalize("disable-internalize", + cl::desc("Do not mark all symbols as internal")); + cl::alias + ExportDynamic("export-dynamic", cl::desc("Alias for -disable-internalize"), + cl::aliasopt(NoInternalize)); + + cl::opt + LinkAsLibrary("link-as-library", cl::desc("Link the .bc files together as a" + " library, not an executable")); + cl::alias + Relink("r", cl::desc("Alias for -link-as-library"), + cl::aliasopt(LinkAsLibrary)); + + cl::opt + Native("native", + cl::desc("Generate a native binary instead of a shell script")); + cl::opt + NativeCBE("native-cbe", + cl::desc("Generate a native binary with the C backend and GCC")); + + // Compatibility options that are ignored but supported by LD + cl::opt + CO3("soname", cl::Hidden, cl::desc("Compatibility option: ignored")); + cl::opt + CO4("version-script", cl::Hidden, cl::desc("Compatibility option: ignored")); + cl::opt + CO5("eh-frame-hdr", cl::Hidden, cl::desc("Compatibility option: ignored")); + cl::opt + CO6("h", cl::Hidden, cl::desc("Compatibility option: ignored")); + + cl::opt OptLevel( + cl::desc("Choose level of optimization to apply:"), + cl::init(OPT_FAST_COMPILE), cl::values( + clEnumValN(OPT_FAST_COMPILE,"O0", + "An alias for the -O1 option."), + clEnumValN(OPT_FAST_COMPILE,"O1", + "Optimize for linking speed, not execution speed."), + clEnumValN(OPT_SIMPLE,"O2", + "Perform only required/minimal optimizations"), + clEnumValN(OPT_AGGRESSIVE,"O3", + "An alias for the -O2 option."), + clEnumValN(OPT_LINK_TIME,"O4", + "Perform standard link time optimizations"), + clEnumValN(OPT_AGGRESSIVE_LINK_TIME,"O5", + "Perform aggressive link time optimizations"), + clEnumValEnd + ) + ); + } + + /// PrintAndReturn - Prints a message to standard error and returns true. + /// + /// Inputs: + /// progname - The name of the program (i.e. argv[0]). + /// Message - The message to print to standard error. + /// + static int PrintAndReturn(const char *progname, const std::string &Message) { + std::cerr << progname << ": " << Message << "\n"; + return 1; + } + + /// EmitShellScript - Output the wrapper file that invokes the JIT on the LLVM + /// bytecode file for the program. + static void EmitShellScript(char **argv) { + #if defined(_WIN32) || defined(__CYGWIN__) + // Windows doesn't support #!/bin/sh style shell scripts in .exe files. To + // support windows systems, we copy the llvm-stub.exe executable from the + // build tree to the destination file. + std::string llvmstub = FindExecutable("llvm-stub.exe", argv[0]); + if (llvmstub.empty()) { + std::cerr << "Could not find llvm-stub.exe executable!\n"; + exit(1); + } + if (CopyFile(OutputFilename, llvmstub)) { + std::cerr << "Could not copy the llvm-stub.exe executable!\n"; + exit(1); + } + return; + #endif + + // Output the script to start the program... + std::ofstream Out2(OutputFilename.c_str()); + if (!Out2.good()) + exit(PrintAndReturn(argv[0], "error opening '" + OutputFilename + + "' for writing!")); + + Out2 << "#!/bin/sh\n"; + // Allow user to setenv LLVMINTERP if lli is not in their PATH. + Out2 << "lli=${LLVMINTERP-lli}\n"; + Out2 << "exec $lli \\\n"; + // gcc accepts -l and implicitly searches /lib and /usr/lib. + LibPaths.push_back("/lib"); + LibPaths.push_back("/usr/lib"); + LibPaths.push_back("/usr/X11R6/lib"); + // We don't need to link in libc! In fact, /usr/lib/libc.so may not be a + // shared object at all! See RH 8: plain text. + std::vector::iterator libc = + std::find(Libraries.begin(), Libraries.end(), "c"); + if (libc != Libraries.end()) Libraries.erase(libc); + // List all the shared object (native) libraries this executable will need + // on the command line, so that we don't have to do this manually! + for (std::vector::iterator i = Libraries.begin(), + e = Libraries.end(); i != e; ++i) { + std::string FullLibraryPath = FindLib(*i, LibPaths, true); + if (!FullLibraryPath.empty() && IsSharedObject(FullLibraryPath)) + Out2 << " -load=" << FullLibraryPath << " \\\n"; + } + Out2 << " $0.bc ${1+\"$@\"}\n"; + Out2.close(); + } + + int main(int argc, char **argv, char **envp) { + cl::ParseCommandLineOptions(argc, argv, " llvm linker for GCC\n"); + sys::PrintStackTraceOnErrorSignal(); + + std::string ModuleID("gccld-output"); + std::auto_ptr Composite(new Module(ModuleID)); + + // We always look first in the current directory when searching for libraries. + LibPaths.insert(LibPaths.begin(), "."); + + // If the user specified an extra search path in their environment, respect + // it. + if (char *SearchPath = getenv("LLVM_LIB_SEARCH_PATH")) + LibPaths.push_back(SearchPath); + + // Remove any consecutive duplicates of the same library... + Libraries.erase(std::unique(Libraries.begin(), Libraries.end()), + Libraries.end()); + + // Link in all of the files + if (LinkFiles(argv[0], Composite.get(), InputFilenames, Verbose)) + return 1; // Error already printed + + if (!LinkAsLibrary) + LinkLibraries(argv[0], Composite.get(), Libraries, LibPaths, + Verbose, Native); + + // Link in all of the libraries next... + + // Create the output file. + std::string RealBytecodeOutput = OutputFilename; + if (!LinkAsLibrary) RealBytecodeOutput += ".bc"; + std::ofstream Out(RealBytecodeOutput.c_str()); + if (!Out.good()) + return PrintAndReturn(argv[0], "error opening '" + RealBytecodeOutput + + "' for writing!"); + + // Ensure that the bytecode file gets removed from the disk if we get a + // SIGINT signal. + sys::RemoveFileOnSignal(RealBytecodeOutput); + + // Generate the bytecode file. + if (GenerateBytecode(Composite.get(), Strip, !NoInternalize, &Out)) { + Out.close(); + return PrintAndReturn(argv[0], "error generating bytecode"); + } + + // Close the bytecode file. + Out.close(); + + // If we are not linking a library, generate either a native executable + // or a JIT shell script, depending upon what the user wants. + if (!LinkAsLibrary) { + // If the user wants to generate a native executable, compile it from the + // bytecode file. + // + // Otherwise, create a script that will run the bytecode through the JIT. + if (Native) { + // Name of the Assembly Language output file + std::string AssemblyFile = OutputFilename + ".s"; + + // Mark the output files for removal if we get an interrupt. + sys::RemoveFileOnSignal(AssemblyFile); + sys::RemoveFileOnSignal(OutputFilename); + + // Determine the locations of the llc and gcc programs. + std::string llc = FindExecutable("llc", argv[0]); + std::string gcc = FindExecutable("gcc", argv[0]); + if (llc.empty()) + return PrintAndReturn(argv[0], "Failed to find llc"); + + if (gcc.empty()) + return PrintAndReturn(argv[0], "Failed to find gcc"); + + // Generate an assembly language file for the bytecode. + if (Verbose) std::cout << "Generating Assembly Code\n"; + GenerateAssembly(AssemblyFile, RealBytecodeOutput, llc, envp); + if (Verbose) std::cout << "Generating Native Code\n"; + GenerateNative(OutputFilename, AssemblyFile, Libraries, LibPaths, + gcc, envp); + + // Remove the assembly language file. + removeFile (AssemblyFile); + } else if (NativeCBE) { + std::string CFile = OutputFilename + ".cbe.c"; + + // Mark the output files for removal if we get an interrupt. + sys::RemoveFileOnSignal(CFile); + sys::RemoveFileOnSignal(OutputFilename); + + // Determine the locations of the llc and gcc programs. + std::string llc = FindExecutable("llc", argv[0]); + std::string gcc = FindExecutable("gcc", argv[0]); + if (llc.empty()) + return PrintAndReturn(argv[0], "Failed to find llc"); + if (gcc.empty()) + return PrintAndReturn(argv[0], "Failed to find gcc"); + + // Generate an assembly language file for the bytecode. + if (Verbose) std::cout << "Generating Assembly Code\n"; + GenerateCFile(CFile, RealBytecodeOutput, llc, envp); + if (Verbose) std::cout << "Generating Native Code\n"; + GenerateNative(OutputFilename, CFile, Libraries, LibPaths, gcc, envp); + + // Remove the assembly language file. + removeFile(CFile); + + } else { + EmitShellScript(argv); + } + + // Make the script executable... + MakeFileExecutable(OutputFilename); + + // Make the bytecode file readable and directly executable in LLEE as well + MakeFileExecutable(RealBytecodeOutput); + MakeFileReadable(RealBytecodeOutput); + } + + return 0; + } Index: llvm/tools/llvm-ld/llvm-ld.h diff -c /dev/null llvm/tools/llvm-ld/llvm-ld.h:1.1 *** /dev/null Sun Sep 12 20:28:04 2004 --- llvm/tools/llvm-ld/llvm-ld.h Sun Sep 12 20:27:53 2004 *************** *** 0 **** --- 1,67 ---- + //===- llvm-ld.h - Utility functions header file ----------------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file contains function prototypes for the functions in util.cpp. + // + //===----------------------------------------------------------------------===// + + #include "llvm/Module.h" + + #include + #include + #include + + namespace llvm { + + void + GetAllDefinedSymbols (Module *M, std::set &DefinedSymbols); + + void + GetAllUndefinedSymbols(Module *M, std::set &UndefinedSymbols); + + int + GenerateBytecode (Module * M, + bool Strip, + bool Internalize, + std::ostream * Out); + + int + GenerateAssembly (const std::string & OutputFilename, + const std::string & InputFilename, + const std::string & llc, + char ** const envp); + + int GenerateCFile(const std::string &OutputFile, const std::string &InputFile, + const std::string &llc, char ** const envp); + int + GenerateNative (const std::string & OutputFilename, + const std::string & InputFilename, + const std::vector & Libraries, + const std::vector & LibPaths, + const std::string & gcc, + char ** const envp); + + std::auto_ptr + LoadObject (const std::string & FN, std::string &OutErrorMessage); + + std::string FindLib(const std::string &Filename, + const std::vector &Paths, + bool SharedObjectOnly = false); + + void LinkLibraries (const char * progname, Module* HeadModule, + const std::vector & Libraries, + const std::vector & LibPaths, + bool Verbose, bool Native); + bool + LinkFiles (const char * progname, + Module * HeadModule, + const std::vector & Files, + bool Verbose); + + } // End llvm namespace From brukman at uiuc.edu Sun Sep 12 20:32:25 2004 From: brukman at uiuc.edu (Misha Brukman) Date: Sun, 12 Sep 2004 20:32:25 -0500 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/GenerateCode.cpp Linker.cpp Makefile llvm-ld.cpp llvm-ld.h In-Reply-To: <200409130128.UAA04291@zion.cs.uiuc.edu> References: <200409130128.UAA04291@zion.cs.uiuc.edu> Message-ID: <20040913013225.GA4315@zion> On Sun, Sep 12, 2004 at 08:28:04PM -0500, Reid Spencer wrote: > Changes in directory llvm/tools/llvm-ld: > > GenerateCode.cpp added (r1.1) > Linker.cpp added (r1.1) > Makefile added (r1.1) > llvm-ld.cpp added (r1.1) > llvm-ld.h added (r1.1) > --- > Initial implementation of llvm-ld: stolen from gccld. > --- Reid, are you renaming gccld to llvm-ld or is this a new linker? -- Misha Brukman :: http://misha.brukman.net :: http://llvm.cs.uiuc.edu