Fix java bootstrap on 32-bit targets

	* jcf-dump.c (print_constant): Cast JPOOL_USHORT2, JPOOL_USHORT1
	results to long to match formats.

From-SVN: r186330

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 38fc269a3e0a88d7ad17b1941caa98cc38efae54..6f75740d2133e6e29b8b7e8ed93585fb7ec51305 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-11  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * jcf-dump.c (print_constant): Cast JPOOL_USHORT2, JPOOL_USHORT1
+       results to long to match formats.
+
 2012-04-11  Andrew Haley  <aph@redhat.com>
 
        * jcf-reader.c (jcf_parse_bootstrap_methods): Add

diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 9173ea473cc52a02474b721648d8f44aa2b7c98c..67233d11c0e138e4244667d77de663edecb4d6e4 100644 (file)
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -926,19 +926,20 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity)
        case 3:
        case 4:
          if (verbosity > 0)
-           fprintf (out, "Fieldref: %ld=", JPOOL_USHORT2 (jcf, index));
+           fprintf (out, "Fieldref: %ld=", (long) JPOOL_USHORT2 (jcf, index));
          print_constant (out, jcf, JPOOL_USHORT2 (jcf, index), 0);
        case 5:
        case 6:
        case 7:
        case 8:
          if (verbosity > 0)
-           fprintf (out, "Methodref: %ld=", JPOOL_USHORT2 (jcf, index));
+           fprintf (out, "Methodref: %ld=", (long) JPOOL_USHORT2 (jcf, index));
          print_constant (out, jcf, JPOOL_USHORT2 (jcf, index), 0);
          break;
        case 9:
          if (verbosity > 0)
-           fprintf (out, "InterfaceMethodref: %ld=", JPOOL_USHORT2 (jcf, index));
+           fprintf (out, "InterfaceMethodref: %ld=",
+                    (long) JPOOL_USHORT2 (jcf, index));
          print_constant (out, jcf, JPOOL_USHORT2 (jcf, index), 0);
          break;
        }
@@ -946,7 +947,7 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity)
       }
     case CONSTANT_MethodType:
       if (verbosity > 0)
-       fprintf (out, "MethodType %ld: ", JPOOL_USHORT1 (jcf, index));
+       fprintf (out, "MethodType %ld: ", (long) JPOOL_USHORT1 (jcf, index));
       print_signature (out, jcf, JPOOL_USHORT1 (jcf, index), 0);
       break;
     case CONSTANT_InvokeDynamic:
@@ -954,7 +955,8 @@ print_constant (FILE *out, JCF *jcf, int index, int verbosity)
        uint16 name_and_type = JPOOL_USHORT2 (jcf, index);
        if (verbosity > 0)
          fprintf (out, "InvokeDynamic: ");
-       fprintf (out, "bootstrap_method: %ld ", JPOOL_USHORT1 (jcf, index));
+       fprintf (out, "bootstrap_method: %ld ",
+                (long) JPOOL_USHORT1 (jcf, index));
        if (verbosity == 2)
          fprintf (out, " name_and_type: %d=<", name_and_type);
        print_constant_terse (out, jcf, name_and_type, CONSTANT_NameAndType);