summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 12:41:55 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 12:41:55 +0000
commitea850b1e3c295d9e9417fcb03e86f12796fdd31a (patch)
tree68affc745f7518cd37b14f5766cc82464f16b7b7 /sal
parent7acbf6d9a4253d58f8f59bea4f68071cb3f4e8c0 (diff)
INTEGRATION: CWS sb91 (1.13.28); FILE MERGED
2008/07/16 06:49:52 sb 1.13.28.1: #i91567# SPARC64 was tentative; has been replaced by SPARC + IS_LP64
Diffstat (limited to 'sal')
-rwxr-xr-xsal/osl/unx/backtrace.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 1552c6014ae8..437d31157049 100755
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: backtrace.c,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -40,15 +40,19 @@
#if defined(SPARC)
+#if defined IS_LP64
+
#define FRAME_PTR_OFFSET 1
#define FRAME_OFFSET 0
-#define STACK_BIAS 0
+#define STACK_BIAS 0x7ff
-#elif defined(SPARC64)
+#else
#define FRAME_PTR_OFFSET 1
#define FRAME_OFFSET 0
-#define STACK_BIAS 0x7ff
+#define STACK_BIAS 0
+
+#endif
#elif defined( INTEL )