diff -Nrcpad gcc-4.6.1/gcc/ada/ChangeLog gcc-4.6.2/gcc/ada/ChangeLog
*** gcc-4.6.1/gcc/ada/ChangeLog	Mon Jun 27 10:03:04 2011
--- gcc-4.6.2/gcc/ada/ChangeLog	Wed Oct 26 09:05:57 2011
***************
*** 1,3 ****
--- 1,61 ----
+ 2011-10-26  Release Manager
+ 
+ 	* GCC 4.6.2 released.
+ 
+ 2011-09-19  Iain Sandoe  <iains@gcc.gnu.org>
+ 
+ 	Backport from mainline (restore powerpc-darwin Ada bootstrap).
+ 	* traceback.c (Darwin) USE_GCC_UNWINDER for Darwin versions >= 8.
+ 
+ 2011-09-11  Eric Botcazou  <ebotcazou@adacore.com>
+ 
+ 	* gcc-interface/decl.c (maybe_pad_type): Do not try to change the form
+ 	of an addressable type.
+ 	* gcc-interface/trans.c (gnat_gimplify_expr) <VIEW_CONVERT_EXPR>: New.
+ 	Deal with those cases for which creating a temporary is mandatory.
+ 
+ 2011-09-08  Iain Sandoe  <iains@gcc.gnu.org>
+ 
+ 	Backport from mainline (restore powerpc-darwin Ada bootstrap).
+ 	* gcc-interface/Makefile.in (darwin): Provide powerpc64 system 
+ 	implementation.
+ 	* system-darwin-ppc64.ads: New file.
+ 
+ 2011-09-06  Iain Sandoe  <iains@gcc.gnu.org>
+ 
+ 	Backport from mainline.
+ 	* gcc-interface/Makefile.in (darwin, SO_OPTS): Provide architecture
+ 	size switches to the link phase for shared libs.
+ 
+ 2011-07-23  Eric Botcazou  <ebotcazou@adacore.com>
+ 
+ 	Backport from mainline
+ 	2011-07-23  Arnaud Charlet  <charlet@adacore.com>
+ 
+ 	PR ada/49819
+ 	* gcc-interface/Makefile.in (powerpc-linux): Remove reference to
+ 	g-trasym-dwarf.adb.
+ 
+ 2011-07-15  Eric Botcazou  <ebotcazou@adacore.com>
+ 
+ 	PR ada/48711
+ 	* g-socthi-mingw.adb (Fill): Fix formatting.
+ 
+ 2011-07-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+ 
+ 	PR ada/46350
+ 	* s-taprop-hpux-dce.adb (Abort_Task): Remove unnecessary cast.
+ 
+ 2011-07-14  Florian Weimer  <fw@deneb.enyo.de>
+ 
+ 	PR ada/48711
+ 	* g-socthi-mingw.adb (Fill): Guard against invalid MSG_WAITALL.
+ 
+ 2011-07-01  Eric Botcazou  <ebotcazou@adacore.com>
+ 
+ 	* gcc-interface/Make-lang.in (gnat1): Prepend '+' to the command.
+ 	(gnatbind): Likewise.
+ 
  2011-06-27  Release Manager
  
  	* GCC 4.6.1 released.
diff -Nrcpad gcc-4.6.1/gcc/ada/g-socthi-mingw.adb gcc-4.6.2/gcc/ada/g-socthi-mingw.adb
*** gcc-4.6.1/gcc/ada/g-socthi-mingw.adb	Tue Jun 22 09:46:58 2010
--- gcc-4.6.2/gcc/ada/g-socthi-mingw.adb	Fri Jul 15 05:53:13 2011
*************** package body GNAT.Sockets.Thin is
*** 277,283 ****
        use type C.size_t;
  
        Fill  : constant Boolean :=
!                 (C.unsigned (Flags) and SOSC.MSG_WAITALL) /= 0;
        --  Is the MSG_WAITALL flag set? If so we need to fully fill all vectors
  
        Res   : C.int;
--- 277,284 ----
        use type C.size_t;
  
        Fill  : constant Boolean :=
!         SOSC.MSG_WAITALL /= -1
!           and then (C.unsigned (Flags) and SOSC.MSG_WAITALL) /= 0;
        --  Is the MSG_WAITALL flag set? If so we need to fully fill all vectors
  
        Res   : C.int;
