Mercurial > hg > release > icedtea7-forest-2.0 > hotspot

changeset 2652:19698050aac2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow traps.h to be found on different SPARC setups.
author andrew
date Thu, 22 Sep 2011 00:35:08 +0100
parents 0d7ef4460bc2
children d88eef905e30
files src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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