From 297315675e0e7c112b93d733879e514e141df859 Mon Sep 17 00:00:00 2001 From: David Mosberger-Tang Date: Mon, 6 Aug 2007 20:27:29 -0600 Subject: [PATCH] Recreate autoconf files. --- Makefile.in | 2 ++ configure | 78 ++++++++++++++++++++++++++++++++--------------- doc/Makefile.in | 2 ++ src/Makefile.in | 2 ++ tests/Makefile.in | 13 +++++--- 5 files changed, 69 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7048d791..277d72f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -176,6 +176,8 @@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +USE_ALTIVEC_FALSE = @USE_ALTIVEC_FALSE@ +USE_ALTIVEC_TRUE = @USE_ALTIVEC_TRUE@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/configure b/configure index a3aef97b..c120ccf7 100755 --- a/configure +++ b/configure @@ -879,6 +879,8 @@ LIBTOOL CCAS CCASFLAGS LIBOBJS +USE_ALTIVEC_TRUE +USE_ALTIVEC_FALSE REMOTE_ONLY_TRUE REMOTE_ONLY_FALSE ARCH_IA64_TRUE @@ -4978,7 +4980,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4981 "configure"' > conftest.$ac_ext + echo '#line 4983 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7237,11 +7239,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7240: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7244: \$? = $ac_status" >&5 + echo "$as_me:7246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7505,11 +7507,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7510: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7512: \$? = $ac_status" >&5 + echo "$as_me:7514: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7609,11 +7611,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7612: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7614: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7616: \$? = $ac_status" >&5 + echo "$as_me:7618: \$? = $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 @@ -9906,7 +9908,7 @@ else 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:12347: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12349: \$? = $ac_status" >&5 + echo "$as_me:12351: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12446,11 +12448,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12449: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12451: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12453: \$? = $ac_status" >&5 + echo "$as_me:12455: \$? = $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 @@ -14007,11 +14009,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14010: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14012: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14014: \$? = $ac_status" >&5 + echo "$as_me:14016: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14111,11 +14113,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14116: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14118: \$? = $ac_status" >&5 + echo "$as_me:14120: \$? = $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 @@ -16298,11 +16300,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16301: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16303: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16305: \$? = $ac_status" >&5 + echo "$as_me:16307: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16566,11 +16568,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16569: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16571: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16573: \$? = $ac_status" >&5 + echo "$as_me:16575: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16670,11 +16672,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16673: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16675: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16677: \$? = $ac_status" >&5 + echo "$as_me:16679: \$? = $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 @@ -20734,6 +20736,25 @@ is_gcc_m64() { fi; } +is_gcc_altivec() { + if test `echo $CFLAGS | grep "\-maltivec" -c` -eq 1 ; then echo has_altivec; + else + if test `echo $CC | grep "\-maltivec" -c` -eq 1 ; then echo has_altivec; else echo no_altivec; fi; + fi; +} + +use_altivec=`is_gcc_altivec` + + +if test x$use_altivec = xhas_altivec; then + USE_ALTIVEC_TRUE= + USE_ALTIVEC_FALSE='#' +else + USE_ALTIVEC_TRUE='#' + USE_ALTIVEC_FALSE= +fi + + get_arch() { case "$1" in i?86) echo x86;; @@ -21129,6 +21150,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_ALTIVEC_TRUE}" && test -z "${USE_ALTIVEC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_ALTIVEC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_ALTIVEC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${REMOTE_ONLY_TRUE}" && test -z "${REMOTE_ONLY_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"REMOTE_ONLY\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -21887,6 +21915,8 @@ LIBTOOL!$LIBTOOL$ac_delim CCAS!$CCAS$ac_delim CCASFLAGS!$CCASFLAGS$ac_delim LIBOBJS!$LIBOBJS$ac_delim +USE_ALTIVEC_TRUE!$USE_ALTIVEC_TRUE$ac_delim +USE_ALTIVEC_FALSE!$USE_ALTIVEC_FALSE$ac_delim REMOTE_ONLY_TRUE!$REMOTE_ONLY_TRUE$ac_delim REMOTE_ONLY_FALSE!$REMOTE_ONLY_FALSE$ac_delim ARCH_IA64_TRUE!$ARCH_IA64_TRUE$ac_delim @@ -21917,7 +21947,7 @@ PKG_MAINTAINER!$PKG_MAINTAINER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/doc/Makefile.in b/doc/Makefile.in index 0b25479c..6fb0e4aa 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -137,6 +137,8 @@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +USE_ALTIVEC_FALSE = @USE_ALTIVEC_FALSE@ +USE_ALTIVEC_TRUE = @USE_ALTIVEC_TRUE@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/src/Makefile.in b/src/Makefile.in index f2dca3e2..75dc3ab9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -495,6 +495,8 @@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +USE_ALTIVEC_FALSE = @USE_ALTIVEC_FALSE@ +USE_ALTIVEC_TRUE = @USE_ALTIVEC_TRUE@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/tests/Makefile.in b/tests/Makefile.in index a3242b9c..7ca52776 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -38,7 +38,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) -noinst_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) +noinst_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_7) subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/check-namespace.sh.in @@ -81,9 +81,11 @@ am__EXEEXT_4 = @REMOTE_ONLY_FALSE@ test-varargs$(EXEEXT) Gperf-simple$(EXEEXT) \ @REMOTE_ONLY_FALSE@ Lperf-simple$(EXEEXT) @REMOTE_ONLY_TRUE@am__EXEEXT_5 = $(am__EXEEXT_4) -@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@am__EXEEXT_6 = ppc64-test-altivec$(EXEEXT) \ +@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@@USE_ALTIVEC_TRUE@am__EXEEXT_6 = ppc64-test-altivec$(EXEEXT) \ +@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@@USE_ALTIVEC_TRUE@ ppc64-test-wchar$(EXEEXT) +@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@am__EXEEXT_7 = $(am__EXEEXT_6) \ @ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@ ppc64-test-wchar$(EXEEXT) -@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@am__EXEEXT_6 = \ +@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@am__EXEEXT_7 = \ @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-dyn1$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_Gia64_test_nat_OBJECTS = Gia64-test-nat.$(OBJEXT) \ @@ -397,6 +399,8 @@ REMOTE_ONLY_TRUE = @REMOTE_ONLY_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +USE_ALTIVEC_FALSE = @USE_ALTIVEC_FALSE@ +USE_ALTIVEC_TRUE = @USE_ALTIVEC_TRUE@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ @@ -476,7 +480,7 @@ check_SCRIPTS_common = run-check-namespace @REMOTE_ONLY_TRUE@noinst_PROGRAMS_cdep = $(noinst_PROGRAMS_common) @REMOTE_ONLY_FALSE@LIBUNWIND_local = ../src/libunwind.la -@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS_arch = ppc64-test-altivec ppc64-test-wchar +@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS_arch = $(noinst_PROGRAMS_arch_altivec) ppc64-test-wchar @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS_arch = ia64-test-dyn1 @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@check_SCRIPTS_arch = run-ia64-test-dyn1 @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@check_PROGRAMS_arch = Gia64-test-stack Lia64-test-stack \ @@ -485,6 +489,7 @@ check_SCRIPTS_common = run-check-namespace @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ Gia64-test-readonly Lia64-test-readonly \ @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@ ia64-test-setjmp ia64-test-sig +@ARCH_IA64_FALSE@@ARCH_PPC64_TRUE@@REMOTE_ONLY_FALSE@@USE_ALTIVEC_TRUE@noinst_PROGRAMS_arch_altivec = ppc64-test-altivec ppc64-test-wchar check_SCRIPTS = $(check_SCRIPTS_common) $(check_SCRIPTS_cdep) \ $(check_SCRIPTS_arch)