projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.9.7:
[sbcl.git]
/
src
/
runtime
/
globals.h
diff --git
a/src/runtime/globals.h
b/src/runtime/globals.h
index
2ed255f
..
c9e8c85
100644
(file)
--- a/
src/runtime/globals.h
+++ b/
src/runtime/globals.h
@@
-20,12
+20,12
@@
extern int foreign_function_call_active;
extern lispobj *current_control_stack_pointer;
extern lispobj *current_control_frame_pointer;
extern lispobj *current_control_stack_pointer;
extern lispobj *current_control_frame_pointer;
-#if !defined(ibmrt) && !defined(__i386__)
+#if !defined(__i386__)
extern lispobj *current_binding_stack_pointer;
#endif
extern lispobj *current_binding_stack_pointer;
#endif
-#if !defined(ibmrt) && !defined(__i386__)
-/* FIXME: why doesn't the x86 need this? */
+#if !defined(__i386__)
+/* FIXME: Why doesn't the x86 need this? */
extern lispobj *dynamic_space_free_pointer;
extern lispobj *current_auto_gc_trigger;
#endif
extern lispobj *dynamic_space_free_pointer;
extern lispobj *current_auto_gc_trigger;
#endif
@@
-34,13
+34,12
@@
extern lispobj *current_dynamic_space;
extern void globals_init(void);
extern void globals_init(void);
-#else LANGUAGE_ASSEMBLY
-
-/* These are needed by assem.S. */
+#else /* LANGUAGE_ASSEMBLY */
#ifdef mips
#define EXTERN(name,bytes) .extern name bytes
#endif
#ifdef mips
#define EXTERN(name,bytes) .extern name bytes
#endif
+/**/
#ifdef sparc
#ifdef SVR4
#define EXTERN(name,bytes) .global name
#ifdef sparc
#ifdef SVR4
#define EXTERN(name,bytes) .global name
@@
-48,26
+47,30
@@
extern void globals_init(void);
#define EXTERN(name,bytes) .global _ ## name
#endif
#endif
#define EXTERN(name,bytes) .global _ ## name
#endif
#endif
-#ifdef ibmrt
-#define EXTERN(name,bytes) .globl _/**/name
-#endif
-
+/**/
#ifdef alpha
#ifdef alpha
-#ifdef linux
+#ifdef __linux__
#define EXTERN(name,bytes) .globl name
#endif
#endif
#define EXTERN(name,bytes) .globl name
#endif
#endif
-
-/* I'm very dubious about this. Linux hasn't used _ on external names
- * since ELF became prevalent - i.e. about 1996, on x86 -dan 20010125 */
+#ifdef ppc
+#define EXTERN(name,bytes) .globl name
+#endif
#ifdef __i386__
#ifdef __linux__
#ifdef __i386__
#ifdef __linux__
+/* I'm very dubious about this. Linux hasn't used _ on external names
+ * since ELF became prevalent - i.e. about 1996, on x86 -dan 20010125 */
#define EXTERN(name,bytes) .globl _/**/name
#else
#define EXTERN(name,bytes) .global _ ## name
#endif
#endif
#define EXTERN(name,bytes) .globl _/**/name
#else
#define EXTERN(name,bytes) .global _ ## name
#endif
#endif
+/* FIXME : these sizes are, incidentally, bogus on Alpha. But the
+ * EXTERN macro doesn't use its second arg anyway, so no immediate harm
+ * done -dan 2002.05.07
+ */
+
EXTERN(foreign_function_call_active, 4)
EXTERN(current_control_stack_pointer, 4)
EXTERN(foreign_function_call_active, 4)
EXTERN(current_control_stack_pointer, 4)
@@
-80,6
+83,6
@@
EXTERN(current_dynamic_space, 4)
EXTERN(current_flags_register, 4)
#endif
EXTERN(current_flags_register, 4)
#endif
-#endif LANGUAGE_ASSEMBLY
+#endif /* LANGUAGE_ASSEMBLY */
-#endif _INCLUDED_GLOBALS_H_
+#endif /* _INCLUDED_GLOBALS_H_ */