[multiple changes]

2017-12-05  Arnaud Charlet  <charlet@adacore.com>

	* opt.ads (Expand_Nonbinary_Modular_Ops): New flag.
	* exp_ch4.adb (Expand_Nonbinary_Modular_Op): Use
	Expand_Nonbinary_Modular_Ops instead of Modify_Tree_For_C, so that
	other back-ends can also benefit from the front-end expansion. Remove
	test for Modify_Tree_For_C in all callers to better share code.
	* gnat1drv.adb (Adjust_Global_Switches): Set
	Expand_Nonbinary_Modular_Ops when generating C code.

2017-12-05  Ed Schonberg  <schonberg@adacore.com>

	* exp_ch5.adb (Expand_Formal_Container_Loop): Ensure that the loop
	parameter becomes invisible after analyzing the loop, which has been
	rewritten as a while-loop.

2017-12-05  Doug Rupp  <rupp@adacore.com>

	* vxaddr2line.adb: Revise and enhance for new ports, remove dead ports,
	and update for 64bit ports.

From-SVN: r255410

6 files changed, 94 insertions, 87 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d5e64b0..2da67a1 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,24 @@
+2017-12-05  Arnaud Charlet  <charlet@adacore.com>
+
+	* opt.ads (Expand_Nonbinary_Modular_Ops): New flag.
+	* exp_ch4.adb (Expand_Nonbinary_Modular_Op): Use
+	Expand_Nonbinary_Modular_Ops instead of Modify_Tree_For_C, so that
+	other back-ends can also benefit from the front-end expansion. Remove
+	test for Modify_Tree_For_C in all callers to better share code.
+	* gnat1drv.adb (Adjust_Global_Switches): Set
+	Expand_Nonbinary_Modular_Ops when generating C code.
+
+2017-12-05  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch5.adb (Expand_Formal_Container_Loop): Ensure that the loop
+	parameter becomes invisible after analyzing the loop, which has been
+	rewritten as a while-loop.
+
+2017-12-05  Doug Rupp  <rupp@adacore.com>
+
+	* vxaddr2line.adb: Revise and enhance for new ports, remove dead ports,
+	and update for 64bit ports.
+
 2017-12-05  Bob Duff  <duff@adacore.com>
 
 	* exp_ch6.adb (Build_In_Place_Formal): Search for the formal by suffix
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 88303c66..aac0c5c 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -4172,10 +4172,10 @@ package body Exp_Ch4 is
    --  Start of processing for Expand_Nonbinary_Modular_Op
 
    begin
-      --  No action needed if we are not generating C code for a nonbinary
-      --  modular operand.
+      --  No action needed if front-end expansion is not required or if we
+      --  have a binary modular operand.
 
-      if not Modify_Tree_For_C
+      if not Expand_Nonbinary_Modular_Ops
         or else not Non_Binary_Modulus (Typ)
       then
          return;
@@ -6899,12 +6899,7 @@ package body Exp_Ch4 is
 
       Check_Float_Op_Overflow (N);
 
-      --  When generating C code, convert nonbinary modular additions into code
-      --  that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Add;
 
    ---------------------
@@ -6930,12 +6925,7 @@ package body Exp_Ch4 is
          Expand_Intrinsic_Call (N, Entity (N));
       end if;
 
-      --  When generating C code, convert nonbinary modular operators into code
-      --  that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_And;
 
    ------------------------
@@ -7178,12 +7168,7 @@ package body Exp_Ch4 is
 
       Check_Float_Op_Overflow (N);
 
-      --  When generating C code, convert nonbinary modular divisions into code
-      --  that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Divide;
 
    --------------------
@@ -8687,12 +8672,7 @@ package body Exp_Ch4 is
          Analyze_And_Resolve (N, Typ);
       end if;
 
-      --  When generating C code, convert nonbinary modular minus into code
-      --  that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Minus;
 
    ---------------------
@@ -9170,12 +9150,7 @@ package body Exp_Ch4 is
 
       Check_Float_Op_Overflow (N);
 
-      --  When generating C code, convert nonbinary modular multiplications
-      --  into code that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Multiply;
 
    --------------------
