Skip to content

R
riscv-gcc-1
Commit 769b009e by Kelley Cook Committed by R. Kelley Cook
Options

config.table: Delete file. 

2005-07-07  Kelley Cook  <kcook@gcc.gnu.org>

	* config.table: Delete file.  Move former contents into ...
	* configure.ac: ... here and escape any brackets for m4.
	* Makefile.in (config.status): Remove dependency on config.table.
	* configure: Regenerate.

From-SVN: r101684
parent f379ddd1
Showing with 146 additions and 71 deletions
libiberty/ChangeLog
2005-07-07 Kelley Cook <kcook@gcc.gnu.org>
* config.table: Delete file. Move former contents into ...
* configure.ac: ... here and escape any brackets for m4.
* Makefile.in (config.status): Remove dependency on config.table.
* configure: Regenerate.
2005-07-07 Kelley Cook <kcook@gcc.gnu.org>
* config.in: Regenerate for 6/20 change.
2005-07-03 Steve Ellcey <sje@cup.hp.com>
......
libiberty/Makefile.in
......@@ -401,7 +401,7 @@ config.h: stamp-h ; @true
stamp-h: $(srcdir)/config.in config.status Makefile
CONFIG_FILES= CONFIG_HEADERS=config.h:$(srcdir)/config.in $(SHELL) ./config.status
config.status: $(srcdir)/configure $(srcdir)/config.table
config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
# Depending on config.h makes sure that config.status has been re-run
......
libiberty/config.table deleted 100644 → 0
# Don't build the shared library for build.
if [ -n "${with_build_subdir}" ]; then
enable_shared=no
fi
frag=
case "${host}" in
rs6000-ibm-aix3.1 | rs6000-ibm-aix)
frag=mh-aix ;;
*-*-cxux7*) frag=mh-cxux7 ;;
*-*-freebsd2.1.*) frag=mh-fbsd21 ;;
*-*-freebsd2.2.[012]) frag=mh-fbsd21 ;;
i370-*-opened*) frag=mh-openedition ;;
i[34567]86-*-windows*) frag=mh-windows ;;
esac
if [ -n "${frag}" ]; then
frags=${libiberty_topdir}/libiberty/config/$frag
else
frags=
fi
# If they didn't specify --enable-shared, don't generate shared libs.
case "${enable_shared}" in
yes) shared=yes ;;
no) shared=no ;;
"") shared=no ;;
*) 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 ;;
i[34567]86-*-* | x86_64-*-*)
frag=mh-x86pic ;;
powerpc*-*-aix*) ;;
powerpc*-*-*) frag=mh-ppcpic ;;
sparc*-*-*) frag=mh-sparcpic ;;
s390*-*-*) frag=mh-s390pic ;;
*) frag=mh-${host_cpu}pic ;;
esac
if [ -n "${frag}" ]; then
frags="${frags} ${libiberty_topdir}/config/${frag}"
fi
fi
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
# record if we want to build shared libs.
if [ "${shared}" = "yes" ]; then
echo enable_shared = yes >> temp-frag
else
echo enable_shared = no >> temp-frag
fi
frag=xhost-mkfrag
${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
libiberty/configure
......@@ -3529,7 +3529,75 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
. ${srcdir}/config.table
# Don't build the shared library for build.
if [ -n "${with_build_subdir}" ]; then
enable_shared=no
fi
frag=
case "${host}" in
rs6000-ibm-aix3.1 | rs6000-ibm-aix)
frag=mh-aix ;;
*-*-cxux7*) frag=mh-cxux7 ;;
*-*-freebsd2.1.*) frag=mh-fbsd21 ;;
*-*-freebsd2.2.[012]) frag=mh-fbsd21 ;;
i370-*-opened*) frag=mh-openedition ;;
i[34567]86-*-windows*) frag=mh-windows ;;
esac
if [ -n "${frag}" ]; then
frags=${libiberty_topdir}/libiberty/config/$frag
else
frags=
fi
# If they didn't specify --enable-shared, don't generate shared libs.
case "${enable_shared}" in
yes) shared=yes ;;
no) shared=no ;;
"") shared=no ;;
*) 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 ;;
i[34567]86-*-* | x86_64-*-*)
frag=mh-x86pic ;;
powerpc*-*-aix*) ;;
powerpc*-*-*) frag=mh-ppcpic ;;
sparc*-*-*) frag=mh-sparcpic ;;
s390*-*-*) frag=mh-s390pic ;;
*) frag=mh-${host_cpu}pic ;;
esac
if [ -n "${frag}" ]; then
frags="${frags} ${libiberty_topdir}/config/${frag}"
fi
fi
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
# record if we want to build shared libs.
if [ "${shared}" = "yes" ]; then
echo enable_shared = yes >> temp-frag
else
echo enable_shared = no >> temp-frag
fi
frag=xhost-mkfrag
${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
host_makefile_frag=${frag}
......
libiberty/configure.ac
......@@ -152,7 +152,75 @@ dnl When we start using automake:
dnl AM_PROG_INSTALL
AC_PROG_INSTALL
. ${srcdir}/config.table
# Don't build the shared library for build.
if [[ -n "${with_build_subdir}" ]]; then
enable_shared=no
fi
frag=
case "${host}" in
rs6000-ibm-aix3.1 | rs6000-ibm-aix)
frag=mh-aix ;;
*-*-cxux7*) frag=mh-cxux7 ;;
*-*-freebsd2.1.*) frag=mh-fbsd21 ;;
*-*-freebsd2.2.[[012]]) frag=mh-fbsd21 ;;
i370-*-opened*) frag=mh-openedition ;;
i[[34567]]86-*-windows*) frag=mh-windows ;;
esac
if [[ -n "${frag}" ]]; then
frags=${libiberty_topdir}/libiberty/config/$frag
else
frags=
fi
# If they didn't specify --enable-shared, don't generate shared libs.
case "${enable_shared}" in
yes) shared=yes ;;
no) shared=no ;;
"") shared=no ;;
*) 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 ;;
i[[34567]]86-*-* | x86_64-*-*)
frag=mh-x86pic ;;
powerpc*-*-aix*) ;;
powerpc*-*-*) frag=mh-ppcpic ;;
sparc*-*-*) frag=mh-sparcpic ;;
s390*-*-*) frag=mh-s390pic ;;
*) frag=mh-${host_cpu}pic ;;
esac
if [[ -n "${frag}" ]]; then
frags="${frags} ${libiberty_topdir}/config/${frag}"
fi
fi
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
# record if we want to build shared libs.
if [[ "${shared}" = "yes" ]]; then
echo enable_shared = yes >> temp-frag
else
echo enable_shared = no >> temp-frag
fi
frag=xhost-mkfrag
${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag
host_makefile_frag=${frag}
AC_SUBST_FILE(host_makefile_frag)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment