[multiple changes]

2014-07-18  Vincent Celier  <celier@adacore.com>

	* debug.adb: Update comment.

2014-07-18  Hristian Kirtchev  <kirtchev@adacore.com>

	* exp_util.adb (Needs_Finalization): There is no reason why a
	C type should not benefit from finalization actions.

2014-07-18  Thomas Quinot  <quinot@adacore.com>

	* s-oscons-tmplt.c (NAME_MAX): Fix definition for Solaris
	(FILENAME_MAX): Remove unneeded definition.

From-SVN: r212785

gcc/ada/ChangeLog

+2014-07-18  Vincent Celier  <celier@adacore.com>
+
+	* debug.adb: Update comment.
+
+2014-07-18  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* exp_util.adb (Needs_Finalization): There is no reason why a
+	C type should not benefit from finalization actions.
+
+2014-07-18  Thomas Quinot  <quinot@adacore.com>
+
+	* s-oscons-tmplt.c (NAME_MAX): Fix definition for Solaris
+	(FILENAME_MAX): Remove unneeded definition.
+
 2014-07-18  Robert Dewar  <dewar@adacore.com>
 
 	* exp_attr.adb, debug.adb: Update comments.

gcc/ada/exp_util.adb

@@ -6340,11 +6340,10 @@ package body Exp_Util is
       if Restriction_Active (No_Finalization) then
          return False;
 
-      --  C, C++, CIL and Java types are not considered controlled. It is
-      --  assumed that the non-Ada side will handle their clean up.
+      --  C++, CIL and Java types are not considered controlled. It is assumed
+      --  that the non-Ada side will handle their clean up.
 
-      elsif Convention (T) = Convention_C
-        or else Convention (T) = Convention_CIL
+      elsif Convention (T) = Convention_CIL
         or else Convention (T) = Convention_CPP
         or else Convention (T) = Convention_Java
       then

gcc/ada/s-oscons-tmplt.c

@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2000-2013, Free Software Foundation, Inc.         --
+--          Copyright (C) 2000-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- 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- --
@@ -314,16 +314,24 @@ CND(SIZEOF_unsigned_int, "Size of unsigned int")
 #endif
 CND(IOV_MAX, "Maximum writev iovcnt")
 
+/* NAME_MAX is used to compute the allocation size for a struct dirent
+ * passed to readdir() / readdir_r(). However on some systems it is not
+ * defined, as it is technically a filesystem dependent property that
+ * we should retrieve through pathconf().
+ */
 #ifndef NAME_MAX
-# define NAME_MAX 255
+# ifdef MAXNAMELEN
+   /* Solaris has no NAME_MAX but defines MAXNAMELEN */
+#  define NAME_MAX MAXNAMELEN
+# else
+   /* PATH_MAX (maximum length of a full path name) is a safe last
+    * chance fall back.
+    */
+#  define NAME_MAX PATH_MAX
+# endif
 #endif
 CND(NAME_MAX, "Maximum file name length")
 
-#ifndef PATH_MAX
-# define PATH_MAX 1024
-#endif
-CND(FILENAME_MAX, "Maximum file path length")
-
 /*
 
    ---------------------