* m4/ifunction_logical.m4: Add casts to get rid of warnings.

* generated/all_l1.c: Regenerate. * generated/all_l2.c: Regenerate. * generated/all_l4.c: Regenerate. * generated/all_l8.c: Regenerate. * generated/all_l16.c: Regenerate. * generated/any_l1.c: Regenerate. * generated/any_l2.c: Regenerate. * generated/any_l4.c: Regenerate. * generated/any_l8.c: Regenerate. * generated/any_l16.c: Regenerate. * generated/count_1_l.c: Regenerate. * generated/count_2_l.c: Regenerate. * generated/count_4_l.c: Regenerate. * generated/count_8_l.c: Regenerate. * generated/count_16_l.c: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132619 138bc75d-0d04-0410-961f-82ee72b054a4
Soufien · Feb 25, 2008 · 686509f · 686509f
1 parent 5243b29
commit 686509f
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 32 deletions.
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
@@ -1,3 +1,22 @@
+2008-02-25  Francois-Xavier Coudert  <[email protected]>
+
+	* m4/ifunction_logical.m4: Add casts to get rid of warnings.
+	* generated/all_l1.c: Regenerate.
+	* generated/all_l2.c: Regenerate.
+	* generated/all_l4.c: Regenerate.
+	* generated/all_l8.c: Regenerate.
+	* generated/all_l16.c: Regenerate.
+	* generated/any_l1.c: Regenerate.
+	* generated/any_l2.c: Regenerate.
+	* generated/any_l4.c: Regenerate.
+	* generated/any_l8.c: Regenerate.
+	* generated/any_l16.c: Regenerate.
+	* generated/count_1_l.c: Regenerate.
+	* generated/count_2_l.c: Regenerate.
+	* generated/count_4_l.c: Regenerate.
+	* generated/count_8_l.c: Regenerate.
+	* generated/count_16_l.c: Regenerate.
+
 2008-02-24  Francois-Xavier Coudert  <[email protected]>
 
 	PR libfortran/32841

diff --git a/libgfortran/generated/all_l1.c b/libgfortran/generated/all_l1.c
@@ -119,8 +119,9 @@ all_l1 (gfc_array_l1 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ALL intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ALL intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/all_l16.c b/libgfortran/generated/all_l16.c
@@ -119,8 +119,9 @@ all_l16 (gfc_array_l16 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ALL intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ALL intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/all_l2.c b/libgfortran/generated/all_l2.c
@@ -119,8 +119,9 @@ all_l2 (gfc_array_l2 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ALL intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ALL intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/all_l4.c b/libgfortran/generated/all_l4.c
@@ -119,8 +119,9 @@ all_l4 (gfc_array_l4 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ALL intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ALL intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/all_l8.c b/libgfortran/generated/all_l8.c
@@ -119,8 +119,9 @@ all_l8 (gfc_array_l8 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ALL intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ALL intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/any_l1.c b/libgfortran/generated/any_l1.c
@@ -119,8 +119,9 @@ any_l1 (gfc_array_l1 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ANY intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ANY intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/any_l16.c b/libgfortran/generated/any_l16.c
@@ -119,8 +119,9 @@ any_l16 (gfc_array_l16 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ANY intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ANY intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/any_l2.c b/libgfortran/generated/any_l2.c
@@ -119,8 +119,9 @@ any_l2 (gfc_array_l2 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ANY intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ANY intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/any_l4.c b/libgfortran/generated/any_l4.c
@@ -119,8 +119,9 @@ any_l4 (gfc_array_l4 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ANY intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ANY intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/any_l8.c b/libgfortran/generated/any_l8.c
@@ -119,8 +119,9 @@ any_l8 (gfc_array_l8 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " ANY intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " ANY intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/count_16_l.c b/libgfortran/generated/count_16_l.c
@@ -119,8 +119,9 @@ count_16_l (gfc_array_i16 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " COUNT intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " COUNT intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/count_1_l.c b/libgfortran/generated/count_1_l.c
@@ -119,8 +119,9 @@ count_1_l (gfc_array_i1 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " COUNT intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " COUNT intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/count_2_l.c b/libgfortran/generated/count_2_l.c
@@ -119,8 +119,9 @@ count_2_l (gfc_array_i2 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " COUNT intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " COUNT intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/count_4_l.c b/libgfortran/generated/count_4_l.c
@@ -119,8 +119,9 @@ count_4_l (gfc_array_i4 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " COUNT intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " COUNT intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/generated/count_8_l.c b/libgfortran/generated/count_8_l.c
@@ -119,8 +119,9 @@ count_8_l (gfc_array_i8 * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " COUNT intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " COUNT intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{

diff --git a/libgfortran/m4/ifunction_logical.m4 b/libgfortran/m4/ifunction_logical.m4
@@ -102,8 +102,9 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
     {
       if (rank != GFC_DESCRIPTOR_RANK (retarray))
 	runtime_error ("rank of return array incorrect in"
-		       " u_name intrinsic: is %d, should be %d",
-		       GFC_DESCRIPTOR_RANK (retarray), rank);
+		       " u_name intrinsic: is %ld, should be %ld",
+		       (long int) GFC_DESCRIPTOR_RANK (retarray),
+		       (long int) rank);
 
       if (compile_options.bounds_check)
 	{