# HG changeset patch
# User andrew
# Date 1316648108 -3600
# Node ID 19698050aac2f663c6af364c200e0135fbb38e95
# Parent  0d7ef4460bc2f30ca4782d974a4fc4d7caec8a3e
Allow traps.h to be found on different SPARC setups.

diff -r 0d7ef4460bc2 -r 19698050aac2 src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
--- a/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	Thu Sep 22 00:32:06 2011 +0100
+++ b/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp	Thu Sep 22 00:35:08 2011 +0100
@@ -28,7 +28,16 @@
 #include "runtime/os.hpp"
 #include "runtime/threadLocalStorage.hpp"
 
-#include <asm-sparc/traps.h>
+/* Headers for 32bit sparc with a 32bit userland end up in asm/
+ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
+ * There is no traps.h in asm-sparc64/
+ */
+
+#if defined(__sparc__) && defined(__arch64__)
+# include <asm-sparc/traps.h>
+#else 
+# include <asm/traps.h>
+#endif
 
 void MacroAssembler::read_ccr_trap(Register ccr_save) {
   // No implementation