From c779bab85b1a11bd137cc9eb492aad0c6f586462 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 27 Mar 2008 14:16:55 +0000 Subject: 2008-03-27 Paolo Bonzini * Makefile.tpl (PICFLAG, PICFLAG_FOR_TARGET): Remove. * Makefile.in: Regenerate. config: 2008-03-27 Paolo Bonzini * extensions.m4: New. 2008-03-27 Paolo Bonzini * 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 * configure.ac (frags): Don't set, use frag instead. (PICFLAG): Set here and substitute. * Makefile.in (PICFLAG): Substitute from autoconf. * configure: Regenerate. --- libiberty/ChangeLog | 7 +++++++ libiberty/Makefile.in | 2 +- libiberty/configure | 45 ++++++++++++++++++++++----------------------- libiberty/configure.ac | 42 ++++++++++++++++++++---------------------- 4 files changed, 50 insertions(+), 46 deletions(-) (limited to 'libiberty') diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 04ca869..c85691c 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2008-03-27 Paolo Bonzini + + * 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 * sha1.c: New file, from gnulib. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index bb3bd81..40a1d47 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -60,7 +60,7 @@ RANLIB = @RANLIB@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ -PICFLAG = +PICFLAG = @PICFLAG@ MAKEOVERRIDES = diff --git a/libiberty/configure b/libiberty/configure index e444bd3..bbe792d 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #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' # Initialize some variables set by options. @@ -3699,9 +3699,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. @@ -3712,34 +3710,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 + 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 @@ -9671,6 +9669,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@PICFLAG@,$PICFLAG,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@CHECK@,$CHECK,;t t 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 -- cgit v1.1