xv6

commit 45a978263651815caf7d0741201175c8969c2cc3
parent 48755214c9a02d6249caf3126d3b41d67eda4730
Author: Nickolai Zeldovich <nickolai@csail.mit.edu>
Date:   Wed,  2 Sep 2009 02:03:46 -0400

fix bootblock build with gcc 4.4

Diffstat:
A
.gitignore
 | 
14
++++++++++++++
M
Makefile
 | 
2
+-

2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,14 @@
+_*
+*.o
+*.d
+*.asm
+*.sym
+*.img
+vectors.S
+bootblock
+bootother
+bootother.out
+initcode
+initcode.out
+kernel
+mkfs
diff --git 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