src/share/vm/code/relocInfo.hpp

@@ -20,10 +20,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  *
  */
 
+#ifndef SHARE_VM_CODE_RELOCINFO_HPP
+#define SHARE_VM_CODE_RELOCINFO_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/top.hpp"
+
 // Types in this file:
 //    relocInfo
 //      One element of an array of halfwords encoding compressed relocations.
 //      Also, the source of relocation types (relocInfo::oop_type, ...).
 //    Relocation

@@ -413,11 +419,20 @@
   // Both methods takes old_type, so it is able to performe sanity checks on the information removed.
   static void change_reloc_info_for_address(RelocIterator *itr, address pc, relocType old_type, relocType new_type);
   static void remove_reloc_info_for_address(RelocIterator *itr, address pc, relocType old_type);
 
   // Machine dependent stuff
-  #include "incls/_relocInfo_pd.hpp.incl"
+#ifdef TARGET_ARCH_x86
+# include "relocInfo_x86.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "relocInfo_sparc.hpp"
+#endif
+#ifdef TARGET_ARCH_zero
+# include "relocInfo_zero.hpp"
+#endif
+
 
  protected:
   // Derived constant, based on format_width which is PD:
   enum {
     offset_width       = nontype_width - format_width,

@@ -1323,5 +1338,7 @@
   PatchingRelocIterator(nmethod* nm, address begin = NULL, address limit = NULL)
     : RelocIterator(nm, begin, limit)                { prepass();  }
 
   ~PatchingRelocIterator()                           { postpass(); }
 };
+
+#endif // SHARE_VM_CODE_RELOCINFO_HPP