diff options
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 11 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 54 | ||||
| -rwxr-xr-x | gnattools/configure | 3 | ||||
| -rw-r--r-- | gnattools/configure.ac | 1 |
4 files changed, 16 insertions, 53 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index b57d12aab2..78472acfea 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,10 +1,13 @@ -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 +2016-05-16 Eric Botcazou <ebotcazou@adacore.com> - * GCC 6.1.0 released. + * configure.ac: Add ACX_NONCANONICAL_HOST. + * configure: Regenerate. + * Makefile.in: Replace host_alias with host_noncanonical. + (gnattools-cross): Do not rename the tools. 2016-04-04 Segher Boessenkool <segher@kernel.crashing.org> diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index f949ca9b34..b0860eaf96 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -25,7 +25,6 @@ libdir = @libdir@ build = @build@ target = @target@ host = @host@ -host_alias = @host_alias@ prefix = @prefix@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -34,6 +33,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ # Nonstandard autoconf-set variables. LN_S=@LN_S@ target_noncanonical=@target_noncanonical@ +host_noncanonical=@host_noncanonical@ # Variables for the user (or the top level) to override. exeext = @EXEEXT@ @@ -118,10 +118,10 @@ ifeq ($(build), $(host)) GNATBIND_FOR_HOST=gnatbind GNATLS_FOR_HOST=gnatls else - GNATMAKE_FOR_HOST=$(host_alias)-gnatmake - GNATLINK_FOR_HOST=$(host_alias)-gnatlink - GNATBIND_FOR_HOST=$(host_alias)-gnatbind - GNATLS_FOR_HOST=$(host_alias)-gnatls + GNATMAKE_FOR_HOST=$(host_noncanonical)-gnatmake + GNATLINK_FOR_HOST=$(host_noncanonical)-gnatlink + GNATBIND_FOR_HOST=$(host_noncanonical)-gnatbind + GNATLS_FOR_HOST=$(host_noncanonical)-gnatls endif # Put the host RTS dir first in the PATH to hide the default runtime @@ -219,50 +219,6 @@ gnattools-cross: $(GCC_DIR)/stamp-tools # gnattools2 $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools - # Rename cross tools to where the GCC makefile wants them when - # installing. FIXME: installation should be done elsewhere. - if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \ - mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \ - fi # Other # ----- diff --git a/gnattools/configure b/gnattools/configure index 5243ebd70e..8c75cc06eb 100755 --- a/gnattools/configure +++ b/gnattools/configure @@ -567,6 +567,7 @@ TOOLS_TARGET_PAIRS default_gnattools_target LN_S target_noncanonical +host_noncanonical target_os target_vendor target_cpu @@ -1990,6 +1991,8 @@ esac *) host_noncanonical=${host_alias} ;; esac + + case ${target_alias} in "") target_noncanonical=${host_noncanonical} ;; *) target_noncanonical=${target_alias} ;; diff --git a/gnattools/configure.ac b/gnattools/configure.ac index 9a7c42ac81..86d8926b6c 100644 --- a/gnattools/configure.ac +++ b/gnattools/configure.ac @@ -46,6 +46,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET +ACX_NONCANONICAL_HOST ACX_NONCANONICAL_TARGET # Need to pass this down for now :-P |