summaryrefslogtreecommitdiff
path: root/config-ml.in
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2008-11-27 17:14:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2008-11-27 17:14:58 +0000
commit7bac15d50a56d66b84c729d08fb5838f9f256ea5 (patch)
treeaba2360c0e786ccfdbd16382536690058bed67cf /config-ml.in
parent6450fc81f4411fa55f2a1fba170ff7d85596a63c (diff)
downloadbinutils-redhat-7bac15d50a56d66b84c729d08fb5838f9f256ea5.tar.gz
Merge from GCC:
2007-12-02 Matthias Klose <doko@ubuntu.com> * config-ml.in: Remove 64bit configure tests. 2008-05-14 Rafael Espindola <espindola@google.com> * config-ml.in: don't handle --enable-shared and --enable-static. 2008-09-02 Sebastian Pop <sebastian.pop@amd.com> Tobias Grosser <grosser@fim.uni-passau.de> Jan Sjodin <jan.sjodin@amd.com> Harsha Jagasia <harsha.jagasia@amd.com> Dwarakanath Rajagopal <dwarak.rajagopal@amd.com> Konrad Trifunovic <konrad.trifunovic@inria.fr> Adrien Eliche <aeliche@isty.uvsq.fr> Merge from graphite branch. * configure: Regenerate. * Makefile.in: Regenerate. * configure.ac (host_libs): Add ppl and cloog. Add checks for PPL and CLooG. * Makefile.def (ppl, cloog): Added modules and dependences. * Makefile.tpl (PPLLIBS, PPLINC, CLOOGLIBS, CLOOGINC): New. (HOST_PPLLIBS, HOST_PPLINC, HOST_CLOOGLIBS, HOST_CLOOGINC): New. 2008-09-03 Richard Guenther <rguenther@suse.de> * configure.ac: Always pass -DCLOOG_PPL_BACKEND to the cloog test. * configure: Re-generate. 2008-09-03 Sebastian Pop <sebastian.pop@amd.com> * configure.ac (--with-cloog-polylib): New. (--disable-cloog-version-check): New. (--disable-ppl-version-check): New. * configure: Re-generate. 2008-09-05 Richard Guenther <rguenther@suse.de> * configure.ac: Initialize clooglibs to -lcloog. * configure: Re-generate. 2008-10-13 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * configure.ac (MPFR check): Bump minimum version to 2.3.0 and recommended version to 2.3.2. * configure: Regenerate. 2008-10-31 Ben Elliston <bje@au.ibm.com> * configure.ac (spu-*-*): Remove special case. * configure: Regenerate. Complete comment text from GCC version of: 2008-08-31 Aaron W. LaFramboise <aaronavay62@aaronwl.com> * configure.ac (RPATH_ENVVAR): Use PATH on Windows. (GCC_SHLIB_SUBDIR): New. * Makefile.tpl (HOST_LIB_PATH_gcc): Use GCC_SHLIB_SUBDIR. * configure: Regenerate. * Makefile.in: Regenerate.
Diffstat (limited to 'config-ml.in')
-rw-r--r--config-ml.in53
1 files changed, 6 insertions, 47 deletions
diff --git a/config-ml.in b/config-ml.in
index 9adc9e074c..f2497ada4f 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -135,7 +135,12 @@ do
*) optarg=yes ;;
esac
enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
- eval $enableopt="$optarg"
+ # enable_shared and enable_static are handled by configure.
+ # Don't undo its work.
+ case $enableopt in
+ enable_shared | enable_static) ;;
+ *) eval $enableopt="$optarg" ;;
+ esac
;;
--norecursion | --no-recursion)
ml_norecursion=yes
@@ -382,28 +387,6 @@ mips*-*-*)
esac
done
fi
- case " $multidirs " in
- *" mabi=64 "*)
- # We will not be able to create libraries with -mabi=64 if
- # we cannot even link a trivial program. It usually
- # indicates the 64bit libraries are missing.
- if echo 'main() {}' > conftest.c &&
- ${CC-gcc} -mabi=64 conftest.c -o conftest; then
- :
- else
- echo Could not link program with -mabi=64, disabling it.
- old_multidirs="${multidirs}"
- multidirs=""
- for x in ${old_multidirs}; do
- case "$x" in
- *mabi=64* ) : ;;
- *) multidirs="${multidirs} ${x}" ;;
- esac
- done
- fi
- rm -f conftest.c conftest
- ;;
- esac
;;
powerpc*-*-* | rs6000*-*-*)
if [ x$enable_aix64 = xno ]
@@ -495,30 +478,6 @@ powerpc*-*-* | rs6000*-*-*)
done
fi
;;
-sparc*-*-*)
- case " $multidirs " in
- *" m64 "*)
- # We will not be able to create libraries with -m64 if
- # we cannot even link a trivial program. It usually
- # indicates the 64bit libraries are missing.
- if echo 'main() {}' > conftest.c &&
- ${CC-gcc} -m64 conftest.c -o conftest; then
- :
- else
- echo Could not link program with -m64, disabling it.
- old_multidirs="${multidirs}"
- multidirs=""
- for x in ${old_multidirs}; do
- case "$x" in
- *m64* ) : ;;
- *) multidirs="${multidirs} ${x}" ;;
- esac
- done
- fi
- rm -f conftest.c conftest
- ;;
- esac
- ;;
esac
# Remove extraneous blanks from multidirs.