Skip to content

R
riscv-gcc-1
Commit c91c9c2e by Paolo Bonzini Committed by Paolo Bonzini
Options

configure.ac (frags): Don't set, use frag instead. 

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.

From-SVN: r133639
parent 72425608
Showing with 50 additions and 46 deletions
libiberty/ChangeLog
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.
2008-03-24 Ian Lance Taylor <iant@google.com> 2008-03-24 Ian Lance Taylor <iant@google.com>
* sha1.c: New file, from gnulib. * sha1.c: New file, from gnulib.
......
libiberty/Makefile.in
...@@ -60,7 +60,7 @@ RANLIB = @RANLIB@ ...@@ -60,7 +60,7 @@ RANLIB = @RANLIB@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
PERL = @PERL@ PERL = @PERL@
PICFLAG = PICFLAG = @PICFLAG@
MAKEOVERRIDES = MAKEOVERRIDES =
......
libiberty/configure
...@@ -309,7 +309,7 @@ ac_includes_default="\ ...@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #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 libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir 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 libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PICFLAG EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
ac_subst_files='host_makefile_frag' ac_subst_files='host_makefile_frag'
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -3699,9 +3699,7 @@ case "${host}" in ...@@ -3699,9 +3699,7 @@ case "${host}" in
esac esac
if [ -n "${frag}" ]; then if [ -n "${frag}" ]; then
frags=${libiberty_topdir}/libiberty/config/$frag frag=${libiberty_topdir}/libiberty/config/$frag
else
frags=
fi fi
# If they didn't specify --enable-shared, don't generate shared libs. # If they didn't specify --enable-shared, don't generate shared libs.
...@@ -3712,34 +3710,34 @@ case "${enable_shared}" in ...@@ -3712,34 +3710,34 @@ case "${enable_shared}" in
*) shared=yes ;; *) shared=yes ;;
esac esac
if [ "${shared}" = "yes" ]; then if [ "${shared}" = "yes" ]; then
frag=
case "${host}" in case "${host}" in
*-*-cygwin*) ;; *-*-cygwin*) ;;
alpha*-*-linux*) frag=mh-elfalphapic ;; alpha*-*-linux*) PICFLAG=-fPIC ;;
arm*-*-*) frag=mh-armpic ;; arm*-*-*) PICFLAG=-fPIC ;;
hppa*-*-*) frag=mh-papic ;; hppa*-*-*) PICFLAG=-fPIC ;;
i370-*-*) PICFLAG=-fPIC ;;
ia64-*-*) PICFLAG=-fpic ;;
i[34567]86-*-* | x86_64-*-*) i[34567]86-*-* | x86_64-*-*)
frag=mh-x86pic ;; PICFLAG=-fpic ;;
m68k-*-*) PICFLAG=-fpic ;;
powerpc*-*-aix*) ;; powerpc*-*-aix*) ;;
powerpc*-*-*) frag=mh-ppcpic ;; powerpc*-*-*) PICFLAG=-fPIC ;;
sparc*-*-*) frag=mh-sparcpic ;; sparc*-*-*) case "${CFLAGS}" in
s390*-*-*) frag=mh-s390pic ;; *-fpic* ) PICFLAG=-fpic ;;
*) frag=mh-${host_cpu}pic ;; * ) PICFLAG=-fPIC ;;
esac ;;
s390*-*-*) PICFLAG=-fpic ;;
esac esac
if [ -n "${frag}" ]; then
frags="${frags} ${libiberty_topdir}/config/${frag}"
fi
fi fi
echo "# Warning: this fragment is automatically generated" > temp-frag echo "# Warning: this fragment is automatically generated" > temp-frag
for frag in ${frags}; do if [ -n "${frag}" ] && [ -f "${frag}" ]; then
if [ -f ${frag} ]; then echo "Appending ${frag} to xhost-mkfrag"
echo "Appending ${frag} to xhost-mkfrag" echo "# Following fragment copied from ${frag}" >> temp-frag
echo "# Following fragment copied from ${frag}" >> temp-frag cat ${frag} >> temp-frag
cat ${frag} >> temp-frag fi
fi
done
# record if we want to build shared libs. # record if we want to build shared libs.
if [ "${shared}" = "yes" ]; then if [ "${shared}" = "yes" ]; then
...@@ -9671,6 +9669,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t ...@@ -9671,6 +9669,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@PICFLAG@,$PICFLAG,;t t
s,@EGREP@,$EGREP,;t t s,@EGREP@,$EGREP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t s,@LIBOBJS@,$LIBOBJS,;t t
s,@CHECK@,$CHECK,;t t s,@CHECK@,$CHECK,;t t
......
libiberty/configure.ac
...@@ -187,9 +187,7 @@ case "${host}" in ...@@ -187,9 +187,7 @@ case "${host}" in
esac esac
if [[ -n "${frag}" ]]; then if [[ -n "${frag}" ]]; then
frags=${libiberty_topdir}/libiberty/config/$frag frag=${libiberty_topdir}/libiberty/config/$frag
else
frags=
fi fi
# If they didn't specify --enable-shared, don't generate shared libs. # If they didn't specify --enable-shared, don't generate shared libs.
...@@ -200,34 +198,34 @@ case "${enable_shared}" in ...@@ -200,34 +198,34 @@ case "${enable_shared}" in
*) shared=yes ;; *) shared=yes ;;
esac esac
if [[ "${shared}" = "yes" ]]; then if [[ "${shared}" = "yes" ]]; then
frag=
case "${host}" in case "${host}" in
*-*-cygwin*) ;; *-*-cygwin*) ;;
alpha*-*-linux*) frag=mh-elfalphapic ;; alpha*-*-linux*) PICFLAG=-fPIC ;;
arm*-*-*) frag=mh-armpic ;; arm*-*-*) PICFLAG=-fPIC ;;
hppa*-*-*) frag=mh-papic ;; hppa*-*-*) PICFLAG=-fPIC ;;
i370-*-*) PICFLAG=-fPIC ;;
ia64-*-*) PICFLAG=-fpic ;;
i[[34567]]86-*-* | x86_64-*-*) i[[34567]]86-*-* | x86_64-*-*)
frag=mh-x86pic ;; PICFLAG=-fpic ;;
m68k-*-*) PICFLAG=-fpic ;;
powerpc*-*-aix*) ;; powerpc*-*-aix*) ;;
powerpc*-*-*) frag=mh-ppcpic ;; powerpc*-*-*) PICFLAG=-fPIC ;;
sparc*-*-*) frag=mh-sparcpic ;; sparc*-*-*) case "${CFLAGS}" in
s390*-*-*) frag=mh-s390pic ;; *-fpic* ) PICFLAG=-fpic ;;
*) frag=mh-${host_cpu}pic ;; * ) PICFLAG=-fPIC ;;
esac ;;
s390*-*-*) PICFLAG=-fpic ;;
esac esac
if [[ -n "${frag}" ]]; then
frags="${frags} ${libiberty_topdir}/config/${frag}"
fi
fi fi
AC_SUBST(PICFLAG)
echo "# Warning: this fragment is automatically generated" > temp-frag echo "# Warning: this fragment is automatically generated" > temp-frag
for frag in ${frags}; do if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
if [[ -f ${frag} ]]; then echo "Appending ${frag} to xhost-mkfrag"
echo "Appending ${frag} to xhost-mkfrag" echo "# Following fragment copied from ${frag}" >> temp-frag
echo "# Following fragment copied from ${frag}" >> temp-frag cat ${frag} >> temp-frag
cat ${frag} >> temp-frag fi
fi
done
# record if we want to build shared libs. # record if we want to build shared libs.
if [[ "${shared}" = "yes" ]]; then if [[ "${shared}" = "yes" ]]; then
......
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