From fd0811ef5da95c0787433dd30769a21e0ef662da Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 21 Mar 2005 17:44:38 +0000 Subject: [PATCH] configure.ac: Do not invoke TL_AC_GCC_VERSION. * configure.ac: Do not invoke TL_AC_GCC_VERSION. In all substitutions, expand gcc_version in Makefile. * aclocal.m4, configure: Regenerate. * Makefile.am: Set gcc_version. * Makefile.in, testsuite/Makefile.in: Regenerate. From-SVN: r96817 --- libmudflap/ChangeLog | 12 ++++++++++-- libmudflap/Makefile.am | 3 +++ libmudflap/Makefile.in | 13 +++++++------ libmudflap/aclocal.m4 | 1 - libmudflap/configure | 26 +++----------------------- libmudflap/configure.ac | 4 +--- libmudflap/testsuite/Makefile.in | 7 ++----- 7 files changed, 26 insertions(+), 40 deletions(-) diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index cc0d4187735..0db7ecd89d2 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,11 @@ +2005-03-21 Zack Weinberg + + * configure.ac: Do not invoke TL_AC_GCC_VERSION. + In all substitutions, expand gcc_version in Makefile. + * aclocal.m4, configure: Regenerate. + * Makefile.am: Set gcc_version. + * Makefile.in, testsuite/Makefile.in: Regenerate. + 2005-03-17 Frank Ch. Eigler * mf-runtime.c (__mfu_check): Respect ignore_reads configuration. @@ -91,7 +99,7 @@ (fopen, setvbuf): New/revised hook functions for buffer overriding. (setbuf,setlinebuf,fdopen,freopen,fopen64,freopen64,fclose): Ditto. (fflush): Accept given NULL stream (means "all streams"). - * mf-runtime.h.in: + * mf-runtime.h.in: * mf-runtime.c (__mfu_check): Accept accesses that span adjacent HEAP/GUESS objects. (LOOKUP_CACHE_SIZE_MAX): Raise to 64K entries tentatively. @@ -140,7 +148,7 @@ 2004-08-03 Dale Johannesen - * mf-runtime.c: Conditionalize POSIX_SOURCE for Darwin. + * mf-runtime.c: Conditionalize POSIX_SOURCE for Darwin. 2004-08-03 Frank Ch. Eigler diff --git a/libmudflap/Makefile.am b/libmudflap/Makefile.am index e55738c72a0..3be442a3139 100644 --- a/libmudflap/Makefile.am +++ b/libmudflap/Makefile.am @@ -9,6 +9,9 @@ ACLOCAL_AMFLAGS = -I .. -I ../config MAINT_CHARSET = latin1 SUBDIRS = testsuite +# May be used by various substitution variables. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + SECTION_FLAGS = @SECTION_FLAGS@ AM_CFLAGS = -Wall $(SECTION_FLAGS) diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in index b251f2a8ccc..a96dac3e503 100644 --- a/libmudflap/Makefile.in +++ b/libmudflap/Makefile.in @@ -49,14 +49,15 @@ DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \ $(top_srcdir)/configure ChangeLog subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -189,9 +190,6 @@ datadir = @datadir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -223,6 +221,9 @@ AUTOMAKE_OPTIONS = 1.8 foreign ACLOCAL_AMFLAGS = -I .. -I ../config MAINT_CHARSET = latin1 SUBDIRS = testsuite + +# May be used by various substitution variables. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CFLAGS = -Wall $(SECTION_FLAGS) @LIBMUDFLAPTH_FALSE@libmudflapth = @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la @@ -577,7 +578,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/testsuite + $(mkdir_p) $(distdir)/.. $(distdir)/testsuite @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/libmudflap/aclocal.m4 b/libmudflap/aclocal.m4 index 5c41d5d4c04..99613bff133 100644 --- a/libmudflap/aclocal.m4 +++ b/libmudflap/aclocal.m4 @@ -1127,5 +1127,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../config/gcc-version.m4]) m4_include([../libtool.m4]) diff --git a/libmudflap/configure b/libmudflap/configure index 6bcb2534ef4..38935c6ce6b 100755 --- a/libmudflap/configure +++ b/libmudflap/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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT multi_basedir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS CPP CPPFLAGS EGREP LN_S RANLIB ac_ct_RANLIB LIBTOOL enable_shared enable_static MF_HAVE_STDINT_H MF_HAVE_UINTPTR_T LIBMUDFLAPTH_TRUE LIBMUDFLAPTH_FALSE build_libmudflapth toolexecdir toolexeclibdir NM ac_ct_NM SECTION_FLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -6509,23 +6509,6 @@ _ACEOF fi - -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$srcdir/../gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` - - - - - # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in @@ -6534,7 +6517,7 @@ case ${version_specific_libs} in # and header files if --enable-version-specific-runtime-libs option # is selected. toolexecdir='$(libdir)/gcc/$(target_alias)' - toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' + toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ;; no) if test -n "$with_cross_host" && @@ -6854,7 +6837,7 @@ else multilib_arg= fi - ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/mfconfig.exp" + ac_config_files="$ac_config_files Makefile testsuite/Makefile testsuite/mfconfig.exp" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7587,9 +7570,6 @@ s,@MF_HAVE_UINTPTR_T@,$MF_HAVE_UINTPTR_T,;t t s,@LIBMUDFLAPTH_TRUE@,$LIBMUDFLAPTH_TRUE,;t t s,@LIBMUDFLAPTH_FALSE@,$LIBMUDFLAPTH_FALSE,;t t s,@build_libmudflapth@,$build_libmudflapth,;t t -s,@gcc_version_trigger@,$gcc_version_trigger,;t t -s,@gcc_version_full@,$gcc_version_full,;t t -s,@gcc_version@,$gcc_version,;t t s,@toolexecdir@,$toolexecdir,;t t s,@toolexeclibdir@,$toolexeclibdir,;t t s,@NM@,$NM,;t t diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac index 6a771f6bc93..60c2c7fcedd 100644 --- a/libmudflap/configure.ac +++ b/libmudflap/configure.ac @@ -132,8 +132,6 @@ AC_SUBST(build_libmudflapth) AC_CHECK_LIB(dl, dlsym) -TL_AC_GCC_VERSION([$srcdir/..]) - # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in @@ -142,7 +140,7 @@ case ${version_specific_libs} in # and header files if --enable-version-specific-runtime-libs option # is selected. toolexecdir='$(libdir)/gcc/$(target_alias)' - toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' + toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' ;; no) if test -n "$with_cross_host" && diff --git a/libmudflap/testsuite/Makefile.in b/libmudflap/testsuite/Makefile.in index 1b60def8f15..69f0161b0d3 100644 --- a/libmudflap/testsuite/Makefile.in +++ b/libmudflap/testsuite/Makefile.in @@ -40,8 +40,8 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/mfconfig.exp.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -127,9 +127,6 @@ datadir = @datadir@ enable_shared = @enable_shared@ enable_static = @enable_static@ exec_prefix = @exec_prefix@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ -- 2.11.4.GIT