7c07471
--- libada/Makefile.in.jj	2009-01-14 12:07:35.000000000 +0100
7c07471
+++ libada/Makefile.in	2009-01-15 14:25:33.000000000 +0100
5c29a25
@@ -66,18 +66,40 @@ libsubdir := $(libdir)/gcc/$(target_nonc
293a503
 ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
5c29a25
 ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
7c07471
 
7c07471
+DEFAULTMULTIFLAGS :=
7c07471
+ifeq ($(MULTISUBDIR),)
7c07471
+targ:=$(subst -, ,$(target))
7c07471
+arch:=$(word 1,$(targ))
7c07471
+ifeq ($(words $(targ)),2)
7c07471
+osys:=$(word 2,$(targ))
7c07471
+else
7c07471
+osys:=$(word 3,$(targ))
7c07471
+endif
7c07471
+ifeq ($(strip $(filter-out i%86 x86_64 powerpc% ppc% s390% sparc% linux%, $(arch) $(osys))),)
7c07471
+ifeq ($(shell $(CC) $(CFLAGS) -print-multi-os-directory),../lib64)
7c07471
+DEFAULTMULTIFLAGS := -m64
7c07471
+else
7c07471
+ifeq ($(strip $(filter-out s390%, $(arch))),)
7c07471
+DEFAULTMULTIFLAGS := -m31
7c07471
+else
7c07471
+DEFAULTMULTIFLAGS := -m32
7c07471
+endif
7c07471
+endif
7c07471
+endif
7c07471
+endif
7c07471
+
7c07471
 # exeext should not be used because it's the *host* exeext.  We're building
7c07471
 # a *target* library, aren't we?!?  Likewise for CC.  Still, provide bogus
7c07471
 # definitions just in case something slips through the safety net provided
7c07471
 # by recursive make invocations in gcc/ada/Makefile.in
7c07471
 LIBADA_FLAGS_TO_PASS = \
7c07471
         "MAKEOVERRIDES=" \
7c07471
-        "LDFLAGS=$(LDFLAGS)" \
5c29a25
+        "LDFLAGS=$(LDFLAGS) $(DEFAULTMULTIFLAGS)" \
7c07471
         "LN_S=$(LN_S)" \
7c07471
         "SHELL=$(SHELL)" \
7c07471
-        "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
7c07471
-        "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
462317c
-        "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
5c29a25
+        "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
5c29a25
+        "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
5c29a25
+        "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
5c29a25
         "PICFLAG_FOR_TARGET=$(PICFLAG)" \
7c07471
         "THREAD_KIND=$(THREAD_KIND)" \
7c07471
         "TRACE=$(TRACE)" \
5c29a25
@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
7c07471
         "exeext=.exeext.should.not.be.used " \
7c07471
 	'CC=the.host.compiler.should.not.be.needed' \
7c07471
 	"GCC_FOR_TARGET=$(CC)" \
5c29a25
-        "CFLAGS=$(CFLAGS)"
5c29a25
+        "CFLAGS=$(CFLAGS) $(DEFAULTMULTIFLAGS)"
7c07471
 
7c07471
 # Rules to build gnatlib.
5c29a25
 .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
8717b1d
--- gcc/ada/sem_util.adb	(revision 161677)
8717b1d
+++ gcc/ada/sem_util.adb	(working copy)
5c29a25
@@ -5487,7 +5487,7 @@ package body Sem_Util is
8717b1d
             Exp           : Node_Id;
8717b1d
             Assn          : Node_Id;
8717b1d
             Choice        : Node_Id;
8717b1d
-            Comp_Type     : Entity_Id;
8717b1d
+            Comp_Type     : Entity_Id := Empty;
8717b1d
             Is_Array_Aggr : Boolean;
8717b1d
 
8717b1d
          begin
8717b1d
--- config-ml.in.jj	2010-06-30 09:50:44.000000000 +0200
8717b1d
+++ config-ml.in	2010-07-02 21:24:17.994211151 +0200
4839e42
@@ -511,6 +511,8 @@ multi-do:
8717b1d
 				ADAFLAGS="$(ADAFLAGS) $${flags}" \
8717b1d
 				prefix="$(prefix)" \
8717b1d
 				exec_prefix="$(exec_prefix)" \
8717b1d
+				mandir="$(mandir)" \
759d907
+				infodir="$(infodir)" \
759d907
 				GOCFLAGS="$(GOCFLAGS) $${flags}" \
8717b1d
 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
4839e42
 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
7f99993
--- libcpp/macro.c.jj	2015-01-14 11:01:34.000000000 +0100
7f99993
+++ libcpp/macro.c	2015-01-14 14:22:19.286949884 +0100
7f99993
@@ -2947,8 +2947,6 @@ create_iso_definition (cpp_reader *pfile
7f99993
   cpp_token *token;
7f99993
   const cpp_token *ctoken;
7f99993
   bool following_paste_op = false;
7f99993
-  const char *paste_op_error_msg =
7f99993
-    N_("'##' cannot appear at either end of a macro expansion");
7f99993
   unsigned int num_extra_tokens = 0;
7f99993
 
7f99993
   /* Get the first token of the expansion (or the '(' of a
7f99993
@@ -3059,7 +3057,8 @@ create_iso_definition (cpp_reader *pfile
7f99993
 	     function-like macros, but not at the end.  */
7f99993
 	  if (following_paste_op)
7f99993
 	    {
7f99993
-	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
7f99993
+	      cpp_error (pfile, CPP_DL_ERROR,
7f99993
+			 "'##' cannot appear at either end of a macro expansion");
7f99993
 	      return false;
7f99993
 	    }
7f99993
 	  break;
7f99993
@@ -3072,7 +3071,8 @@ create_iso_definition (cpp_reader *pfile
7f99993
 	     function-like macros, but not at the beginning.  */
7f99993
 	  if (macro->count == 1)
7f99993
 	    {
7f99993
-	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
7f99993
+	      cpp_error (pfile, CPP_DL_ERROR,
7f99993
+			 "'##' cannot appear at either end of a macro expansion");
7f99993
 	      return false;
7f99993
 	    }
7f99993
 
7f99993
--- libcpp/expr.c.jj	2015-01-14 11:01:34.000000000 +0100
7f99993
+++ libcpp/expr.c	2015-01-14 14:35:52.851002344 +0100
7f99993
@@ -672,16 +672,17 @@ cpp_classify_number (cpp_reader *pfile,
7f99993
       if ((result & CPP_N_WIDTH) == CPP_N_LARGE
7f99993
 	  && CPP_OPTION (pfile, cpp_warn_long_long))
7f99993
         {
7f99993
-          const char *message = CPP_OPTION (pfile, cplusplus) 
7f99993
-				? N_("use of C++11 long long integer constant")
7f99993
-		                : N_("use of C99 long long integer constant");
7f99993
-
7f99993
 	  if (CPP_OPTION (pfile, c99))
7f99993
             cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location,
7f99993
-				   0, message);
7f99993
+				   0, CPP_OPTION (pfile, cplusplus)
7f99993
+				      ? N_("use of C++11 long long integer constant")
7f99993
+				      : N_("use of C99 long long integer constant"));
7f99993
           else
7f99993
             cpp_pedwarning_with_line (pfile, CPP_W_LONG_LONG,
7f99993
-				      virtual_location, 0, message);
7f99993
+				      virtual_location, 0,
7f99993
+				      CPP_OPTION (pfile, cplusplus)
7f99993
+				      ? N_("use of C++11 long long integer constant")
7f99993
+				      : N_("use of C99 long long integer constant"));
7f99993
         }
7f99993
 
7f99993
       result |= CPP_N_INTEGER;