changeset 55024:948385f851f2

8224652: 32-bit build failures after JDK-8213084 Reviewed-by: thartmann, shade Contributed-by: shade@redhat.com
author lucy
date Thu, 23 May 2019 18:50:48 +0200
parents d56d8e40b6cd
children e93621d4db2c
files src/hotspot/share/compiler/abstractDisassembler.cpp src/hotspot/share/utilities/globalDefinitions.hpp
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/compiler/abstractDisassembler.cpp	Fri May 24 09:02:33 2019 +0200
+++ b/src/hotspot/share/compiler/abstractDisassembler.cpp	Thu May 23 18:50:48 2019 +0200
@@ -213,7 +213,7 @@
                 st->print("                   long");
               } else {
                 if (((uintptr_t)(here)&0x07) == 0) {
-                  st->print("%23.1ld", *((jlong*)here));
+                  st->print(JLONG_FORMAT_W(23), *((jlong*)here));
                 }
               }
               st->fill_to(align += 3*tsize);
--- a/src/hotspot/share/utilities/globalDefinitions.hpp	Fri May 24 09:02:33 2019 +0200
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp	Thu May 23 18:50:48 2019 +0200
@@ -97,6 +97,9 @@
 #ifndef JLONG_FORMAT
 #define JLONG_FORMAT           INT64_FORMAT
 #endif
+#ifndef JLONG_FORMAT_W
+#define JLONG_FORMAT_W(width)  INT64_FORMAT_W(width)
+#endif
 #ifndef JULONG_FORMAT
 #define JULONG_FORMAT          UINT64_FORMAT
 #endif