@@ -9487,12 +9462,7 @@ package body Exp_Ch4 is
          Expand_Intrinsic_Call (N, Entity (N));
       end if;
 
-      --  When generating C code, convert nonbinary modular operators into code
-      --  that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Or;
 
    ----------------------
@@ -9926,12 +9896,7 @@ package body Exp_Ch4 is
 
       Check_Float_Op_Overflow (N);
 
-      --  When generating C code, convert nonbinary modular subtractions into
-      --  code that relies on the front-end expansion of operator Mod.
-
-      if Modify_Tree_For_C then
-         Expand_Nonbinary_Modular_Op (N);
-      end if;
+      Expand_Nonbinary_Modular_Op (N);
    end Expand_N_Op_Subtract;
 
    ---------------------
@@ -9955,7 +9920,6 @@ package body Exp_Ch4 is
 
       elsif Is_Intrinsic_Subprogram (Entity (N)) then
          Expand_Intrinsic_Call (N, Entity (N));
-
       end if;
    end Expand_N_Op_Xor;
 
diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index d98e725..4b2b5dc 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -3135,6 +3135,7 @@ package body Exp_Ch5 is
 
       Advance   : Node_Id;
       Init_Decl : Node_Id;
+      Init_Name : Entity_Id;
       New_Loop  : Node_Id;
 
    begin
@@ -3169,7 +3170,8 @@ package body Exp_Ch5 is
       --  the loop.
 
       Analyze (Init_Decl);
-      Set_Ekind (Defining_Identifier (Init_Decl), E_Loop_Parameter);
+      Init_Name := Defining_Identifier (Init_Decl);
+      Set_Ekind (Init_Name, E_Loop_Parameter);
 
       --  The cursor was marked as a loop parameter to prevent user assignments
       --  to it, however this renders the advancement step illegal as it is not
@@ -3182,9 +3184,11 @@ package body Exp_Ch5 is
       --  Because we have to analyze the initial declaration of the loop
       --  parameter multiple times its scope is incorrectly set at this point
       --  to the one surrounding the block statement - so set the scope
-      --  manually to be the actual block statement.
+      --  manually to be the actual block statement, and indicate that it is
+      --  not visible after the block has been analyzed.
 
-      Set_Scope (Defining_Identifier (Init_Decl), Entity (Identifier (N)));
+      Set_Scope (Init_Name, Entity (Identifier (N)));
+      Set_Is_Immediately_Visible (Init_Name, False);
    end Expand_Formal_Container_Loop;
 
    ------------------------------------------
diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index 1b3f9a3..18b09b2 100644
--- a/gcc/ada/gnat1drv.adb
+++ b/gcc/ada/gnat1drv.adb
@@ -167,6 +167,7 @@ procedure Gnat1drv is
          Modify_Tree_For_C := True;
          Unnest_Subprogram_Mode := True;
          Minimize_Expression_With_Actions := True;
+         Expand_Nonbinary_Modular_Ops := True;
 
          --  Set operating mode to Generate_Code to benefit from full front-end
          --  expansion (e.g. generics).
diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index 86a5c35..b642b22 100644
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -640,6 +640,10 @@ package Opt is
    --  Set to True to store tracebacks in exception occurrences and enable
    --  symbolic tracebacks (-Es).
 
+   Expand_Nonbinary_Modular_Ops : Boolean := False;
+   --  Set to True to convert nonbinary modular additions into code
+   --  that relies on the front-end expansion of operator Mod.
+
    Extensions_Allowed : Boolean := False;
    --  GNAT
    --  Set to True by switch -gnatX if GNAT specific language extensions
diff --git a/gcc/ada/vxaddr2line.adb b/gcc/ada/vxaddr2line.adb
index edcc95c..7014b19 100644
--- a/gcc/ada/vxaddr2line.adb
+++ b/gcc/ada/vxaddr2line.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2002-2014, AdaCore                     --
+--                     Copyright (C) 2002-2017, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -74,7 +74,7 @@ with GNAT.Regpat;               use GNAT.Regpat;
 
 procedure VxAddr2Line is
 
