# HG changeset patch
# User Taiki TAIRA <e095767@ie.u-ryukyu.ac.jp>
# Date 1346385072 -32400
# Node ID 812852f41fc06e6fdcb9c680680e20399adf4d88
# Parent  b045d733207eec3f897001b12f94e4b8cb1ee174
minor change

diff -r b045d733207e -r 812852f41fc0 Makefile
--- a/Makefile	Fri Aug 31 07:05:44 2012 +0900
+++ b/Makefile	Fri Aug 31 12:51:12 2012 +0900
@@ -13,29 +13,31 @@
 			  -c \
 			  -o
 
-LDFLAGS64		= -melf_x86_64 \
+LDFLAGS64	= -melf_x86_64 \
 			  -nostdlib \
 			  -Ttext 0x100000 \
 			  --oformat elf64-x86-64 \
 			  -o 
 
-LDFLAGS32		= -melf_i386 \
-				  -nostdlib \
-				  -Ttext 0x100000 \
-				  --oformat elf32-i386 \
-				  -o
+LDFLAGS32	= -melf_i386 \
+			  -nostdlib \
+			  -Ttext 0x100000 \
+			  --oformat elf32-i386 \
+			  -o
 
-LDFLAGS = $(LDFLAGS32)
+LDFLAGS = $(LDFLAGS64)
+#BITFLAG = -m64
 
 TARGET=cbc_os.elf
 
 all: $(TARGET)
 
 kernel.o: kernel.cbc 
-	$(CBC) -m32 $(CBCFLAGS) $@ $^ 
+#	$(CBC) $(BITFLAG) $(CBCFLAGS) $@ $^ 
+	$(CBC) $(CBCFLAGS) $@ $^ 
 
 bootstrap.o: bootstrap.S 
-	$(CBC) -m32 $(CBCFLAGS) $@ $^
+	$(CBC) $(CBCFLAGS) $@ $^
 
 $(TARGET): bootstrap.o kernel.o 
 	$(LD) $(LDFLAGS) $@ $^
diff -r b045d733207e -r 812852f41fc0 bootstrap.S
--- a/bootstrap.S	Fri Aug 31 07:05:44 2012 +0900
+++ b/bootstrap.S	Fri Aug 31 12:51:12 2012 +0900
@@ -13,10 +13,10 @@
     /* Align 64 bit boundly. */
     .align 8
 multiboot_header:
-    .long MULTIBOOT2_HEADER_MAGIC
-    .long MULTIBOOT_ARCHITECTURE_I386
-    .long multiboot_header_end - multiboot_header
-    .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_header_end - multiboot_header))
+    .quad MULTIBOOT2_HEADER_MAGIC
+    .quad MULTIBOOT_ARCHITECTURE_I386
+    .quad multiboot_header_end - multiboot_header
+    .quad -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_header_end - multiboot_header))
     .short MULTIBOOT_HEADER_TAG_END
     .short 0
     .long 8