From: Zack Weinberg Date: Mon, 21 Mar 2005 17:46:19 +0000 (+0000) Subject: configure.ac: Do not invoke TL_AC_GCC_VERSION. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=140e859c6ca288c6c421db6dc04428755ccc066e;p=platform%2Fupstream%2Fgcc.git configure.ac: Do not invoke TL_AC_GCC_VERSION. * configure.ac: Do not invoke TL_AC_GCC_VERSION. In all substitutions, leave gcc_version to be expanded by the Makefile. * aclocal.m4, configure: Regenerate. * Makefile.am: Set gcc_version. * Makefile.in: Regenerate. From-SVN: r96818 --- diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b18aa05..9f37130 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,11 @@ +2005-03-21 Zack Weinberg + + * configure.ac: Do not invoke TL_AC_GCC_VERSION. + In all substitutions, leave gcc_version to be expanded by the Makefile. + * aclocal.m4, configure: Regenerate. + * Makefile.am: Set gcc_version. + * Makefile.in: Regenerate. + 2005-03-16 Francois-Xavier Coudert PR libfortran/20257 @@ -37,11 +45,11 @@ * io/write.c (output_float): Fix typo in condition. 2005-02-25 Peter O'Gorman - Toon Moene + Toon Moene PR libgfortran/17748 * runtime/environ.c: Remove references to environ. - (show_variables): remove GFORTRAN_UNBUFFERED_* and + (show_variables): remove GFORTRAN_UNBUFFERED_* and GFORTRAN_NAME_* because they require environ. (pattern_scan): Remove function. @@ -69,8 +77,8 @@ 2005-02-20 Steven G. Kargl - PR 20085 - * intrinsic/args.c (iargc): Off by 1. + PR 20085 + * intrinsic/args.c (iargc): Off by 1. 2005-02-19 Steven G. Kargl @@ -129,7 +137,7 @@ PR libfortran/18982 * io/unix.c (regular_file): No need to change flags->action - if an error occurs. Document this. + if an error occurs. Document this. No need to call stat() for STATUS_OLD, open() will fail anyway. For ACTION_UNSPECIFIED, try open for read-write, then for @@ -139,16 +147,16 @@ regular_file. 2005-01-22 Tobias Schl"uter - + PR fortran/19194 * io/io.h (st_parameter): Use 'GFC_INTEGER_4' instead of 'int', use CHARACTER macro for definition of string valued paramters. - + 2005-01-22 Bud Davis PR fortran/19314 * io/inquire.c(inquire_via_unit): implement POSITION=. - * io/transfer.c(next_record): update position for + * io/transfer.c(next_record): update position for INQUIRE. * io/rewind.c(st_rewind): update position for INQUIRE. @@ -460,7 +468,7 @@ 2004-12-27 Tobias Schlueter - * libgfortran/libgfortran.h (GFC_UINTEGER_1, GFC_UINTEGER_2): + * libgfortran/libgfortran.h (GFC_UINTEGER_1, GFC_UINTEGER_2): Define. * intrinsics/ishftc.c: Update copyright years. (ishftc8): Change 'shift' and 'size' to GFC_INTEGER_4. @@ -470,7 +478,7 @@ 2004-12-23 Bud Davis PR fortran/19071 - * io/tranfer.c (formatted_transfer): moved check for + * io/tranfer.c (formatted_transfer): moved check for format reversion inside the processing loop. 2004-12-19 Aaron W. LaFramboise @@ -482,7 +490,7 @@ * runtime/error.c (itoa): Same. 2004-12-15 Bud Davis - Steven G. Kargl + Steven G. Kargl PR fortran/17597 * io/list_read.c (read_real): do not push back a comma when @@ -714,7 +722,7 @@ * m4/matmul.m4: Loops reordered to improve cache behavior. * generated/matmul_??.c: Regenerated. - + 2004-11-10 Paul Brook PR fortran/18218 @@ -831,7 +839,7 @@ 2004-09-21 Bud Davis PR fortran/17286 - * io/list_read.c (namelist_read): ignore spaces after + * io/list_read.c (namelist_read): ignore spaces after the '=' for namelist reads. 2004-09-15 Aaron W. LaFramboise @@ -983,7 +991,7 @@ 2004-08-24 Bud Davis - PR fortran/17143 + PR fortran/17143 * runtime/error.c (itoa): keep from overflowing during mod operation by using unsigned variable. @@ -1084,7 +1092,7 @@ 2004-07-18 Bud Davis - * configure.ac: Add check for LFS support. + * configure.ac: Add check for LFS support. * configure: Regenerate 2004-07-11 Paul Brook @@ -1105,7 +1113,7 @@ PR fortran/15472 * io/transfer.c(us_write): set recl for seq unform writes to max size. * io/transfer.c(data_transfer_init): handle un-opened seq unform unit. - * io/unix.c(fd_alloc_w_at): handle requests at start, fd_flush at + * io/unix.c(fd_alloc_w_at): handle requests at start, fd_flush at right time. * io/unix.c(is_seekable): set based upon the file/device, not the method being used to access it (fd or mmap). @@ -1202,16 +1210,16 @@ 2004-06-13 Steven G. Kargl Tobias Schlueter - * random.c: Fix several spelling and formatting mistakes in + * random.c: Fix several spelling and formatting mistakes in comments. (random_r8): Fix loop to make random numbers range in [0,1(. - + 2004-06-13 Steven G. Kargl * random.c (random_r4): Burn a random number. (random_r8): fix infinite loop. - + 2004-06-12 Bud Davis Steve Kargl diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 27b3133..347b552 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -5,6 +5,9 @@ AM_CFLAGS = -std=gnu99 ACLOCAL_AMFLAGS = -I ../config +## May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 6449b3b..147cd36 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -47,8 +47,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \ - $(top_srcdir)/../config/no-executables.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -266,9 +265,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@ @@ -298,6 +294,7 @@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ AM_CFLAGS = -std=gnu99 ACLOCAL_AMFLAGS = -I ../config +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm libgfortranbegin_la_SOURCES = fmain.c diff --git a/libgfortran/aclocal.m4 b/libgfortran/aclocal.m4 index 5d15ebd..935e803 100644 --- a/libgfortran/aclocal.m4 +++ b/libgfortran/aclocal.m4 @@ -817,6 +817,5 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../config/gcc-version.m4]) m4_include([../config/no-executables.m4]) m4_include([acinclude.m4]) diff --git a/libgfortran/configure b/libgfortran/configure index 0a5c3f1..a02f84a 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -308,7 +308,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 gcc_version_trigger gcc_version_full gcc_version toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC CPP CPPFLAGS EGREP MATH_OBJ 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 toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT CFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC CPP CPPFLAGS EGREP MATH_OBJ LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1962,23 +1962,6 @@ else LIBGFOR_IS_NATIVE=true 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 @@ -1987,7 +1970,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" && @@ -4076,7 +4059,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4079 "configure"' > conftest.$ac_ext + echo '#line 4062 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4467,7 +4450,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4470:" \ +echo "$as_me:4453:" \ "checking for Fortran compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -12238,9 +12221,6 @@ s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t s,@multi_basedir@,$multi_basedir,;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,@CC@,$CC,;t t diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index ab55097..eb5e32a 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -68,8 +68,6 @@ else LIBGFOR_IS_NATIVE=true fi -TL_AC_GCC_VERSION([$srcdir/..]) - # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in @@ -78,7 +76,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" &&