-   package Unsigned_32_IO is new Modular_IO (Unsigned_32);
+   package Unsigned_64_IO is new Modular_IO (Unsigned_64);
    --  Instantiate Modular_IO to have Put
 
    Ref_Symbol : constant String := "adainit";
@@ -83,17 +83,20 @@ procedure VxAddr2Line is
 
    --  All supported architectures
    type Architecture is
-     (DEC_ALPHA,
+     (LINUX_AARCH64,
+      LINUX_ARM,
       LINUX_E500V2,
       LINUX_I586,
       LINUX_POWERPC,
+      LINUX_POWERPC64,
+      LINUX_X86_64,
+      WINDOWS_AARCH64,
+      WINDOWS_ARM,
       WINDOWS_E500V2,
       WINDOWS_I586,
-      WINDOWS_M68K,
       WINDOWS_POWERPC,
-      SOLARIS_E500V2,
-      SOLARIS_I586,
-      SOLARIS_POWERPC);
+      WINDOWS_POWERPC64,
+      WINDOWS_X86_64);
 
    type Arch_Record is record
       Addr2line_Binary : String_Access;
@@ -110,7 +113,7 @@ procedure VxAddr2Line is
       --  which will avoid computational overflows. Typically only useful when
       --  64bit addresses are provided.
 
-      Bt_Offset_From_Call : Unsigned_32;
+      Bt_Offset_From_Call : Unsigned_64;
       --  Offset from a backtrace address to the address of the corresponding
       --  call instruction. This should always be 0, except on platforms where
       --  the backtrace addresses actually correspond to return and not call
@@ -119,11 +122,16 @@ procedure VxAddr2Line is
 
    --  Configuration for each of the architectures
    Arch_List : array (Architecture'Range) of Arch_Record :=
-     (DEC_ALPHA =>
+     (LINUX_AARCH64 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
-         Addr_Digits_To_Skip => 8,
-         Bt_Offset_From_Call => 0),
+         Addr_Digits_To_Skip => 0,
+         Bt_Offset_From_Call => -2),
+      LINUX_ARM =>
+        (Addr2line_Binary    => null,
+         Nm_Binary           => null,
+         Addr_Digits_To_Skip => 0,
+         Bt_Offset_From_Call => -2),
       LINUX_E500V2 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
@@ -139,21 +147,26 @@ procedure VxAddr2Line is
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
          Bt_Offset_From_Call => -4),
-      SOLARIS_E500V2 =>
+      LINUX_POWERPC64 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
          Bt_Offset_From_Call => -4),
-      SOLARIS_I586 =>
+      LINUX_X86_64 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
          Bt_Offset_From_Call => -2),
-      SOLARIS_POWERPC =>
+      WINDOWS_AARCH64 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
-         Bt_Offset_From_Call => -4),
+         Bt_Offset_From_Call => -2),
+      WINDOWS_ARM =>
+        (Addr2line_Binary    => null,
+         Nm_Binary           => null,
+         Addr_Digits_To_Skip => 0,
+         Bt_Offset_From_Call => -2),
       WINDOWS_E500V2 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
@@ -164,16 +177,21 @@ procedure VxAddr2Line is
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
          Bt_Offset_From_Call => -2),
-      WINDOWS_M68K =>
+      WINDOWS_POWERPC =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
          Bt_Offset_From_Call => -4),
-      WINDOWS_POWERPC =>
+      WINDOWS_POWERPC64 =>
+        (Addr2line_Binary    => null,
+         Nm_Binary           => null,
+         Addr_Digits_To_Skip => 0,
+         Bt_Offset_From_Call => -4),
+      WINDOWS_X86_64 =>
         (Addr2line_Binary    => null,
          Nm_Binary           => null,
          Addr_Digits_To_Skip => 0,
-         Bt_Offset_From_Call => -4)
+         Bt_Offset_From_Call => -2)
      );
 
    --  Current architecture
@@ -193,14 +211,14 @@ procedure VxAddr2Line is
    procedure Usage;
    --  Displays the short help message and then terminates the program
 
