2009-12-24 Robert Millan <rmh.grub@aybabtu.com>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 7899aee164992d09ee2e15ef66197c714e497085..793b5ccc28f4d2f63a2e9d91fcbd333e1907346b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * 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  <phcoder@gmail.com>
 
        * docs/fdl.texi: Remove. It's not used.

diff --git a/docs/boot.S b/docs/boot.S
index 4db6a00999da97fc40c84a6ef4e28b42b9173b4c..f743a1bce6c57ea6aeed14f0710535db5ee3d401 100644 (file)
--- 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 <multiboot.h>
+
+/* 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 df79225aa9737d9fccadcf074510bf3f86d4d127..ddd8b7b40342e360617784f0e09f115b23da4b85 100644 (file)
--- 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 */