Changeset 6e259d5 in mainline

Timestamp:

2005-11-08T13:01:58Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ba22dcb

Parents:

789b5cc

Message:

link kernel in ARCH's native format first, then use objcopy to create output format

Files:

• Makefile (modified) (3 diffs)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• arch/ia64/_link.ld.in (modified) (1 diff)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (1 diff)

Makefile

@@ -142 +142 @@
 
 clean:
-        -rm -f kernel.bin kernel.map kernel.map.pre kernel.objdump generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
+        -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump generic/src/debug/real_map.bin Makefile.depend generic/include/arch generic/include/genarch arch/$(ARCH)/_link.ld
         find generic/src/ arch/$(ARCH)/src/ genarch/src/ -name '*.o' -exec rm \{\} \;
         $(MAKE) -C arch/$(ARCH)/boot clean
@@ -154 +154 @@
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
-        $(CC) $(DEFS) -DBFD=\"$(BFD)\" $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
@@ -165 +165 @@
         $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab $< $@
 
-kernel.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
+kernel.raw: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o
         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o -o $@ -Map kernel.map
+
+kernel.bin: kernel.raw
+        $(OBJCOPY) -O $(BFD) kernel.raw kernel.bin
 
 boot: kernel.bin

arch/amd64/_link.ld.in

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

arch/ia32/_link.ld.in

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

arch/ia64/_link.ld.in

@@ -9 +9 @@
 #define __ASM__
 
-OUTPUT_FORMAT(BFD)
 ENTRY(kernel_image_start)
 

arch/mips32/_link.ld.in

@@ -9 +9 @@
 #define mips mips
 
-OUTPUT_FORMAT(BFD)
 OUTPUT_ARCH(mips)
 

arch/ppc32/_link.ld.in

@@ -9 +9 @@
 #define __ASM__
 
-OUTPUT_FORMAT(BFD)
 ENTRY(kernel_image_start)
 

arch/sparc64/_link.ld.in

@@ -9 +9 @@
 #define __ASM__
 
-OUTPUT_FORMAT(BFD)
 ENTRY(kernel_image_start)