Changeset 389f41e in mainline for arch/amd64

Timestamp:

2005-11-08T11:57:23Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5f85c91

Parents:

5b65205

Message:

new build system almost finished

Location:

arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• boot/Makefile (modified) (1 diff)
• include/atomic.h (added)
• include/barrier.h (added)
• include/bios (added)
• include/boot/memmap.h (added)
• include/boot/memmapasm.h (added)
• include/context_offset.h (added)
• include/ega.h (added)
• include/fpu_context.h (added)
• include/i8042.h (added)
• include/i8254.h (added)
• include/i8259.h (added)
• include/interrupt.h (added)
• include/mm/memory_init.h (added)
• include/smp (added)
• src/bios (added)
• src/boot/memmap.S (added)
• src/drivers (added)
• src/fmath.c (added)
• src/mm/frame.c (added)
• src/mm/memory_init.c (added)
• src/mm/tlb.c (added)
• src/smp/apic.c (added)
• src/smp/ipi.c (added)
• src/smp/mps.c (added)
• src/smp/smp.c (added)

arch/amd64/Makefile.inc

@@ -32 +32 @@
 BFD_NAME = elf64-x86-64
 BFD_ARCH = i386:x86-64
+BFD = binary
 TARGET = amd64-linux-gnu
 TOOLCHAIN_DIR = /usr/local/amd64/bin

arch/amd64/_link.ld.in

@@ -13 +13 @@
 #include <arch/mm/page.h>
 
-OUTPUT_FORMAT(binary)
+OUTPUT_FORMAT(BFD)
 ENTRY(kernel_image_start)
 

arch/amd64/boot/Makefile

@@ -1 @@
-.PHONY: nothing build clean
-
-nothing:
+.PHONY: build clean
 
 build: boot.bin
         dd if=boot.bin of=../../../image.bin bs=512 conv=sync
-        -cat ../../../kernel.bin >>../../../image.bin
+        -cat ../../../kernel.bin >> ../../../image.bin
         dd if=/dev/zero of=../../../image.bin bs=1 seek=1474559 count=1
 
 boot.bin: boot.o
-        ld -T boot.ld -entry _start_0x7c00 --oformat binary boot.o -o $@
+        $(LD) -T boot.ld -entry _start_0x7c00 --oformat binary boot.o -o $@
 
 boot.o: boot.S
-        gcc -E -DKERNEL_SIZE=$(KERNEL_SIZE) boot.S >boot.s
-        as boot.s -o $@
+        $(CC) -E -DKERNEL_SIZE=$(KERNEL_SIZE) boot.S > boot.s
+        $(AS) boot.s -o $@
         rm boot.s
 
 clean:
-        -rm *.o *.bin
+        -rm -f boot.o boot.bin ../../../image.bin