diff options
| author | Nickolai Zeldovich <[email protected]> | 2009-09-02 02:03:46 -0400 |
|---|---|---|
| committer | Nickolai Zeldovich <[email protected]> | 2009-09-02 02:03:46 -0400 |
| commit | 45a978263651815caf7d0741201175c8969c2cc3 (patch) | |
| tree | d79549084c25963f3bf796dadad56e56c62f980e | |
| parent | 48755214c9a02d6249caf3126d3b41d67eda4730 (diff) | |
| download | xv6-labs-45a978263651815caf7d0741201175c8969c2cc3.tar.gz xv6-labs-45a978263651815caf7d0741201175c8969c2cc3.tar.bz2 xv6-labs-45a978263651815caf7d0741201175c8969c2cc3.zip | |
fix bootblock build with gcc 4.4
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..144b944 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +_* +*.o +*.d +*.asm +*.sym +*.img +vectors.S +bootblock +bootother +bootother.out +initcode +initcode.out +kernel +mkfs @@ -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 |