From ca3c56e7657bb0dea82f52826fb8a8790cf25d09 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Thu, 24 Dec 2009 14:00:50 +0100 Subject: [PATCH] 2009-12-24 Robert Millan * docs/boot.S (ASM): Rename to ... (ASM_FILE): ... this. * docs/multiboot.h: Check for `ASM_FILE' instead of `ASM'. * docs/multiboot.h (EXT_C, STACK_SIZE): Moved from here ... * docs/boot.S (EXT_C, STACK_SIZE): ... to here. --- ChangeLog | 9 +++++++++ docs/boot.S | 12 +++++++++++- docs/multiboot.h | 14 ++------------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7899aee16..793b5ccc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-12-24 Robert Millan + + * docs/boot.S (ASM): Rename to ... + (ASM_FILE): ... this. + * docs/multiboot.h: Check for `ASM_FILE' instead of `ASM'. + + * docs/multiboot.h (EXT_C, STACK_SIZE): Moved from here ... + * docs/boot.S (EXT_C, STACK_SIZE): ... to here. + 2009-12-13 Vladimir Serbinenko * docs/fdl.texi: Remove. It's not used. diff --git a/docs/boot.S b/docs/boot.S index 4db6a0099..f743a1bce 100644 --- a/docs/boot.S +++ b/docs/boot.S @@ -15,8 +15,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define ASM 1 +#define ASM_FILE 1 #include + +/* C symbol format. HAVE_ASM_USCORE is defined by configure. */ +#ifdef HAVE_ASM_USCORE +# define EXT_C(sym) _ ## sym +#else +# define EXT_C(sym) sym +#endif + +/* The size of our stack (16KB). */ +#define STACK_SIZE 0x4000 .text diff --git a/docs/multiboot.h b/docs/multiboot.h index df79225aa..ddd8b7b40 100644 --- a/docs/multiboot.h +++ b/docs/multiboot.h @@ -30,17 +30,7 @@ /* The magic number passed by a Multiboot-compliant boot loader. */ #define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 -/* The size of our stack (16KB). */ -#define STACK_SIZE 0x4000 - -/* C symbol format. HAVE_ASM_USCORE is defined by configure. */ -#ifdef HAVE_ASM_USCORE -# define EXT_C(sym) _ ## sym -#else -# define EXT_C(sym) sym -#endif - -#ifndef ASM +#ifndef ASM_FILE /* Do not include here in boot.S. */ /* Types. */ @@ -116,4 +106,4 @@ typedef struct memory_map unsigned long type; } memory_map_t; -#endif /* ! ASM */ +#endif /* ! ASM_FILE */