X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.h;h=f91de8af838d5934ecabc3d560bf3f4ea3dac6c9;hb=4cf50b1896b25f5337e7c258b0b560da00d47993;hp=e0ba45457433dff7d2eb62c776259efa1bfad020;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/runtime/globals.h b/src/runtime/globals.h index e0ba454..f91de8a 100644 --- a/src/runtime/globals.h +++ b/src/runtime/globals.h @@ -9,10 +9,6 @@ * files for more information. */ -/* - * $Header$ - */ - #if !defined(_INCLUDE_GLOBALS_H_) #define _INCLUDED_GLOBALS_H_ @@ -28,26 +24,19 @@ extern lispobj *current_control_frame_pointer; extern lispobj *current_binding_stack_pointer; #endif -extern lispobj *read_only_space; -extern lispobj *static_space; -extern lispobj *dynamic_0_space; -extern lispobj *dynamic_1_space; -extern lispobj *control_stack; -extern lispobj *binding_stack; -#ifdef __i386__ -extern lispobj *control_stack_end; -#endif -extern lispobj *current_dynamic_space; #if !defined(ibmrt) && !defined(__i386__) -extern lispobj *current_dynamic_space_free_pointer; +/* FIXME: why doesn't the x86 need this? */ +extern lispobj *dynamic_space_free_pointer; extern lispobj *current_auto_gc_trigger; #endif +extern lispobj *current_dynamic_space; + extern void globals_init(void); #else LANGUAGE_ASSEMBLY -/* These are needed by ./assem.s */ +/* These are needed by assem.S. */ #ifdef mips #define EXTERN(name,bytes) .extern name bytes @@ -63,6 +52,14 @@ extern void globals_init(void); #define EXTERN(name,bytes) .globl _/**/name #endif +#ifdef alpha +#ifdef linux +#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 __i386__ #ifdef __linux__ #define EXTERN(name,bytes) .globl _/**/name @@ -75,10 +72,9 @@ EXTERN(foreign_function_call_active, 4) EXTERN(current_control_stack_pointer, 4) EXTERN(current_control_frame_pointer, 4) -#if !defined(ibmrt) && !defined(__i386__) EXTERN(current_binding_stack_pointer, 4) -EXTERN(current_dynamic_space_free_pointer, 4) -#endif +EXTERN(dynamic_space_free_pointer, 4) +EXTERN(current_dynamic_space, 4) #ifdef mips EXTERN(current_flags_register, 4)