diff -Nrcpad gcc-4.6.2/gcc/ada/ChangeLog gcc-4.6.3/gcc/ada/ChangeLog *** gcc-4.6.2/gcc/ada/ChangeLog Wed Oct 26 09:05:57 2011 --- gcc-4.6.3/gcc/ada/ChangeLog Thu Mar 1 11:55:29 2012 *************** *** 1,3 **** --- 1,60 ---- + 2012-03-01 Release Manager + + * GCC 4.6.3 released. + + 2012-01-21 Eric Botcazou + + PR ada/46192 + * gcc-interface/decl.c (gnat_to_gnu_entity) : In the case of a + renaming, preserve the volatileness through the indirection, if any. + + 2012-01-09 Eric Botcazou + + * gcc-interface/trans.c (addressable_p) : Fix thinko. + + 2012-01-02 Eric Botcazou + + * gnatvsn.ads (Current_Year): Bump to 2011. + + 2011-12-08 Eric Botcazou + + PR tree-optimization/51315 + Backport from mainline + 2011-09-25 Eric Botcazou + + * gcc-interface/decl.c (gnat_to_gnu_entity) : Do not promote + the alignment if this doesn't prevent BLKmode access to the object. + + 2011-11-13 Iain Sandoe + + Backport from mainline r181474 + PR target/50678 + * init.c (__gnat_error_handler) [Darwin]: Move work-around to the + bug filed as radar #10302855 from __gnat_error_handler ... + ... to (__gnat_adjust_context_for_raise) [Darwin]: New. + (HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE) [Darwin]: Define. + (__gnat_error_handler) [Darwin]: Use __gnat_adjust_context_for_raise. + + 2011-11-18 Tristan Gingold + Iain Sandoe + + PR target/49992 + * mlib-tgt-specific-darwin.adb (Archive_Indexer_Options): Remove. + * gcc-interface/Makefile.in (darwin): Remove ranlib special-casing + for Darwin. + + 2011-11-13 Iain Sandoe + + Backport from mainline r181319 + * gcc-interface/Makefile.in (stamp-gnatlib-$(RTSDIR)): Don't link + s-oscons.ads. + (OSCONS_CPP, OSCONS_EXTRACT): New. + (./bldtools/oscons/xoscons): New Target. + ($(RTSDIR)/s-oscons.ads): New Target. + (gnatlib): Depend on $(RTSDIR)/s-oscons.ads. + * Make-generated.in: Remove machinery to generate xoscons and + ada/s-oscons.ads. + 2011-10-26 Release Manager * GCC 4.6.2 released. diff -Nrcpad gcc-4.6.2/gcc/ada/Make-generated.in gcc-4.6.3/gcc/ada/Make-generated.in *** gcc-4.6.2/gcc/ada/Make-generated.in Tue Oct 26 12:19:56 2010 --- gcc-4.6.3/gcc/ada/Make-generated.in Sun Nov 13 14:25:58 2011 *************** $(ADA_GEN_SUBDIR)/nmake.ads : $(ADA_GEN *** 64,100 **** $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_s (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; gnatmake -q xnmake ; ./xnmake -s ../../nmake.ads ) - ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(subst -, ,$(host)))),) - OSCONS_CPP=../../../$(DECC) -E /comment=as_is -DNATIVE \ - -DTARGET='""$(target)""' s-oscons-tmplt.c - - OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \ - -DTARGET='""$(target)""' s-oscons-tmplt.c ; \ - ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \ - ./s-oscons-tmplt.exe > s-oscons-tmplt.s - - else - # GCC_FOR_TARGET has paths relative to the gcc directory, so we need to ajust - # for running it from $(ADA_GEN_SUBDIR)/bldtools/oscons - OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \ - | sed -e 's^\./xgcc^../../../xgcc^' -e 's^-B./^-B../../../^'` - OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \ - -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i - OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i - endif - - $(ADA_GEN_SUBDIR)/s-oscons.ads : $(ADA_GEN_SUBDIR)/s-oscons-tmplt.c $(ADA_GEN_SUBDIR)/gsocket.h $(ADA_GEN_SUBDIR)/xoscons.adb $(ADA_GEN_SUBDIR)/xutil.ads $(ADA_GEN_SUBDIR)/xutil.adb - -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/oscons - $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/oscons/,$(notdir $^)) - $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/oscons - (cd $(ADA_GEN_SUBDIR)/bldtools/oscons ; gnatmake -q xoscons ; \ - $(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \ - $(OSCONS_CPP) ; \ - $(OSCONS_EXTRACT) ; \ - ./xoscons ; \ - $(RM) ../../s-oscons.ads ; \ - $(CP) s-oscons.ads s-oscons.h ../../) - $(ADA_GEN_SUBDIR)/sdefault.adb: $(ADA_GEN_SUBDIR)/stamp-sdefault ; @true $(ADA_GEN_SUBDIR)/stamp-sdefault : $(srcdir)/version.c Makefile $(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb --- 64,69 ---- diff -Nrcpad gcc-4.6.2/gcc/ada/gcc-interface/Makefile.in gcc-4.6.3/gcc/ada/gcc-interface/Makefile.in *** gcc-4.6.2/gcc/ada/gcc-interface/Makefile.in Thu Sep 8 08:27:57 2011 --- gcc-4.6.3/gcc/ada/gcc-interface/Makefile.in Fri Nov 18 11:46:58 2011 *************** ifeq ($(strip $(filter-out darwin%,$(osy *** 2189,2195 **** EH_MECHANISM=-gcc GNATLIB_SHARED = gnatlib-shared-darwin - RANLIB = ranlib -c GMEM_LIB = gmemlib LIBRARY_VERSION := $(LIB_VERSION) soext = .dylib --- 2189,2194 ---- *************** install-gnatlib: ../stamp-gnatlib-$(RTSD *** 2447,2467 **** $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) ! # Copy generated target dependent sources ! $(RM) $(RTSDIR)/s-oscons.ads ! (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) # GNULLI End ############################################################# # Don't use semicolon separated shell commands that involve list expansions. # The semicolon triggers a call to DCL on VMS and DCL can't handle command # line lengths in excess of 256 characters. # Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS) # is guaranteed to overflow the buffer. ! gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(MAKE) -C $(RTSDIR) \ CC="`echo \"$(GCC_FOR_TARGET)\" \ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ --- 2446,2497 ---- $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) ! # Copy tsystem.h ! $(CP) $(srcdir)/tsystem.h $(RTSDIR) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) # GNULLI End ############################################################# + ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(subst -, ,$(host)))),) + OSCONS_CPP=../../$(DECC) -E /comment=as_is -DNATIVE \ + -DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c + + OSCONS_EXTRACT=../../$(DECC) -DNATIVE \ + -DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c ; \ + ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \ + ./s-oscons-tmplt.exe > s-oscons-tmplt.s + + else + # GCC_FOR_TARGET has paths relative to the gcc directory, so we need to adjust + # for running it from $(RTSDIR) + OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \ + | sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'` + OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \ + -DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i + OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i + endif + + ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb + -$(MKDIR) ./bldtools/oscons + $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^)) + $(CP) $^ ./bldtools/oscons + (cd ./bldtools/oscons ; gnatmake -q xoscons) + + $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons + $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s + (cd $(RTSDIR) ; \ + $(OSCONS_CPP) ; \ + $(OSCONS_EXTRACT) ; \ + ../bldtools/oscons/xoscons) + # Don't use semicolon separated shell commands that involve list expansions. # The semicolon triggers a call to DCL on VMS and DCL can't handle command # line lengths in excess of 256 characters. # Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS) # is guaranteed to overflow the buffer. ! gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads $(MAKE) -C $(RTSDIR) \ CC="`echo \"$(GCC_FOR_TARGET)\" \ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ diff -Nrcpad gcc-4.6.2/gcc/ada/gcc-interface/decl.c gcc-4.6.3/gcc/ada/gcc-interface/decl.c *** gcc-4.6.2/gcc/ada/gcc-interface/decl.c Sun Sep 11 19:00:13 2011 --- gcc-4.6.3/gcc/ada/gcc-interface/decl.c Sat Jan 21 15:01:48 2012 *************** gnat_to_gnu_entity (Entity_Id gnat_entit *** 808,823 **** && No (Address_Clause (gnat_entity)))) && TREE_CODE (TYPE_SIZE (gnu_type)) == INTEGER_CST) { ! /* No point in jumping through all the hoops needed in order to support BIGGEST_ALIGNMENT if we don't really have to. So we cap to the smallest alignment that corresponds to a known efficient memory access pattern of the target. */ ! unsigned int align_cap = Is_Atomic (gnat_entity) ! ? BIGGEST_ALIGNMENT ! : get_mode_alignment (ptr_mode); if (!host_integerp (TYPE_SIZE (gnu_type), 1) ! || compare_tree_int (TYPE_SIZE (gnu_type), align_cap) >= 0) align = align_cap; else align = ceil_alignment (tree_low_cst (TYPE_SIZE (gnu_type), 1)); --- 808,837 ---- && No (Address_Clause (gnat_entity)))) && TREE_CODE (TYPE_SIZE (gnu_type)) == INTEGER_CST) { ! unsigned int size_cap, align_cap; ! ! /* No point in promoting the alignment if this doesn't prevent ! BLKmode access to the object, in particular block copy, as ! this will for example disable the NRV optimization for it. ! No point in jumping through all the hoops needed in order to support BIGGEST_ALIGNMENT if we don't really have to. So we cap to the smallest alignment that corresponds to a known efficient memory access pattern of the target. */ ! if (Is_Atomic (gnat_entity)) ! { ! size_cap = UINT_MAX; ! align_cap = BIGGEST_ALIGNMENT; ! } ! else ! { ! size_cap = MAX_FIXED_MODE_SIZE; ! align_cap = get_mode_alignment (ptr_mode); ! } if (!host_integerp (TYPE_SIZE (gnu_type), 1) ! || compare_tree_int (TYPE_SIZE (gnu_type), size_cap) > 0) ! align = 0; ! else if (compare_tree_int (TYPE_SIZE (gnu_type), align_cap) > 0) align = align_cap; else align = ceil_alignment (tree_low_cst (TYPE_SIZE (gnu_type), 1)); *************** gnat_to_gnu_entity (Entity_Id gnat_entit *** 1009,1014 **** --- 1023,1036 ---- entity is always accessed indirectly through it. */ else { + /* We need to preserve the volatileness of the renamed + object through the indirection. */ + if (TREE_THIS_VOLATILE (gnu_expr) + && !TYPE_VOLATILE (gnu_type)) + gnu_type + = build_qualified_type (gnu_type, + (TYPE_QUALS (gnu_type) + | TYPE_QUAL_VOLATILE)); gnu_type = build_reference_type (gnu_type); inner_const_flag = TREE_READONLY (gnu_expr); const_flag = true; diff -Nrcpad gcc-4.6.2/gcc/ada/gcc-interface/trans.c gcc-4.6.3/gcc/ada/gcc-interface/trans.c *** gcc-4.6.2/gcc/ada/gcc-interface/trans.c Sun Sep 11 19:00:13 2011 --- gcc-4.6.3/gcc/ada/gcc-interface/trans.c Mon Jan 9 19:31:14 2012 *************** *** 6,12 **** * * * C Implementation File * * * ! * Copyright (C) 1992-2011, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * --- 6,12 ---- * * * C Implementation File * * * ! * Copyright (C) 1992-2012, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * *************** addressable_p (tree gnu_expr, tree gnu_t *** 7409,7415 **** || DECL_ALIGN (TREE_OPERAND (gnu_expr, 1)) >= TYPE_ALIGN (TREE_TYPE (gnu_expr)))) /* The field of a padding record is always addressable. */ ! || TYPE_PADDING_P (TREE_TYPE (TREE_OPERAND (gnu_expr, 0)))) && addressable_p (TREE_OPERAND (gnu_expr, 0), NULL_TREE)); case ARRAY_REF: case ARRAY_RANGE_REF: --- 7409,7415 ---- || DECL_ALIGN (TREE_OPERAND (gnu_expr, 1)) >= TYPE_ALIGN (TREE_TYPE (gnu_expr)))) /* The field of a padding record is always addressable. */ ! || TYPE_IS_PADDING_P (TREE_TYPE (TREE_OPERAND (gnu_expr, 0)))) && addressable_p (TREE_OPERAND (gnu_expr, 0), NULL_TREE)); case ARRAY_REF: case ARRAY_RANGE_REF: diff -Nrcpad gcc-4.6.2/gcc/ada/gnatvsn.ads gcc-4.6.3/gcc/ada/gnatvsn.ads *** gcc-4.6.2/gcc/ada/gnatvsn.ads Fri Dec 3 04:48:56 2010 --- gcc-4.6.3/gcc/ada/gnatvsn.ads Mon Jan 2 10:32:36 2012 *************** *** 6,12 **** -- -- -- S p e c -- -- -- ! -- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- --- 6,12 ---- -- -- -- S p e c -- -- -- ! -- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- *************** package Gnatvsn is *** 92,98 **** Verbose_Library_Version : constant String := "GNAT Lib v" & Library_Version; -- Version string stored in e.g. ALI files ! Current_Year : constant String := "2010"; -- Used in printing copyright messages end Gnatvsn; --- 92,98 ---- Verbose_Library_Version : constant String := "GNAT Lib v" & Library_Version; -- Version string stored in e.g. ALI files ! Current_Year : constant String := "2011"; -- Used in printing copyright messages end Gnatvsn; diff -Nrcpad gcc-4.6.2/gcc/ada/init.c gcc-4.6.3/gcc/ada/init.c *** gcc-4.6.2/gcc/ada/init.c Mon Dec 20 07:26:57 2010 --- gcc-4.6.3/gcc/ada/init.c Mon Nov 21 09:04:08 2011 *************** __gnat_is_stack_guard (mach_vm_address_t *** 2216,2227 **** return 0; } static void ! __gnat_error_handler (int sig, siginfo_t *si, void *ucontext ATTRIBUTE_UNUSED) { struct Exception_Data *exception; const char *msg; switch (sig) { case SIGSEGV: --- 2216,2248 ---- return 0; } + #define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE + + void + __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, + void *ucontext ATTRIBUTE_UNUSED) + { + #if defined (__x86_64__) + /* Work around radar #10302855/pr50678, where the unwinders (libunwind or + libgcc_s depending on the system revision) and the DWARF unwind data for + the sigtramp have different ideas about register numbering (causing rbx + and rdx to be transposed).. */ + ucontext_t *uc = (ucontext_t *)ucontext ; + unsigned long t = uc->uc_mcontext->__ss.__rbx; + + uc->uc_mcontext->__ss.__rbx = uc->uc_mcontext->__ss.__rdx; + uc->uc_mcontext->__ss.__rdx = t; + #endif + } + static void ! __gnat_error_handler (int sig, siginfo_t *si, void *ucontext) { struct Exception_Data *exception; const char *msg; + __gnat_adjust_context_for_raise (sig, ucontext); + switch (sig) { case SIGSEGV: diff -Nrcpad gcc-4.6.2/gcc/ada/mlib-tgt-specific-darwin.adb gcc-4.6.3/gcc/ada/mlib-tgt-specific-darwin.adb *** gcc-4.6.2/gcc/ada/mlib-tgt-specific-darwin.adb Tue Apr 8 06:44:24 2008 --- gcc-4.6.3/gcc/ada/mlib-tgt-specific-darwin.adb Fri Nov 18 11:46:58 2011 *************** package body MLib.Tgt.Specific is *** 36,43 **** -- Non default subprograms - function Archive_Indexer_Options return String_List_Access; - procedure Build_Dynamic_Library (Ofiles : Argument_List; Options : Argument_List; --- 36,41 ---- *************** package body MLib.Tgt.Specific is *** 67,81 **** (1 => Flat_Namespace'Access, 2 => Shared_Libgcc'Access); - ----------------------------- - -- Archive_Indexer_Options -- - ----------------------------- - - function Archive_Indexer_Options return String_List_Access is - begin - return new String_List'(1 => new String'("-c")); - end Archive_Indexer_Options; - --------------------------- -- Build_Dynamic_Library -- --------------------------- --- 65,70 ---- *************** package body MLib.Tgt.Specific is *** 180,186 **** end Is_Archive_Ext; begin - Archive_Indexer_Options_Ptr := Archive_Indexer_Options'Access; Build_Dynamic_Library_Ptr := Build_Dynamic_Library'Access; DLL_Ext_Ptr := DLL_Ext'Access; Dynamic_Option_Ptr := Dynamic_Option'Access; --- 169,174 ---- diff -Nrcpad gcc-4.6.2/gnattools/ChangeLog gcc-4.6.3/gnattools/ChangeLog *** gcc-4.6.2/gnattools/ChangeLog Wed Oct 26 09:06:36 2011 --- gcc-4.6.3/gnattools/ChangeLog Thu Mar 1 11:54:40 2012 *************** *** 1,3 **** --- 1,7 ---- + 2012-03-01 Release Manager + + * GCC 4.6.3 released. + 2011-10-26 Release Manager * GCC 4.6.2 released. diff -Nrcpad gcc-4.6.2/libada/ChangeLog gcc-4.6.3/libada/ChangeLog *** gcc-4.6.2/libada/ChangeLog Wed Oct 26 09:06:49 2011 --- gcc-4.6.3/libada/ChangeLog Thu Mar 1 11:52:33 2012 *************** *** 1,3 **** --- 1,13 ---- + 2012-03-01 Release Manager + + * GCC 4.6.3 released. + + 2011-11-13 Iain Sandoe + + Backport from mainline r181319 + Makefile.in: Change dependency on oscons to depend on the generator + tool. + 2011-10-26 Release Manager * GCC 4.6.2 released. diff -Nrcpad gcc-4.6.2/libada/Makefile.in gcc-4.6.3/libada/Makefile.in *** gcc-4.6.2/libada/Makefile.in Sat Nov 20 19:37:08 2010 --- gcc-4.6.3/libada/Makefile.in Sun Nov 13 14:25:58 2011 *************** target_noncanonical:=@target_noncanonica *** 70,75 **** --- 70,76 ---- version := $(shell cat $(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)) # exeext should not be used because it's the *host* exeext. We're building # a *target* library, aren't we?!? Likewise for CC. Still, provide bogus *************** LIBADA_FLAGS_TO_PASS = \ *** 96,105 **** "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" # Rules to build gnatlib. ! .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons gnatlib: @default_gnatlib_target@ ! gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ && touch stamp-libada --- 97,106 ---- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" # Rules to build gnatlib. ! .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool gnatlib: @default_gnatlib_target@ ! gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \ && touch stamp-libada *************** gnatlib-plain: oscons $(GCC_DIR)/ada/Mak *** 108,114 **** $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib ! gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ && touch stamp-libada --- 109,115 ---- $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib ! gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile test -f stamp-libada || \ $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \ && touch stamp-libada *************** gnatlib-sjlj gnatlib-zcx gnatlib-shared: *** 117,124 **** $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib ! oscons: ! $(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads install-gnatlib: $(GCC_DIR)/ada/Makefile $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib --- 118,125 ---- $(LN_S) $(ADA_RTS_DIR) adainclude $(LN_S) $(ADA_RTS_DIR) adalib ! osconstool: ! $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons install-gnatlib: $(GCC_DIR)/ada/Makefile $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib