diff options
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 32 | ||||
| -rw-r--r-- | libada/Makefile.in | 8 | ||||
| -rwxr-xr-x | libada/configure | 22 | ||||
| -rw-r--r-- | libada/configure.ac | 5 |
4 files changed, 56 insertions, 11 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index 0c230f0dc9..d0afcea554 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,10 +1,32 @@ -2016-08-22 Release Manager +2017-05-02 Release Manager - * GCC 6.2.0 released. + * GCC 7.1.0 released. -2016-04-27 Release Manager +2017-01-17 Jakub Jelinek <jakub@redhat.com> - * GCC 6.1.0 released. + PR other/79046 + * configure.ac: Add GCC_BASE_VER. + * Makefile.in (version): Use @get_gcc_base_ver@ instead of cat to get + version from BASE-VER file. + * configure: Regenerated. + +2017-01-04 Alan Modra <amodra@gmail.com> + + * Makefile.in (configure_deps): Update and order as per + configure.ac sinclude. + * configure: Regenerate. + +2017-01-01 Jakub Jelinek <jakub@redhat.com> + + Update copyright years. + +2016-11-15 Matthias Klose <doko@ubuntu.com> + + * configure: Regenerate. + +2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> + + * configure: Remove SH5 support. 2016-01-04 Jakub Jelinek <jakub@redhat.com> @@ -364,7 +386,7 @@ * New directory, new ChangeLog. -Copyright (C) 2003-2016 Free Software Foundation, Inc. +Copyright (C) 2003-2017 Free Software Foundation, Inc. This ChangeLog is free software; the Free Software Foundation gives unlimited permission to copy, distribute, and modify it. diff --git a/libada/Makefile.in b/libada/Makefile.in index 89c566b11c..328c067c4c 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -1,5 +1,5 @@ # Makefile for libada. -# Copyright (C) 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -67,7 +67,7 @@ host_subdir = @host_subdir@ GCC_DIR=$(MULTIBUILDTOP)../../$(host_subdir)/gcc target_noncanonical:=@target_noncanonical@ -version := $(shell cat $(srcdir)/../gcc/BASE-VER) +version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER) libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR) ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR)) ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR)) @@ -189,8 +189,10 @@ AUTOCONF = autoconf configure_deps = \ $(srcdir)/configure.ac \ $(srcdir)/../config/acx.m4 \ + $(srcdir)/../config/multi.m4 \ $(srcdir)/../config/override.m4 \ - $(srcdir)/../config/multi.m4 + $(srcdir)/../config/picflag.m4 \ + $(srcdir)/../config/unwind_ipinfo.m4 $(srcdir)/configure: @MAINT@ $(configure_deps) cd $(srcdir) && $(AUTOCONF) diff --git a/libada/configure b/libada/configure index 2296096d4d..5ab0e211aa 100755 --- a/libada/configure +++ b/libada/configure @@ -553,6 +553,7 @@ PACKAGE_URL= ac_unique_file="Makefile.in" ac_subst_vars='LTLIBOBJS LIBOBJS +get_gcc_base_ver have_getipinfo default_gnatlib_target LN_S @@ -633,6 +634,7 @@ enable_maintainer_mode enable_multilib enable_shared with_system_libunwind +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1261,6 +1263,8 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-build-libsubdir=DIR Directory where to find libraries for build system --with-system-libunwind use installed libunwind + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -2829,7 +2833,7 @@ case "${host}" in # If we are using a compiler supporting mdynamic-no-pic # and the option has been tested as safe to add, then cancel # it here, since the code generated is incompatible with shared - # libs. + # libs. *-mdynamic-no-pic*) PICFLAG='-fno-common -mno-dynamic-no-pic' ;; *) PICFLAG=-fno-common ;; esac @@ -3008,6 +3012,21 @@ if test x$have_unwind_getipinfo = xyes; then fi +# Determine what GCC version number to use in filesystem paths. + + get_gcc_base_ver="cat" + +# Check whether --with-gcc-major-version-only was given. +if test "${with_gcc_major_version_only+set}" = set; then : + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + fi + +fi + + + + # Output: create a Makefile. ac_config_files="$ac_config_files Makefile" @@ -3719,7 +3738,6 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC" CXX="$CXX" GFORTRAN="$GFORTRAN" -GCJ="$GCJ" _ACEOF diff --git a/libada/configure.ac b/libada/configure.ac index 04e06fe282..3e0f0a3521 100644 --- a/libada/configure.ac +++ b/libada/configure.ac @@ -1,5 +1,5 @@ # Configure script for libada. -# Copyright (C) 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -144,6 +144,9 @@ if test x$have_unwind_getipinfo = xyes; then fi AC_SUBST(have_getipinfo) +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + # Output: create a Makefile. AC_CONFIG_FILES([Makefile]) |