re PR bootstrap/40338 (bootstrap comparision fails on 32 bit PA when comparing libgcc objects)
2009-06-26 Steve Ellcey <sje@cup.hp.com> PR bootstrap/40338 * configure.ac (comparestring): Create new variable. * Makefile.tpl (comparestring): Use to skip some comparisions. * configure: Regenerate. * Makefile.in: Regenerate. From-SVN: r148978
This commit is contained in:
parent
f62c0ba4a7
commit
f2689b094a
@ -1,3 +1,11 @@
|
||||
2009-06-26 Steve Ellcey <sje@cup.hp.com>
|
||||
|
||||
PR bootstrap/40338
|
||||
* configure.ac (comparestring): Create new variable.
|
||||
* Makefile.tpl (comparestring): Use to skip some comparisions.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2009-06-26 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Makefile.def (host_modules): Add cgen.
|
||||
|
@ -54141,7 +54141,7 @@ compare:
|
||||
$(do-compare) > /dev/null 2>&1; \
|
||||
if test $$? -eq 1; then \
|
||||
case $$file in \
|
||||
gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
|
||||
@compare_exclusions@) \
|
||||
echo warning: $$file differs ;; \
|
||||
*) \
|
||||
echo $$file differs >> .bad_compare ;; \
|
||||
@ -54479,7 +54479,7 @@ compare3:
|
||||
$(do-compare3) > /dev/null 2>&1; \
|
||||
if test $$? -eq 1; then \
|
||||
case $$file in \
|
||||
gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
|
||||
@compare_exclusions@) \
|
||||
echo warning: $$file differs ;; \
|
||||
*) \
|
||||
echo $$file differs >> .bad_compare ;; \
|
||||
|
@ -1461,7 +1461,7 @@ do-clean: clean-stage[+id+]
|
||||
$(do-[+compare-target+]) > /dev/null 2>&1; \
|
||||
if test $$? -eq 1; then \
|
||||
case $$file in \
|
||||
gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \
|
||||
@compare_exclusions@) \
|
||||
echo warning: $$file differs ;; \
|
||||
*) \
|
||||
echo $$file differs >> .bad_compare ;; \
|
||||
|
12
configure
vendored
12
configure
vendored
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
||||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="move-if-change"
|
||||
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 TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags extra_mpc_gmp_configure_flags extra_mpc_mpfr_configure_flags stage1_ldflags stage1_libs poststage1_ldflags poststage1_libs ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS 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 TOPLEVEL_CONFIGURE_ARGUMENTS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags extra_mpc_gmp_configure_flags extra_mpc_mpfr_configure_flags stage1_ldflags stage1_libs poststage1_ldflags poststage1_libs ppllibs pplinc clooglibs clooginc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR GCC_SHLIB_SUBDIR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir compare_exclusions LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||
ac_pwd=`pwd`
|
||||
|
||||
@ -12925,6 +12925,15 @@ fi;
|
||||
|
||||
|
||||
|
||||
# Specify what files to not compare during bootstrap.
|
||||
|
||||
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
|
||||
case "$target" in
|
||||
hppa*64*-*-hpux*) ;;
|
||||
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
|
||||
esac
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -13698,6 +13707,7 @@ s,@datarootdir@,$datarootdir,;t t
|
||||
s,@docdir@,$docdir,;t t
|
||||
s,@pdfdir@,$pdfdir,;t t
|
||||
s,@htmldir@,$htmldir,;t t
|
||||
s,@compare_exclusions@,$compare_exclusions,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
/@serialization_dependencies@/r $serialization_dependencies
|
||||
|
@ -3132,4 +3132,13 @@ AC_SUBST(docdir)
|
||||
AC_SUBST(pdfdir)
|
||||
AC_SUBST(htmldir)
|
||||
|
||||
# Specify what files to not compare during bootstrap.
|
||||
|
||||
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
|
||||
case "$target" in
|
||||
hppa*64*-*-hpux*) ;;
|
||||
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
|
||||
esac
|
||||
AC_SUBST(compare_exclusions)
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
|
Loading…
Reference in New Issue
Block a user