[multiple changes]

2011-09-06  Robert Dewar  <dewar@adacore.com>

	* s-osinte-linux.ads, a-iteint.ads, exp_ch6.adb, s-solita.adb: Minor
	reformatting.

2011-09-06  Arnaud Charlet  <charlet@adacore.com>

	* s-linux-alpha.ads: Minor reformatting
	* s-oscons-tmplt.c: Fix generated comments in s-oscons template.
	Use sizeof instead of corresponding C defines in s-oscons template.

From-SVN: r178575

gcc/ada/ChangeLog

+2011-09-06  Robert Dewar  <dewar@adacore.com>
+
+	* s-osinte-linux.ads, a-iteint.ads, exp_ch6.adb, s-solita.adb: Minor
+	reformatting.
+
+2011-09-06  Arnaud Charlet  <charlet@adacore.com>
+
+	* s-linux-alpha.ads: Minor reformatting
+	* s-oscons-tmplt.c: Fix generated comments in s-oscons template.
+	Use sizeof instead of corresponding C defines in s-oscons template.
+
 2011-09-06  Vadim Godunko  <godunko@adacore.com>
 
 	* a-convec.ads, a-iteint.ads: Minor reformatting.

gcc/ada/a-iteint.ads

@@ -22,13 +22,17 @@ package Ada.Iterator_Interfaces is
    pragma Pure;
 
    type Forward_Iterator is limited interface;
-   function First (Object : Forward_Iterator) return Cursor is abstract;
+
+   function First
+     (Object : Forward_Iterator) return Cursor is abstract;
    function Next
      (Object   : Forward_Iterator;
       Position : Cursor) return Cursor is abstract;
 
    type Reversible_Iterator is limited interface and Forward_Iterator;
-   function Last (Object : Reversible_Iterator) return Cursor is abstract;
+
+   function Last
+     (Object : Reversible_Iterator) return Cursor is abstract;
    function Previous
      (Object   : Reversible_Iterator;
       Position : Cursor) return Cursor is abstract;

gcc/ada/s-linux-alpha.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  S p e c                                 --
 --                                                                          --
---             Copyright (C) 2009-2011, Free Software Foundation, Inc.      --
+--          Copyright (C) 2009-2011, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNARL 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- --

gcc/ada/s-oscons-tmplt.c

@@ -1358,7 +1358,7 @@ CND(WSAEDISCON,         "Disconnected")
 #if defined (__APPLE__) || defined (__linux__) || defined (DUMMY)
 /*
 
-   --  Sizes of pthread data types
+   --  Sizes of pthread data types (on Darwin these are padding)
 */
 
 #if defined (__APPLE__) || defined (DUMMY)
@@ -1372,34 +1372,34 @@ CND(WSAEDISCON,         "Disconnected")
 #define PTHREAD_RWLOCK_SIZE     __PTHREAD_RWLOCK_SIZE__
 #define PTHREAD_ONCE_SIZE       __PTHREAD_ONCE_SIZE__
 #else
-#define PTHREAD_SIZE           (sizeof (pthread_t))
-#define PTHREAD_ATTR_SIZE       __SIZEOF_PTHREAD_ATTR_T
-#define PTHREAD_MUTEXATTR_SIZE  __SIZEOF_PTHREAD_MUTEXATTR_T
-#define PTHREAD_MUTEX_SIZE      __SIZEOF_PTHREAD_MUTEX_T
-#define PTHREAD_CONDATTR_SIZE   __SIZEOF_PTHREAD_CONDATTR_T
-#define PTHREAD_COND_SIZE       __SIZEOF_PTHREAD_COND_T
-#define PTHREAD_RWLOCKATTR_SIZE __SIZEOF_PTHREAD_RWLOCKATTR_T
-#define PTHREAD_RWLOCK_SIZE     __SIZEOF_PTHREAD_RWLOCK_T
+#define PTHREAD_SIZE            (sizeof (pthread_t))
+#define PTHREAD_ATTR_SIZE       (sizeof (pthread_attr_t))
+#define PTHREAD_MUTEXATTR_SIZE  (sizeof (pthread_mutexattr_t))
+#define PTHREAD_MUTEX_SIZE      (sizeof (pthread_mutex_t))
+#define PTHREAD_CONDATTR_SIZE   (sizeof (pthread_condattr_t))
+#define PTHREAD_COND_SIZE       (sizeof (pthread_cond_t))
+#define PTHREAD_RWLOCKATTR_SIZE (sizeof (pthread_rwlockattr_t))
+#define PTHREAD_RWLOCK_SIZE     (sizeof (pthread_rwlock_t))
 #define PTHREAD_ONCE_SIZE       (sizeof (pthread_once_t))
 #endif
 