diff -Nrcpad gcc-4.6.1/gcc/ada/gcc-interface/Make-lang.in gcc-4.6.2/gcc/ada/gcc-interface/Make-lang.in
*** gcc-4.6.1/gcc/ada/gcc-interface/Make-lang.in	Sun Apr 17 22:29:13 2011
--- gcc-4.6.2/gcc/ada/gcc-interface/Make-lang.in	Fri Jul  1 21:44:20 2011
*************** TARGET_ADA_SRCS =
*** 481,491 ****
  # Since the RTL should be built with the latest compiler, remove the
  #  stamp target in the parent directory whenever gnat1 is rebuilt
  gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS)
! 	$(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(BACKENDLIBS) $(CFLAGS)
  	$(RM) stamp-gnatlib2-rts stamp-tools
  
  gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS)
! 	$(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(LIBS) $(SYSLIBS) $(CFLAGS)
  
  # use cross-gcc
  gnat-cross: force
--- 481,491 ----
  # Since the RTL should be built with the latest compiler, remove the
  #  stamp target in the parent directory whenever gnat1 is rebuilt
  gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS)
! 	+$(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(BACKENDLIBS) $(CFLAGS)
  	$(RM) stamp-gnatlib2-rts stamp-tools
  
  gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS)
! 	+$(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(LIBS) $(SYSLIBS) $(CFLAGS)
  
  # use cross-gcc
  gnat-cross: force
diff -Nrcpad gcc-4.6.1/gcc/ada/gcc-interface/Makefile.in gcc-4.6.2/gcc/ada/gcc-interface/Makefile.in
*** gcc-4.6.1/gcc/ada/gcc-interface/Makefile.in	Tue Feb  8 22:55:57 2011
--- gcc-4.6.2/gcc/ada/gcc-interface/Makefile.in	Thu Sep  8 08:27:57 2011
*************** ifeq ($(strip $(filter-out powerpc% linu
*** 1792,1798 ****
    s-osinte.adb<s-osinte-posix.adb \
    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
    g-sercom.adb<g-sercom-linux.adb \
-   g-trasym.adb<g-trasym-dwarf.adb \
    $(ATOMICS_TARGET_PAIRS)
  
    ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),)
--- 1792,1797 ----
*************** ifeq ($(strip $(filter-out %x86_64 linux
*** 2105,2110 ****
--- 2104,2110 ----
  endif
  
  ifeq ($(strip $(filter-out darwin%,$(osys))),)
+   SO_OPTS = -Wl,-flat_namespace -shared-libgcc
    ifeq ($(strip $(filter-out %86,$(arch))),)
      LIBGNAT_TARGET_PAIRS = \
      a-intnam.ads<a-intnam-darwin.ads \
*************** ifeq ($(strip $(filter-out darwin%,$(osy
*** 2124,2129 ****
--- 2124,2130 ----
      ifeq ($(strip $(MULTISUBDIR)),/x86_64)
        LIBGNAT_TARGET_PAIRS += \
        system.ads<system-darwin-x86_64.ads
+       SO_OPTS += -m64
      else
        LIBGNAT_TARGET_PAIRS += \
        system.ads<system-darwin-x86.ads
*************** ifeq ($(strip $(filter-out darwin%,$(osy
*** 2150,2155 ****
--- 2151,2157 ----
      ifeq ($(strip $(MULTISUBDIR)),/i386)
        LIBGNAT_TARGET_PAIRS += \
        system.ads<system-darwin-x86.ads
+       SO_OPTS += -m32
      else
        LIBGNAT_TARGET_PAIRS += \
        system.ads<system-darwin-x86_64.ads
*************** ifeq ($(strip $(filter-out darwin%,$(osy
*** 2171,2178 ****
      a-numaux.ads<a-numaux-darwin.ads \
      a-numaux.adb<a-numaux-darwin.adb \
      g-trasym.ads<g-trasym-unimplemented.ads \
!     g-trasym.adb<g-trasym-unimplemented.adb \
!     system.ads<system-darwin-ppc.ads
    endif
  
    TOOLS_TARGET_PAIRS =  \
--- 2173,2187 ----
      a-numaux.ads<a-numaux-darwin.ads \
      a-numaux.adb<a-numaux-darwin.adb \
      g-trasym.ads<g-trasym-unimplemented.ads \
!     g-trasym.adb<g-trasym-unimplemented.adb
!     ifeq ($(strip $(MULTISUBDIR)),/ppc64)
!       LIBGNAT_TARGET_PAIRS += \
!         system.ads<system-darwin-ppc64.ads
!       SO_OPTS += -m64
!     else
!       LIBGNAT_TARGET_PAIRS += \
!         system.ads<system-darwin-ppc.ads
!     endif
    endif
  
    TOOLS_TARGET_PAIRS =  \
*************** ifeq ($(strip $(filter-out darwin%,$(osy
*** 2180,2186 ****
  
    EH_MECHANISM=-gcc
    GNATLIB_SHARED = gnatlib-shared-darwin
-   SO_OPTS = -Wl,-flat_namespace -shared-libgcc
    RANLIB = ranlib -c
    GMEM_LIB = gmemlib
    LIBRARY_VERSION := $(LIB_VERSION)
--- 2189,2194 ----
diff -Nrcpad gcc-4.6.1/gcc/ada/gcc-interface/decl.c gcc-4.6.2/gcc/ada/gcc-interface/decl.c
*** gcc-4.6.1/gcc/ada/gcc-interface/decl.c	Thu May  5 16:27:03 2011
--- gcc-4.6.2/gcc/ada/gcc-interface/decl.c	Sun Sep 11 19:00:13 2011
*************** maybe_pad_type (tree type, tree size, un
*** 6422,6427 ****
--- 6422,6428 ----
    if (align != 0
        && TREE_CODE (type) == RECORD_TYPE
        && TYPE_MODE (type) == BLKmode
+       && !TREE_ADDRESSABLE (type)
        && TREE_CODE (orig_size) == INTEGER_CST
        && !TREE_OVERFLOW (orig_size)
        && compare_tree_int (orig_size, MAX_FIXED_MODE_SIZE) <= 0
diff -Nrcpad gcc-4.6.1/gcc/ada/gcc-interface/trans.c gcc-4.6.2/gcc/ada/gcc-interface/trans.c
*** gcc-4.6.1/gcc/ada/gcc-interface/trans.c	Sat Jun 18 10:31:43 2011
--- gcc-4.6.2/gcc/ada/gcc-interface/trans.c	Sun Sep 11 19:00:13 2011
*************** gnat_gimplify_expr (tree *expr_p, gimple
*** 6276,6281 ****
--- 6276,6303 ----
  
        return GS_UNHANDLED;
  
+     case VIEW_CONVERT_EXPR:
+       op = TREE_OPERAND (expr, 0);
+ 
+       /* If we are view-converting a CONSTRUCTOR or a call from an aggregate
+ 	 type to a scalar one, explicitly create the local temporary.  That's
+ 	 required if the type is passed by reference.  */
+       if ((TREE_CODE (op) == CONSTRUCTOR || TREE_CODE (op) == CALL_EXPR)
+ 	  && AGGREGATE_TYPE_P (TREE_TYPE (op))
+ 	  && !AGGREGATE_TYPE_P (TREE_TYPE (expr)))
+ 	{
+ 	  tree mod, new_var = create_tmp_var_raw (TREE_TYPE (op), "C");
+ 	  gimple_add_tmp_var (new_var);
+ 
+ 	  mod = build2 (INIT_EXPR, TREE_TYPE (new_var), new_var, op);
+ 	  gimplify_and_add (mod, pre_p);
+ 
+ 	  TREE_OPERAND (expr, 0) = new_var;
+ 	  return GS_OK;
+ 	}
+ 
+       return GS_UNHANDLED;
+ 
      case DECL_EXPR:
        op = DECL_EXPR_DECL (expr);
  
diff -Nrcpad gcc-4.6.1/gcc/ada/s-taprop-hpux-dce.adb gcc-4.6.2/gcc/ada/s-taprop-hpux-dce.adb
*** gcc-4.6.1/gcc/ada/s-taprop-hpux-dce.adb	Mon Nov 30 10:45:39 2009
--- gcc-4.6.2/gcc/ada/s-taprop-hpux-dce.adb	Fri Jul 15 02:35:05 2011
*************** package body System.Task_Primitives.Oper
*** 888,895 ****
  
        if T.Common.State = Interrupt_Server_Blocked_On_Event_Flag then
           System.Interrupt_Management.Operations.Interrupt_Self_Process
!            (System.Interrupt_Management.Interrupt_ID
!              (PIO.Get_Interrupt_ID (T)));
        end if;
     end Abort_Task;
  
--- 888,894 ----
  
        if T.Common.State = Interrupt_Server_Blocked_On_Event_Flag then
           System.Interrupt_Management.Operations.Interrupt_Self_Process
!            (PIO.Get_Interrupt_ID (T));
        end if;
     end Abort_Task;
  
diff -Nrcpad gcc-4.6.1/gcc/ada/system-darwin-ppc64.ads gcc-4.6.2/gcc/ada/system-darwin-ppc64.ads
*** gcc-4.6.1/gcc/ada/system-darwin-ppc64.ads	Thu Jan  1 00:00:00 1970
--- gcc-4.6.2/gcc/ada/system-darwin-ppc64.ads	Thu Sep  8 08:27:57 2011
***************
*** 0 ****
--- 1,149 ----
+ ------------------------------------------------------------------------------
+ --                                                                          --
+ --                        GNAT RUN-TIME COMPONENTS                          --
+ --                                                                          --
+ --                               S Y S T E M                                --
+ --                                                                          --
+ --                                 S p e c                                  --
+ --                         (Darwin/PPC64 Version)                           --
+ --                                                                          --
+ --             Copyright (C) 2011, Free Software Foundation, Inc.           --
+ --                                                                          --
+ -- This specification is derived from the Ada Reference Manual for use with --
+ -- GNAT. The copyright notice above, and the license provisions that follow --
+ -- apply solely to the  contents of the part following the private keyword. --
+ --                                                                          --
+ -- 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- --
+ -- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+ -- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+ -- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+ -- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+ --                                                                          --
+ -- As a special exception under Section 7 of GPL version 3, you are granted --
+ -- additional permissions described in the GCC Runtime Library Exception,   --
+ -- version 3.1, as published by the Free Software Foundation.               --
+ --                                                                          --
+ -- You should have received a copy of the GNU General Public License and    --
+ -- a copy of the GCC Runtime Library Exception along with this program;     --
+ -- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+ -- <http://www.gnu.org/licenses/>.                                          --
+ --                                                                          --
+ -- GNAT was originally developed  by the GNAT team at  New York University. --
+ -- Extensive contributions were provided by Ada Core Technologies Inc.      --
+ --                                                                          --
+ ------------------------------------------------------------------------------
+ 
+ package System is
+    pragma Pure;
+    --  Note that we take advantage of the implementation permission to make
+    --  this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
+    --  2005, this is Pure in any case (AI-362).
+ 
+    type Name is (SYSTEM_NAME_GNAT);
+    System_Name : constant Name := SYSTEM_NAME_GNAT;
+ 
+    --  System-Dependent Named Numbers
+ 
+    Min_Int               : constant := Long_Long_Integer'First;
+    Max_Int               : constant := Long_Long_Integer'Last;
+ 
+    Max_Binary_Modulus    : constant := 2 ** Long_Long_Integer'Size;
+    Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
+ 
+    Max_Base_Digits       : constant := Long_Long_Float'Digits;
+    Max_Digits            : constant := Long_Long_Float'Digits;
+ 
+    Max_Mantissa          : constant := 63;
+    Fine_Delta            : constant := 2.0 ** (-Max_Mantissa);
+ 
+    Tick                  : constant := 0.01;
+ 
+    --  Storage-related Declarations
+ 
+    type Address is private;
+    pragma Preelaborable_Initialization (Address);
+    Null_Address : constant Address;
+ 
+    Storage_Unit : constant := 8;
+    Word_Size    : constant := 64;
+    Memory_Size  : constant := 2 ** 64;
+ 
+    --  Address comparison
+ 
+    function "<"  (Left, Right : Address) return Boolean;
+    function "<=" (Left, Right : Address) return Boolean;
+    function ">"  (Left, Right : Address) return Boolean;
+    function ">=" (Left, Right : Address) return Boolean;
+    function "="  (Left, Right : Address) return Boolean;
+ 
+    pragma Import (Intrinsic, "<");
+    pragma Import (Intrinsic, "<=");
+    pragma Import (Intrinsic, ">");
+    pragma Import (Intrinsic, ">=");
+    pragma Import (Intrinsic, "=");
+ 
+    --  Other System-Dependent Declarations
+ 
+    type Bit_Order is (High_Order_First, Low_Order_First);
+    Default_Bit_Order : constant Bit_Order := High_Order_First;
+    pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
+ 
+    --  Priority-related Declarations (RM D.1)
+ 
+    --  The values defined here are copied from the ppc version.
+ 
+    Max_Interrupt_Priority : constant Positive := 63;
+    Max_Priority           : constant Positive := Max_Interrupt_Priority - 1;
+ 
+    subtype Any_Priority is Integer range 0 .. Max_Interrupt_Priority;
+    subtype Priority is Any_Priority range 0 .. Max_Priority;
+    subtype Interrupt_Priority is Any_Priority
+      range Priority'Last + 1 .. Max_Interrupt_Priority;
+ 
+    Default_Priority : constant Priority :=
+      (Priority'Last - Priority'First) / 2;
+ 
+ private
+ 
+    type Address is mod Memory_Size;
+    Null_Address : constant Address := 0;
+ 
+    --------------------------------------
+    -- System Implementation Parameters --
+    --------------------------------------
+ 
+    --  These parameters provide information about the target that is used
+    --  by the compiler. They are in the private part of System, where they
+    --  can be accessed using the special circuitry in the Targparm unit
+    --  whose source should be consulted for more detailed descriptions
+    --  of the individual switch values.
+ 
+    Backend_Divide_Checks     : constant Boolean := False;
+    Backend_Overflow_Checks   : constant Boolean := True;
+    Command_Line_Args         : constant Boolean := True;
+    Configurable_Run_Time     : constant Boolean := False;
+    Denorm                    : constant Boolean := True;
+    Duration_32_Bits          : constant Boolean := False;
+    Exit_Status_Supported     : constant Boolean := True;
+    Fractional_Fixed_Ops      : constant Boolean := False;
+    Frontend_Layout           : constant Boolean := False;
+    Machine_Overflows         : constant Boolean := False;
+    Machine_Rounds            : constant Boolean := True;
+    Preallocated_Stacks       : constant Boolean := False;
+    Signed_Zeros              : constant Boolean := True;
+    Stack_Check_Default       : constant Boolean := False;
+    Stack_Check_Probes        : constant Boolean := False;
+    Stack_Check_Limits        : constant Boolean := False;
+    Support_64_Bit_Divides    : constant Boolean := True;
+    Support_Aggregates        : constant Boolean := True;
+    Support_Composite_Assign  : constant Boolean := True;
+    Support_Composite_Compare : constant Boolean := True;
+    Support_Long_Shifts       : constant Boolean := True;
+    Always_Compatible_Rep     : constant Boolean := False;
+    Suppress_Standard_Library : constant Boolean := False;
+    Use_Ada_Main_Program_Name : constant Boolean := False;
+    ZCX_By_Default            : constant Boolean := True;
+    GCC_ZCX_Support           : constant Boolean := True;
+ 
+ end System;
diff -Nrcpad gcc-4.6.1/gcc/ada/tracebak.c gcc-4.6.2/gcc/ada/tracebak.c
*** gcc-4.6.1/gcc/ada/tracebak.c	Sat Aug 21 13:25:33 2010
--- gcc-4.6.2/gcc/ada/tracebak.c	Mon Sep 19 09:10:42 2011
*************** extern void (*Unlock_Task) (void);
*** 199,208 ****
  
    */
  
! /*--------------------------- PPC AIX/Darwin ----------------------------*/
  
! #if ((defined (_POWER) && defined (_AIX)) || \
! (defined (__ppc__) && defined (__APPLE__)))
  
  #define USE_GENERIC_UNWINDER
  
--- 199,222 ----
  
    */
  
! /*--------------------------- Darwin 8 or newer ----------------------------*/
! #if defined (__APPLE__) \
!     && defined (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) \
!     && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1040
!  
! #define USE_GCC_UNWINDER
  
! #if defined (__i386__) || defined (__x86_64__)
! #define PC_ADJUST -2
! #elif defined (__ppc__) || defined (__ppc64__)
! #define PC_ADJUST -4
! #else
! #error Unhandled darwin architecture.
! #endif
! 
! /*------------------------ PPC AIX/Older Darwin -------------------------*/
! #elif ((defined (_POWER) && defined (_AIX)) \
!        || (defined (__APPLE__)  && defined (__ppc__)))
  
  #define USE_GENERIC_UNWINDER
  
diff -Nrcpad gcc-4.6.1/gnattools/ChangeLog gcc-4.6.2/gnattools/ChangeLog
*** gcc-4.6.1/gnattools/ChangeLog	Mon Jun 27 10:03:45 2011
--- gcc-4.6.2/gnattools/ChangeLog	Wed Oct 26 09:06:36 2011
***************
*** 1,3 ****
--- 1,7 ----
+ 2011-10-26  Release Manager
+ 
+ 	* GCC 4.6.2 released.
+ 
  2011-06-27  Release Manager
  
  	* GCC 4.6.1 released.
diff -Nrcpad gcc-4.6.1/libada/ChangeLog gcc-4.6.2/libada/ChangeLog
*** gcc-4.6.1/libada/ChangeLog	Mon Jun 27 10:03:58 2011
--- gcc-4.6.2/libada/ChangeLog	Wed Oct 26 09:06:49 2011
***************
*** 1,3 ****
--- 1,7 ----
+ 2011-10-26  Release Manager
+ 
+ 	* GCC 4.6.2 released.
+ 
  2011-06-27  Release Manager
  
  	* GCC 4.6.1 released.