aboutsummaryrefslogtreecommitdiff
path: root/libiberty/configure.ac
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2008-03-27 14:16:55 +0000
committerPaolo Bonzini <bonzini@gnu.org>2008-03-27 14:16:55 +0000
commitc779bab85b1a11bd137cc9eb492aad0c6f586462 (patch)
tree2b592871066f624a345d4776527c2bdcbf56f231 /libiberty/configure.ac
parent35997600fc0056921bbcf9f5e5e07c275169903b (diff)
downloadgdb-c779bab85b1a11bd137cc9eb492aad0c6f586462.zip
gdb-c779bab85b1a11bd137cc9eb492aad0c6f586462.tar.gz
gdb-c779bab85b1a11bd137cc9eb492aad0c6f586462.tar.bz2
2008-03-27 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (PICFLAG, PICFLAG_FOR_TARGET): Remove. * Makefile.in: Regenerate. config: 2008-03-27 Paolo Bonzini <bonzini@gnu.org> * extensions.m4: New. 2008-03-27 Paolo Bonzini <bonzini@gnu.org> * mh-armpic: Remove. * mh-i370pic: Remove. * mh-m68kpic: Remove. * mh-ppcpic: Remove. * mh-sparcpic: Remove. * mh-ia64pic: Remove. * mh-papic: Remove. * mh-s390pic: Remove. * mh-x86pic: Remove. libiberty: 2008-03-27 Paolo Bonzini <bonzini@gnu.org> * configure.ac (frags): Don't set, use frag instead. (PICFLAG): Set here and substitute. * Makefile.in (PICFLAG): Substitute from autoconf. * configure: Regenerate.
Diffstat (limited to 'libiberty/configure.ac')
-rw-r--r--libiberty/configure.ac42
1 files changed, 20 insertions, 22 deletions
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 864db17..f5df558 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -187,9 +187,7 @@ case "${host}" in
esac
if [[ -n "${frag}" ]]; then
- frags=${libiberty_topdir}/libiberty/config/$frag
-else
- frags=
+ frag=${libiberty_topdir}/libiberty/config/$frag
fi
# If they didn't specify --enable-shared, don't generate shared libs.
@@ -200,34 +198,34 @@ case "${enable_shared}" in
*) shared=yes ;;
esac
if [[ "${shared}" = "yes" ]]; then
- frag=
case "${host}" in
*-*-cygwin*) ;;
- alpha*-*-linux*) frag=mh-elfalphapic ;;
- arm*-*-*) frag=mh-armpic ;;
- hppa*-*-*) frag=mh-papic ;;
+ alpha*-*-linux*) PICFLAG=-fPIC ;;
+ arm*-*-*) PICFLAG=-fPIC ;;
+ hppa*-*-*) PICFLAG=-fPIC ;;
+ i370-*-*) PICFLAG=-fPIC ;;
+ ia64-*-*) PICFLAG=-fpic ;;
i[[34567]]86-*-* | x86_64-*-*)
- frag=mh-x86pic ;;
+ PICFLAG=-fpic ;;
+ m68k-*-*) PICFLAG=-fpic ;;
powerpc*-*-aix*) ;;
- powerpc*-*-*) frag=mh-ppcpic ;;
- sparc*-*-*) frag=mh-sparcpic ;;
- s390*-*-*) frag=mh-s390pic ;;
- *) frag=mh-${host_cpu}pic ;;
+ powerpc*-*-*) PICFLAG=-fPIC ;;
+ sparc*-*-*) case "${CFLAGS}" in
+ *-fpic* ) PICFLAG=-fpic ;;
+ * ) PICFLAG=-fPIC ;;
+ esac ;;
+ s390*-*-*) PICFLAG=-fpic ;;
esac
- if [[ -n "${frag}" ]]; then
- frags="${frags} ${libiberty_topdir}/config/${frag}"
- fi
fi
+AC_SUBST(PICFLAG)
echo "# Warning: this fragment is automatically generated" > temp-frag
-for frag in ${frags}; do
- if [[ -f ${frag} ]]; then
- echo "Appending ${frag} to xhost-mkfrag"
- echo "# Following fragment copied from ${frag}" >> temp-frag
- cat ${frag} >> temp-frag
- fi
-done
+if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
+ echo "Appending ${frag} to xhost-mkfrag"
+ echo "# Following fragment copied from ${frag}" >> temp-frag
+ cat ${frag} >> temp-frag
+fi
# record if we want to build shared libs.
if [[ "${shared}" = "yes" ]]; then