Changeset 272

Timestamp:

Mar 4, 2011, 12:30:42 PM (14 years ago)

Author:

dmik

Message:

hotspot: Fixed build breaks under GCC 4.5.2.

Location:

trunk/openjdk/hotspot/src/share/vm

Files:

• adlc/arena.hpp (modified) (1 diff)
• utilities/globalDefinitions_gcc.hpp (modified) (1 diff)

trunk/openjdk/hotspot/src/share/vm/adlc/arena.hpp

@@ -68 +68 @@
 class Chunk: public CHeapObj {
  public:
+#if defined(__GNUC__) && (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40500
+  // make sure op delete(void*, size) isn't treated as a usual deallocation
+  // function in GCC 4.5.x (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115)
+  void operator delete(void* p) { CHeapObj::operator delete(p); }
+#endif
   void* operator new(size_t size, size_t length);
   void  operator delete(void* p, size_t length);

trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp

@@ -91 +91 @@
 #ifdef __EMX__
 // we disable BSD visibility for the compiler so define these manually
-int     finite(double) __pure2;
-int     isnanf(float) __pure2;
+extern "C" int finite(double) __pure2;
+extern "C" int isnanf(float) __pure2;
 #define S_IREAD     S_IRUSR
 #define S_IWRITE    S_IWUSR