-   function Get_Reference_Offset return Unsigned_32;
+   function Get_Reference_Offset return Unsigned_64;
    --  Computes the static offset of the reference symbol by calling nm
 
-   function Get_Value_From_Hex_Arg (Arg : Natural) return Unsigned_32;
+   function Get_Value_From_Hex_Arg (Arg : Natural) return Unsigned_64;
    --  Threats the argument number Arg as a C-style hexadecimal literal
    --  and returns its integer value
 
-   function Hex_Image (Value : Unsigned_32) return String_Access;
+   function Hex_Image (Value : Unsigned_64) return String_Access;
    --  Returns access to a string that contains hexadecimal image of Value
 
    --  Separate functions that provide build-time customization:
@@ -228,16 +246,11 @@ procedure VxAddr2Line is
          return;
       end if;
 
-      if Proc = "alpha" then
-         Cur_Arch := DEC_ALPHA;
+      --  Let's detect a Linux or Windows host.
+      if Directory_Separator = '/' then
+         Cur_Arch := Architecture'Value ("linux_" & Proc);
       else
-         --  Let's detect the host.
-         --  ??? A naive implementation that can't distinguish between Unixes
-         if Directory_Separator = '/' then
-            Cur_Arch := Architecture'Value ("solaris_" & Proc);
-         else
-            Cur_Arch := Architecture'Value ("windows_" & Proc);
-         end if;
+         Cur_Arch := Architecture'Value ("windows_" & Proc);
       end if;
 
       if Arch_List (Cur_Arch).Addr2line_Binary = null then
@@ -271,7 +284,7 @@ procedure VxAddr2Line is
    -- Get_Reference_Offset --
    --------------------------
 
-   function Get_Reference_Offset return Unsigned_32 is
+   function Get_Reference_Offset return Unsigned_64 is
       Nm_Cmd  : constant String_Access :=
                   Locate_Exec_On_Path (Arch_List (Cur_Arch).Nm_Binary.all);
 
@@ -306,11 +319,11 @@ procedure VxAddr2Line is
       declare
          Match_String : constant String := Expect_Out_Match (Pd);
          Matches      : Match_Array (0 .. 1);
-         Value        : Unsigned_32;
+         Value        : Unsigned_64;
 
       begin
          Match (Reference, Match_String, Matches);
-         Value := Unsigned_32'Value
+         Value := Unsigned_64'Value
            ("16#"
             & Match_String (Matches (1).First .. Matches (1).Last) & "#");
 
@@ -346,7 +359,7 @@ procedure VxAddr2Line is
    -- Get_Value_From_Hex_Arg --
    ----------------------------
 
-   function Get_Value_From_Hex_Arg (Arg : Natural) return Unsigned_32 is
+   function Get_Value_From_Hex_Arg (Arg : Natural) return Unsigned_64 is
       Cur_Arg : constant String := Argument (Arg);
       Offset  : Natural;
 
@@ -365,7 +378,7 @@ procedure VxAddr2Line is
 
       --  Convert to value
 
-      return Unsigned_32'Value
+      return Unsigned_64'Value
         ("16#" & Cur_Arg (Offset .. Cur_Arg'Last) & "#");
 
    exception
@@ -379,12 +392,12 @@ procedure VxAddr2Line is
    -- Hex_Image --
    ---------------
 
-   function Hex_Image (Value : Unsigned_32) return String_Access is
+   function Hex_Image (Value : Unsigned_64) return String_Access is
       Result    : String (1 .. 20);
       Start_Pos : Natural;
 
    begin
-      Unsigned_32_IO.Put (Result, Value, 16);
+      Unsigned_64_IO.Put (Result, Value, 16);
       Start_Pos := Index (Result, "16#") + 3;
       return new String'(Result (Start_Pos .. Result'Last - 1));
    end Hex_Image;
@@ -402,7 +415,7 @@ procedure VxAddr2Line is
       OS_Exit (1);
    end Usage;
 
-   Ref_Static_Offset, Ref_Runtime_Address, Bt_Address : Unsigned_32;
+   Ref_Static_Offset, Ref_Runtime_Address, Bt_Address : Unsigned_64;
 
    Addr2line_Cmd : String_Access;