src/share/vm/utilities/globalDefinitions_sparcWorks.hpp

@@ -65,24 +65,10 @@
 # include <sys/procfs.h>
 # endif
 
 #include <inttypes.h>
 
-// Solaris 8 doesn't provide definitions of these
-#ifdef SOLARIS
-#ifndef PRIdPTR
-#if defined(_LP64)
-#define PRIdPTR                 "ld"
-#define PRIuPTR                 "lu"
-#define PRIxPTR                 "lx"
-#else
-#define PRIdPTR                 "d"
-#define PRIuPTR                 "u"
-#define PRIxPTR                 "x"
-#endif
-#endif
-#endif
 
 #ifdef LINUX
 # include <signal.h>
 # include <ucontext.h>
 # include <sys/time.h>

@@ -105,34 +91,22 @@
 //
 // Note: this fix doesn't work well on Linux because NULL will be overwritten
 // whenever a system header file is included. Linux handles NULL correctly
 // through a special type '__null'.
 #ifdef SOLARIS
-#ifdef _LP64
-#undef NULL
-#define NULL 0L
-#else
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
+  #undef NULL
+  #define NULL 0L
 #endif
 
 // NULL vs NULL_WORD:
 // On Linux NULL is defined as a special type '__null'. Assigning __null to
 // integer variable will cause gcc warning. Use NULL_WORD in places where a
 // pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
 // sizeof(void*), so here we want something which is integer type, but has the
 // same size as a pointer.
 #ifdef LINUX
-  #ifdef _LP64
     #define NULL_WORD  0L
-  #else
-    // Cast 0 to intptr_t rather than int32_t since they are not the same type
-    // on some platforms.
-    #define NULL_WORD  ((intptr_t)0)
-  #endif
 #else
   #define NULL_WORD  NULL
 #endif
 
 #ifndef LINUX

@@ -153,21 +127,10 @@
 // If this gets an error, figure out a symbol XXX that implies the
 // prior definition of intptr_t, and add "&& !defined(XXX)" above.
 #endif
 #endif
 
-// On solaris 8, UINTPTR_MAX is defined as empty.
-// Everywhere else it's an actual value.
-#if UINTPTR_MAX - 1 == -1
-#undef UINTPTR_MAX
-#ifdef _LP64
-#define UINTPTR_MAX UINT64_MAX
-#else
-#define UINTPTR_MAX UINT32_MAX
-#endif /* ifdef _LP64 */
-#endif
-
 // Additional Java basic types
 
 typedef unsigned char      jubyte;
 typedef unsigned short     jushort;
 typedef unsigned int       juint;

@@ -250,15 +213,11 @@
 #define PRAGMA_IMPLEMENTATION
 #define PRAGMA_IMPLEMENTATION_(arg)
 #define VALUE_OBJ_CLASS_SPEC    : public _ValueObj
 
 // Formatting.
-#ifdef _LP64
 #define FORMAT64_MODIFIER "l"
-#else // !_LP64
-#define FORMAT64_MODIFIER "ll"
-#endif // _LP64
 
 #define offset_of(klass,field) offsetof(klass,field)
 
 #ifndef USE_LIBRARY_BASED_TLS_ONLY
 #define THREAD_LOCAL_DECL __thread