[multiple changes]

2014-07-29  Robert Dewar  <dewar@adacore.com>

	* gnat_ugn.texi: Clean up and correct documentation of warnings.
	* usage.adb: Minor corrections to make sure warnings are properly
	documented.
	* warnsw.adb (Set_Warning_Switch): Remove redundant return statement.
	(WA_Warnings): Add Warn_On_Suspicious_Modulus_Value.

2014-07-29  Ed Schonberg  <schonberg@adacore.com>

	* exp_ch3.adb (Expand_N_Object_Declaration): The dummy block
	created to match internal sequence numbers between compilations
	with/without abort must have its type properly set.

From-SVN: r213168

gcc/ada/ChangeLog

 2014-07-29  Robert Dewar  <dewar@adacore.com>
 
+	* gnat_ugn.texi: Clean up and correct documentation of warnings.
+	* usage.adb: Minor corrections to make sure warnings are properly
+	documented.
+	* warnsw.adb (Set_Warning_Switch): Remove redundant return statement.
+	(WA_Warnings): Add Warn_On_Suspicious_Modulus_Value.
+
+2014-07-29  Ed Schonberg  <schonberg@adacore.com>
+
+	* exp_ch3.adb (Expand_N_Object_Declaration): The dummy block
+	created to match internal sequence numbers between compilations
+	with/without abort must have its type properly set.
+
+2014-07-29  Robert Dewar  <dewar@adacore.com>
+
 	* ali.adb (Initialize_ALI): Initialize SSO_Default_Specified
 	(Scan_ALI): Set SSO_Default in ALIs_Record (Scan_ALI): Set
 	SSO_Default_Specified.

gcc/ada/exp_ch3.adb

@@ -5252,8 +5252,10 @@ package body Exp_Ch3 is
             else
                --  Generate a dummy entity to ensure that the internal symbols
                --  are in sync when a unit is compiled with and without aborts.
+               --  The entity is a block with proper scope and type.
 
                Dummy := New_Internal_Entity (E_Block, Current_Scope, Loc, 'B');
+               Set_Etype (Dummy, Standard_Void_Type);
                Abrt_Stmts := Fin_Stmts;
             end if;
 

gcc/ada/usage.adb

@@ -528,7 +528,7 @@ begin
                                                   "but not read");
    Write_Line ("        M*   turn off warnings for variable assigned " &
                                                   "but not read");
-   Write_Line ("        .m*  turn on warnings for suspicious modulus value");
+   Write_Line ("        .m*+ turn on warnings for suspicious modulus value");
    Write_Line ("        .M   turn off warnings for suspicious modulus value");
    Write_Line ("        n*   normal warning mode (cancels -gnatws/-gnatwe)");
    Write_Line ("        .n   turn on info messages for atomic " &

gcc/ada/warnsw.adb

@@ -636,7 +636,6 @@ package body Warnsw is
             else
                return False;
             end if;
-            return False;
       end case;
 
       return True;
@@ -648,35 +647,36 @@ package body Warnsw is
 
    procedure WA_Warnings is
    begin
-      Check_Unreferenced                  := True;
-      Check_Unreferenced_Formals          := True;
-      Check_Withs                         := True;
-      Constant_Condition_Warnings         := True;
-      Implementation_Unit_Warnings        := True;
-      Ineffective_Inline_Warnings         := True;
-      Warn_On_Ada_2005_Compatibility      := True;
-      Warn_On_Ada_2012_Compatibility      := True;
-      Warn_On_Assertion_Failure           := True;
-      Warn_On_Assumed_Low_Bound           := True;
-      Warn_On_Bad_Fixed_Value             := True;
-      Warn_On_Biased_Representation       := True;
-      Warn_On_Constant                    := True;
-      Warn_On_Export_Import               := True;
-      Warn_On_Modified_Unread             := True;
-      Warn_On_No_Value_Assigned           := True;
-      Warn_On_Non_Local_Exception         := True;
-      Warn_On_Object_Renames_Function     := True;
-      Warn_On_Obsolescent_Feature         := True;
-      Warn_On_Overlap                     := True;
-      Warn_On_Parameter_Order             := True;
-      Warn_On_Questionable_Missing_Parens := True;
-      Warn_On_Redundant_Constructs        := True;
-      Warn_On_Reverse_Bit_Order           := True;
-      Warn_On_Size_Alignment              := True;
-      Warn_On_Suspicious_Contract         := True;
-      Warn_On_Unchecked_Conversion        := True;
-      Warn_On_Unrecognized_Pragma         := True;
-      Warn_On_Unrepped_Components         := True;
+      Check_Unreferenced                  := True; -- -gnatwf/-gnatwu
+      Check_Unreferenced_Formals          := True; -- -gnatwf/-gnatwu
+      Check_Withs                         := True; -- -gnatwu
+      Constant_Condition_Warnings         := True; -- -gnatwc
+      Implementation_Unit_Warnings        := True; -- -gnatwi
+      Ineffective_Inline_Warnings         := True; -- -gnatwp
+      Warn_On_Ada_2005_Compatibility      := True; -- -gnatwy
+      Warn_On_Ada_2012_Compatibility      := True; -- -gnatwy
+      Warn_On_Assertion_Failure           := True; -- -gnatw.a
+      Warn_On_Assumed_Low_Bound           := True; -- -gnatww
+      Warn_On_Bad_Fixed_Value             := True; -- -gnatwb
+      Warn_On_Biased_Representation       := True; -- -gnatw.b
+      Warn_On_Constant                    := True; -- -gnatwk
+      Warn_On_Export_Import               := True; -- -gnatwx
+      Warn_On_Modified_Unread             := True; -- -gnatwm
+      Warn_On_No_Value_Assigned           := True; -- -gnatwv
+      Warn_On_Non_Local_Exception         := True; -- -gnatw.x
+      Warn_On_Object_Renames_Function     := True; -- -gnatw.r
+      Warn_On_Obsolescent_Feature         := True; -- -gnatwj
+      Warn_On_Overlap                     := True; -- -gnatw.i
+      Warn_On_Parameter_Order             := True; -- -gnatw.p
+      Warn_On_Questionable_Missing_Parens := True; -- -gnatwq
+      Warn_On_Redundant_Constructs        := True; -- -gnatwr
+      Warn_On_Reverse_Bit_Order           := True; -- -gnatw.v
+      Warn_On_Size_Alignment              := True; -- -gnatw.z
+      Warn_On_Suspicious_Contract         := True; -- -gnatw.t
+      Warn_On_Suspicious_Modulus_Value    := True; -- -gnatw.m
+      Warn_On_Unchecked_Conversion        := True; -- -gnatwz
+      Warn_On_Unrecognized_Pragma         := True; -- -gnatwg
+      Warn_On_Unrepped_Components         := True; -- -gnatw.c
    end WA_Warnings;
 
 end Warnsw;