Changeset 62340ef in buchla-68k

Timestamp:

07/16/2017 04:00:00 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

f38d645

Parents:

4cfe69a

Message:

Create output files via ELF files.

Files:

• Makefile (modified) (3 diffs)
• misc/ram.ld (modified) (4 diffs)
• misc/rom.ld (modified) (4 diffs)

Makefile

@@ -166 +166 @@
                                 $(CROSS_GCC) $(FLAGS_ASM) -c -o $@ $<
 
-bios.abs:               $(ROM_OBJ) \
+bios.abs:               bios.img
+                                cp bios.img bios.abs
+
+bios.img:               bios.elf
+                                $(CROSS_OBJC) --output-target binary bios.elf bios.img
+
+bios.elf:               $(ROM_OBJ) \
                                 prolog.a libcio.a vlib.a iolib.a libsm.a lib700.a
                                 $(CROSS_GCC) $(FLAGS_LNK) -Wl,--script,misc/rom.ld,--entry,0x100000 \
-                                -o bios.abs $(ROM_OBJ) \
+                                -o bios.elf $(ROM_OBJ) \
                                 prolog.a libcio.a vlib.a iolib.a libsm.a lib700.a -lgcc
 
@@ -205 +211 @@
                                 $(CROSS_GCC) $(FLAGS_ASM) -c -o $@ $<
 
-midas.abs:              $(LOWRAM_OBJ) prolog.a $(RAM_OBJ) \
+midas.abs:              midas.img
+                                cp midas.img midas.abs
+
+midas.img:              midas.elf
+                                $(CROSS_OBJC) --output-target binary midas.elf midas.img
+
+midas.elf:              $(LOWRAM_OBJ) prolog.a $(RAM_OBJ) \
                                 libcio.a vlib.a iolib.a libsm.a lib700.a
                                 $(CROSS_GCC) $(FLAGS_LNK) -Wl,--script,misc/ram.ld,--entry,0x10000 \
-                                -o midas.abs $(LOWRAM_OBJ) prolog.a $(RAM_OBJ) \
+                                -o midas.elf $(LOWRAM_OBJ) prolog.a $(RAM_OBJ) \
                                 libcio.a vlib.a iolib.a libsm.a lib700.a -lgcc
 
@@ -238 +250 @@
                                 rm -rf build
                                 rm -f prolog.a iolib.a libcio.a libsm.a lib700.a vlib.a
-                                rm -f bios.abs midas.abs
+                                rm -f bios.elf bios.img bios.abs
+                                rm -f midas.elf midas.img midas.abs
                                 rm -f hatari/c.img
                                 rm -f hatari/d/out/*

misc/ram.ld

@@ -1 @@
-OUTPUT_FORMAT("binary")
+OUTPUT_FORMAT("elf32-m68k")
 ENTRY(start)
 SECTIONS
@@ -5 +5 @@
     .text (0x10000) :
     {
-        *(.text)
-        *(.rodata)
+        *(.text .text.*)
+        *(.rodata .rodata.*)
         _etext = .;
     }
@@ -12 +12 @@
     .data : ALIGN(0x10)
     {
-        *(.data)
+        *(.data .data.*)
         _edata = .;
     }
@@ -18 +18 @@
     .bss : ALIGN(0x10)
     {
-        *(.bss)
+        *(.bss .bss.*)
     }
 

misc/rom.ld

@@ -1 @@
-OUTPUT_FORMAT("binary")
+OUTPUT_FORMAT("elf32-m68k")
 ENTRY(start)
 SECTIONS
@@ -5 +5 @@
     .text (0x100000) :
     {
-        *(.text)
-        *(.rodata)
+        *(.text .text.*)
+        *(.rodata .rodata.*)
         _etext = .;
     }
@@ -12 +12 @@
     .data : ALIGN(0x10)
     {
-        *(.data)
+        *(.data .data.*)
         _edata = .;
     }
@@ -18 +18 @@
     .bss (0x400) :
     {
-        *(.bss)
+        *(.bss .bss.*)
     }