-CND(PTHREAD_SIZE, "Pad in pthread_t")
+CND(PTHREAD_SIZE, "pthread_t")
 
-CND(PTHREAD_ATTR_SIZE, "Pad in pthread_attr_t")
+CND(PTHREAD_ATTR_SIZE, "pthread_attr_t")
 
-CND(PTHREAD_MUTEXATTR_SIZE, "Pad in pthread_mutexattr_t")
+CND(PTHREAD_MUTEXATTR_SIZE, "pthread_mutexattr_t")
 
-CND(PTHREAD_MUTEX_SIZE, "Pad in pthread_mutex_t")
+CND(PTHREAD_MUTEX_SIZE, "pthread_mutex_t")
 
-CND(PTHREAD_CONDATTR_SIZE, "Pad in pthread_condattr_t")
+CND(PTHREAD_CONDATTR_SIZE, "pthread_condattr_t")
 
-CND(PTHREAD_COND_SIZE, "Pad in pthread_cond_t")
+CND(PTHREAD_COND_SIZE, "pthread_cond_t")
 
-CND(PTHREAD_RWLOCKATTR_SIZE, "Pad in pthread_rwlockattr_t")
+CND(PTHREAD_RWLOCKATTR_SIZE, "pthread_rwlockattr_t")
 
-CND(PTHREAD_RWLOCK_SIZE, "Pad in pthread_rwlock_t")
+CND(PTHREAD_RWLOCK_SIZE, "pthread_rwlock_t")
 
-CND(PTHREAD_ONCE_SIZE, "Pad in pthread_once_t")
+CND(PTHREAD_ONCE_SIZE, "pthread_once_t")
 
 #endif
 

gcc/ada/s-osinte-linux.ads

@@ -559,7 +559,7 @@ private
    pragma Convention (C, timespec);
 
    type unsigned_long_long_t is mod 2 ** 64;
-   --  Local type only used to get it's 'Alignment below
+   --  Local type only used to get the alignment of this type below
 
    type pthread_attr_t is
      array (1 .. OS_Constants.PTHREAD_ATTR_SIZE) of unsigned_char;

gcc/ada/s-solita.adb

@@ -150,9 +150,10 @@ package body System.Soft_Links.Tasking is
       EO      : Ada.Exceptions.Exception_Occurrence;
 
    begin
-      --  We can only be here because we are terminating the environment task.
-      --  Task termination for the rest of the tasks is handled in the
-      --  Task_Wrapper.
+      --  We can only be here because we are terminating the environment
+      --  task. Task termination for the rest of the tasks is handled in
+      --  the Task_Wrapper.
+
       --  We do not want to enable this check and e.g. call System.OS_Lib.Abort
       --  here because some restricted run-times may not have system.os_lib
       --  (e.g. JVM), and calling abort may do more harm than good to the
@@ -179,9 +180,9 @@ package body System.Soft_Links.Tasking is
          Ada.Exceptions.Save_Occurrence (EO, Excep);
       end if;
 
-      --  There is no need for explicit protection against race conditions
-      --  for this part because it can only be executed by the environment
-      --  task after all the other tasks have been finalized.
+      --  There is no need for explicit protection against race conditions for
+      --  this part because it can only be executed by the environment task
+      --  after all the other tasks have been finalized.
 
       if Self_Id.Common.Specific_Handler /= null then
          Self_Id.Common.Specific_Handler.all (Cause, Self_Id, EO);