]> Devi Nivas Git - cs3210-lab1.git/commitdiff
fix bootblock build with gcc 4.4
authorNickolai Zeldovich <nickolai@csail.mit.edu>
Wed, 2 Sep 2009 06:03:46 +0000 (02:03 -0400)
committerNickolai Zeldovich <nickolai@csail.mit.edu>
Wed, 2 Sep 2009 06:03:46 +0000 (02:03 -0400)
.gitignore [new file with mode: 0644]
Makefile

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..144b944
--- /dev/null
@@ -0,0 +1,14 @@
+_*
+*.o
+*.d
+*.asm
+*.sym
+*.img
+vectors.S
+bootblock
+bootother
+bootother.out
+initcode
+initcode.out
+kernel
+mkfs
index 84c5cd0654bdfd9e371384a40fa788742fbe525a..6b63edaf0c01a53b2443c6df1fad8cd520d0cae9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ bootblock: bootasm.S bootmain.c
        $(CC) $(CFLAGS) -nostdinc -I. -c bootasm.S
        $(LD) $(LDFLAGS) -N -e start -Ttext 0x7C00 -o bootblock.o bootasm.o bootmain.o
        $(OBJDUMP) -S bootblock.o > bootblock.asm
-       $(OBJCOPY) -S -O binary bootblock.o bootblock
+       $(OBJCOPY) -S -O binary -j .text bootblock.o bootblock
        ./sign.pl bootblock
 
 bootother: bootother.S