diff -r b02f361c324e -r 0cf4eccf130f hotspot/src/share/vm/asm/assembler.inline.hpp
--- a/hotspot/src/share/vm/asm/assembler.inline.hpp	Fri Nov 30 11:44:05 2012 -0800
+++ b/hotspot/src/share/vm/asm/assembler.inline.hpp	Fri Nov 30 15:23:16 2012 -0800
@@ -26,78 +26,21 @@
 #define SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
 
 #include "asm/assembler.hpp"
-#include "asm/codeBuffer.hpp"
-#include "compiler/disassembler.hpp"
-#include "runtime/threadLocalStorage.hpp"
 
-inline address AbstractAssembler::addr_at(int pos) const {
-  return code_section()->start() + pos;
-}
-
-void AbstractAssembler::emit_int8(int8_t x)     { code_section()->emit_int8 (x); }
-void AbstractAssembler::emit_int16(int16_t x)   { code_section()->emit_int16(x); }
-void AbstractAssembler::emit_int32(int32_t x)   { code_section()->emit_int32(x); }
-void AbstractAssembler::emit_int64(int64_t x)   { code_section()->emit_int64(x); }
-
-void AbstractAssembler::emit_float(jfloat  x)   { code_section()->emit_float(x); }
-void AbstractAssembler::emit_double(jdouble x)  { code_section()->emit_double(x); }
-void AbstractAssembler::emit_address(address x) { code_section()->emit_address(x); }
-
-inline address AbstractAssembler::inst_mark() const {
-  return code_section()->mark();
-}
-
-inline void AbstractAssembler::set_inst_mark() {
-  code_section()->set_mark();
-}
-
-inline void AbstractAssembler::clear_inst_mark() {
-  code_section()->clear_mark();
-}
-
-
-inline void AbstractAssembler::relocate(RelocationHolder const& rspec, int format) {
-  assert(!pd_check_instruction_mark()
-         || inst_mark() == NULL || inst_mark() == code_section()->end(),
-         "call relocate() between instructions");
-  code_section()->relocate(code_section()->end(), rspec, format);
-}
-
-
-inline CodeBuffer* AbstractAssembler::code() const {
-  return code_section()->outer();
-}
-
-inline int AbstractAssembler::sect() const {
-  return code_section()->index();
-}
-
-inline address AbstractAssembler::pc() const {
-  return code_section()->end();
-}
-
-inline int AbstractAssembler::offset() const {
-  return code_section()->size();
-}
-
-inline int AbstractAssembler::locator() const {
-  return CodeBuffer::locator(offset(), sect());
-}
-
-inline address AbstractAssembler::target(Label& L) {
-  return code_section()->target(L, pc());
-}
-
-inline int Label::loc_pos() const {
-  return CodeBuffer::locator_pos(loc());
-}
-
-inline int Label::loc_sect() const {
-  return CodeBuffer::locator_sect(loc());
-}
-
-inline void Label::bind_loc(int pos, int sect) {
-  bind_loc(CodeBuffer::locator(pos, sect));
-}
+#ifdef TARGET_ARCH_x86
+# include "assembler_x86.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "assembler_sparc.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_zero
+# include "assembler_zero.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_arm
+# include "assembler_arm.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_ppc
+# include "assembler_ppc.inline.hpp"
+#endif
 
 #endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP