changeset 2112:d0310693b225

Correct 'zero' build failures.
author kurt
date Wed, 26 Jan 2011 07:14:37 -0500
parents aca9fccf1724
children 64f1f124ea0a
files src/cpu/zero/vm/methodHandles_zero.cpp src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
diffstat 4 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/methodHandles_zero.cpp	Sun Jan 23 22:23:01 2011 -0800
+++ b/src/cpu/zero/vm/methodHandles_zero.cpp	Wed Jan 26 07:14:37 2011 -0500
@@ -33,6 +33,6 @@
 }
 
 void MethodHandles::generate_method_handle_stub(MacroAssembler*          masm,
-                                                MethodHandles::EntryKind ek) {
+                                                MethodHandles::EntryKind ek, TRAPS) {
   ShouldNotCallThis();
 }
--- a/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp	Sun Jan 23 22:23:01 2011 -0800
+++ b/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp	Wed Jan 26 07:14:37 2011 -0500
@@ -299,8 +299,6 @@
 }									\
 static __inline void							\
 atomic_store_rel_ ## name(volatile ptype p, vtype v)			\
-
-#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
 {									\
 	atomic_store_rel(p, v, sz);					\
 }
--- a/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp	Sun Jan 23 22:23:01 2011 -0800
+++ b/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp	Wed Jan 26 07:14:37 2011 -0500
@@ -41,8 +41,6 @@
   return bswap16(x);
 }
 
-
-#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
 inline u4 Bytes::swap_u4(u4 x) {
   return bswap32(x);
 }
@@ -50,3 +48,5 @@
 inline u8 Bytes::swap_u8(u8 x) {
   return bswap64(x);
 }
+
+#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
--- a/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Sun Jan 23 22:23:01 2011 -0800
+++ b/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp	Wed Jan 26 07:14:37 2011 -0500
@@ -457,10 +457,6 @@
   ShouldNotCallThis();
 }
 
-void os::print_register_info(outputStream *st, void *context) {
-  ShouldNotCallThis();
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // Stubs for things that would be in bsd_zero.s if it existed.
 // You probably want to disassemble these monkeys to check they're ok.