+ compiler has the linker script now embedded

+ gba linker takes care of binutilsprefix
+ objcopy is called by the compiler

git-svn-id: trunk@4938 -

compiler/systems/i_gba.pas

@@ -32,8 +32,8 @@ unit i_gba;
             system       : system_arm_gba;
             name         : 'GameBoy Advance';
             shortname    : 'gba';
-            flags        : [tf_needs_symbol_size,tf_files_case_sensitive,tf_use_function_relative_addresses,
-	                          tf_smartlink_sections];
+            flags        : [tf_needs_symbol_size,tf_files_case_sensitive,tf_use_function_relative_addresses
+	                          ,tf_smartlink_sections];
             cpu          : cpu_arm;
             unit_env     : '';
             extradefines : '';

compiler/systems/t_gba.pas

@@ -1,7 +1,7 @@
 {
     This unit implements support import,export,link routines
     for the (arm) GameBoy Advance target
-    
+
     Copyright (c) 2001-2002 by Peter Vreman
 
     This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,7 @@ procedure TLinkerGba.SetDefaultInfo;
 begin
   with Info do
    begin
-     ExeCmd[1]:='ld $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE $RES';
+     ExeCmd[1]:='ld -g $OPT $DYNLINK $STATIC $GCSECTIONS $STRIP -L. -o $EXE -T $RES';
    end;
 end;
 
@@ -76,7 +76,7 @@ Var
   linklibc : boolean;
 begin
   WriteResponseFile:=False;
-  
+
 	{ Open link.res file }
   LinkRes:=TLinkRes.Create(outputexedir+Info.ResName);
 
@@ -119,7 +119,7 @@ begin
   if not StaticLibFiles.Empty then
    begin
     { vlink doesn't need, and doesn't support GROUP }
-    if (cs_link_on_target in aktglobalswitches) then 
+    if (cs_link_on_target in aktglobalswitches) then
      begin
       LinkRes.Add(')');
       LinkRes.Add('GROUP(');
@@ -130,8 +130,8 @@ begin
       LinkRes.AddFileName((maybequoted(s)));
      end;
    end;
-  
-  if (cs_link_on_target in aktglobalswitches) then 
+
+  if (cs_link_on_target in aktglobalswitches) then
    begin
     LinkRes.Add(')');
 
@@ -168,9 +168,321 @@ begin
       S:=SharedLibFiles.GetFirst;
       LinkRes.Add('lib'+s+target_info.staticlibext);
      end;
-    LinkRes.Add(')');    
+    LinkRes.Add(')');
    end;
-
+  with linkres do
+    begin
+      add('/* Linker Script Original v1.3 by Jeff Frohwein     */');
+      add('/*  v1.0 - Original release                         */');
+      add('/*  v1.1 - Added proper .data section support       */');
+      add('/*  v1.2 - Added support for c++ & iwram overlays   */');
+      add('/*       - Major contributions by Jason Wilkins.    */');
+      add('/*  v1.3 - .ewram section now can be used when      */');
+      add('/*         compiling for MULTIBOOT mode. This fixes */');
+      add('/*         malloc() in DevKitAdvance which depends  */');
+      add('/*         on __eheap_start instead of end to define*/');
+      add('/*         the starting location of heap space.     */');
+      add('/*         External global variable __gba_iwram_heap*/');
+      add('/*         support added to allow labels end, _end, */');
+      add('/*         & __end__ to point to end of iwram or    */');
+      add('/*         the end of ewram.                        */');
+      add('/*	Additions by WinterMute				*/');
+      add('/* v1.4 -	.sbss section added for unitialised	*/');
+      add('/*		    data in ewram 			*/');
+      add('/* v1.5 -	padding section added to stop EZF 	*/');
+      add('/*		    stripping important data		*/');
+      add('');
+      add('/* This file is released into the public domain		*/');
+      add('/* for commercial or non-commercial use with no		*/');
+      add('/* restrictions placed upon it.				*/');
+      add('');
+      add('/* NOTE!!!: This linker script defines the RAM &  */');
+      add('/*   ROM start addresses. In order for it to work */');
+      add('/*   properly, remove -Ttext and -Tbss linker     */');
+      add('/*   options from your makefile if they are       */');
+      add('/*   present.                                     */');
+      add('');
+      add('/* You can use the following to view section      */');
+      add('/* addresses in your .elf file:                   */');
+      add('/*   objdump -h file.elf                          */');
+      add('/* Please note that empty sections may incorrectly*/');
+      add('/* list the lma address as the vma address for    */');
+      add('/* some versions of objdump.                      */');
+      add('');
+      add('OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")');
+      add('OUTPUT_ARCH(arm)');
+      add('ENTRY(_start)');
+      add('/* SEARCH_DIR(/bin/arm); */');
+      add('');
+      add('/* The linker script function "var1 += var2;" sometimes    */');
+      add('/* reports incorrect values in the *.map file but the      */');
+      add('/* actual value it calculates is usually, if not always,   */');
+      add('/* correct. If you leave out the ". = ALIGN(4);" at the    */');
+      add('/* end of each section then the return value of SIZEOF()   */');
+      add('/* is sometimes incorrect and "var1 += var2;" appears to   */');
+      add('/* not work as well. "var1 += var2" style functions are    */');
+      add('/* avoided below as a result.                              */');
+      add('');
+      add('MEMORY {');
+      add('');
+      add('rom		: ORIGIN = 0x08000000, LENGTH = 32M');
+      add('iwram	: ORIGIN = 0x03000000, LENGTH = 32K');
+      add('ewram	: ORIGIN = 0x02000000, LENGTH = 256K');
+      add('}');
+      add('');
+      add('/*');
+      add('__text_start 		=	0x8000000;');
+      add('__eheap_end			=	0x2040000;');
+      add('__iwram_start		=	0x3000000;');
+      add('__iwram_end			=	0x3008000;');
+      add('');
+      add('__sp_irq			=	__iwram_end - 0x100;');
+      add('__sp_usr			=	__sp_irq - 0x100;');
+      add('*/');
+      add('__text_start  = ORIGIN(rom);');
+      add('/* __eheap_end   = ORIGIN(ewram) + 0x40000; */');
+      add('__eheap_end   = ORIGIN(ewram) + LENGTH(ewram);');
+      add('__iwram_start	= ORIGIN(iwram);');
+      add('/* __iwram_end   = ORIGIN(iwram) + 0x8000; */');
+      add('__iwram_end   = ORIGIN(iwram) + LENGTH(iwram); ');
+      add('__sp_irq      = __iwram_end - 0x100;');
+      add('__sp_usr      = __sp_irq - 0x100;');
+      add('');
+      add('');
+      add('SECTIONS');
+      add('{');
+      add('. = __text_start;');
+      add('.init :');
+      add('{');
+      add('KEEP (*(.init))');
+      add('. = ALIGN(4);');
+      add('} >rom =0xff');
+      add('');
+      add('.plt :');
+      add('{');
+      add('*(.plt)');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom');
+      add('');
+      add('.text  :   /* ALIGN (4): */');
+      add('{');
+      add('*(EXCLUDE_FILE (*.iwram*) .text)');
+      add('*(.text.*)');
+      add('*(.stub)');
+      add('/* .gnu.warning sections are handled specially by elf32.em.  */');
+      add('*(.gnu.warning)');
+      add('*(.gnu.linkonce.t*)');
+      add('*(.glue_7)');
+      add('*(.glue_7t)');
+      add('. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0xff');
+      add('');
+      add('__text_end = .;');
+      add('.fini           :');
+      add('{');
+      add('KEEP (*(.fini))');
+      add('. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */');
+      add('} >rom =0');
+      add('');
+      add('.rodata :');
+      add('{');
+      add('*(.rodata)');
+      add('*all.rodata*(*)');
+      add('*(.roda)');
+      add('*(.rodata.*)');
+      add('*(.gnu.linkonce.r*)');
+      add('SORT(CONSTRUCTORS)');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0xff');
+      add('');
+      add('.ctors :');
+      add('{');
+      add('/*	gcc uses crtbegin.o to find the start of the constructors, so');
+      add('we make sure it is first.  Because this is a wildcard, it');
+      add('doesn''t matter if the user does not actually link against');
+      add('crtbegin.o; the linker won''t look for a file to match a');
+      add('wildcard.  The wildcard also means that it doesn''t matter which');
+      add('directory crtbegin.o is in.  */');
+      add('KEEP (*crtbegin.o(.ctors))');
+      add('KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))');
+      add('KEEP (*(SORT(.ctors.*)))');
+      add('KEEP (*(.ctors))');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0');
+      add('');
+      add('.dtors :');
+      add('{');
+      add('KEEP (*crtbegin.o(.dtors))');
+      add('KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))');
+      add('KEEP (*(SORT(.dtors.*)))');
+      add('KEEP (*(.dtors))');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0');
+      add('');
+      add('.jcr            : { KEEP (*(.jcr)) } >rom ');
+      add('');
+      add('.eh_frame :');
+      add('{');
+      add('KEEP (*(.eh_frame))');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0');
+      add('');
+      add('.gcc_except_table :');
+      add('{');
+      add('*(.gcc_except_table)');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >rom = 0');
+      add('');
+      add('__iwram_lma = .;');
+      add('');
+      add('.iwram __iwram_start : AT (__iwram_lma)');
+      add('{');
+      add('__iwram_start = ABSOLUTE(.) ;');
+      add('*(.iwram)');
+      add('*iwram.*(.text)');
+      add('. = ALIGN(4);   /* REQUIRED. LD is flaky without it. */');
+      add('} >iwram = 0xff');
+      add('');
+      add('__data_lma = __iwram_lma + SIZEOF(.iwram) ;');
+      add('__iwram_end = . ;');
+      add('');
+      add('.bss ALIGN(4) :');
+      add('{');
+      add('__bss_start = ABSOLUTE(.);');
+      add('__bss_start__ = ABSOLUTE(.);');
+      add('*(.dynbss)');
+      add('*(.gnu.linkonce.b*)');
+      add('*(.bss*)');
+      add('*(COMMON)');
+      add('. = ALIGN(4);    /* REQUIRED. LD is flaky without it. */');
+      add('} >iwram');
+      add('');
+      add('__bss_end = . ;');
+      add('__bss_end__ = . ;');
+      add('');
+      add('.data ALIGN(4) : AT (__data_lma)');
+      add('{');
+      add('__data_start = ABSOLUTE(.);');
+      add('*(.data)');
+      add('*(.data.*)');
+      add('*(.gnu.linkonce.d*)');
+      add('CONSTRUCTORS');
+      add('. = ALIGN(4);');
+      add('} >iwram = 0xff');
+      add('');
+      add('__iwram_overlay_lma = __data_lma + SIZEOF(.data);');
+      add('');
+      add('__data_end  =  .;');
+      add('__iwram_overlay_start = . ;');
+      add('');
+      add('OVERLAY ALIGN(4) : NOCROSSREFS AT (__iwram_overlay_lma)');
+      add('{');
+      add('.iwram0 { *(.iwram0) . = ALIGN(4);}');
+      add('.iwram1 { *(.iwram1) . = ALIGN(4);}');
+      add('.iwram2 { *(.iwram2) . = ALIGN(4);}');
+      add('.iwram3 { *(.iwram3) . = ALIGN(4);}');
+      add('.iwram4 { *(.iwram4) . = ALIGN(4);}');
+      add('.iwram5 { *(.iwram5) . = ALIGN(4);}');
+      add('.iwram6 { *(.iwram6) . = ALIGN(4);}');
+      add('.iwram7 { *(.iwram7) . = ALIGN(4);}');
+      add('.iwram8 { *(.iwram8) . = ALIGN(4);}');
+      add('.iwram9 { *(.iwram9) . = ALIGN(4);}');
+      add('}>iwram = 0xff');
+      add('');
+      add('__ewram_lma = LOADADDR(.iwram0) + SIZEOF(.iwram0)+SIZEOF(.iwram1)+SIZEOF(.iwram2)+SIZEOF(.iwram3)+SIZEOF(.iwram4)+SIZEOF(.iwram5)+SIZEOF(.iwram6)+SIZEOF(.iwram7)+SIZEOF(.iwram8)+SIZEOF(.iwram9);');
+      add('');
+      add('__iwram_overlay_end = . ;');
+      add('__iheap_start = . ;');
+      add('');
+      add('__ewram_start = 0x2000000;');
+      add('.ewram __ewram_start : AT (__ewram_lma)');
+      add('{');
+      add('*(.ewram)');
+      add('. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */');
+      add('}>ewram = 0xff');
+      add('');
+      add('__ewram_overlay_lma = __ewram_lma + SIZEOF(.ewram);');
+      add('');
+      add('.sbss ALIGN(4):');
+      add('{');
+      add('__sbss_start = ABSOLUTE(.);');
+      add('*(.sbss)');
+      add('. = ALIGN(4);');
+      add('} >ewram');
+      add('	');
+      add('__sbss_end  = .;');
+      add('');
+      add('__ewram_end = . ;');
+      add('__ewram_overlay_start = . ;');
+      add('');
+      add('OVERLAY ALIGN(4): NOCROSSREFS AT (__ewram_overlay_lma)');
+      add('{');
+      add('.ewram0 { *(.ewram0) . = ALIGN(4);}');
+      add('.ewram1 { *(.ewram1) . = ALIGN(4);}');
+      add('.ewram2 { *(.ewram2) . = ALIGN(4);}');
+      add('.ewram3 { *(.ewram3) . = ALIGN(4);}');
+      add('.ewram4 { *(.ewram4) . = ALIGN(4);}');
+      add('.ewram5 { *(.ewram5) . = ALIGN(4);}');
+      add('.ewram6 { *(.ewram6) . = ALIGN(4);}');
+      add('.ewram7 { *(.ewram7) . = ALIGN(4);}');
+      add('.ewram8 { *(.ewram8) . = ALIGN(4);}');
+      add('.ewram9 { *(.ewram9) . = ALIGN(4);}');
+      add('}>ewram = 0xff');
+      add('');
+      add('__pad_lma = LOADADDR(.ewram0) + SIZEOF(.ewram0)+SIZEOF(.ewram1)+SIZEOF(.ewram2)+SIZEOF(.ewram3)+SIZEOF(.ewram4)+SIZEOF(.ewram5)+SIZEOF(.ewram6)+SIZEOF(.ewram7)+SIZEOF(.ewram8)+SIZEOF(.ewram9);');
+      add('');
+      add('/* EZF Advance strips trailing 0xff bytes, add a pad section so nothing important is removed */');
+      add('.pad ALIGN(4) : AT (__pad_lma)');
+      add('{');
+      add('LONG(0x52416b64)');
+      add('LONG(0x4d)');
+      add('. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */');
+      add('} = 0xff');
+      add('');
+      add('__ewram_overlay_end = . ;');
+      add('__eheap_start = . ;');
+      add('');
+      add('_end = .;');
+      add('__end__ = _end ; /* v1.3 */');
+      add('PROVIDE (end = _end); /* v1.3 */');
+      add('');
+      add('/* Stabs debugging sections.  */');
+      add('.stab 0 : { *(.stab) }');
+      add('.stabstr 0 : { *(.stabstr) }');
+      add('.stab.excl 0 : { *(.stab.excl) }');
+      add('.stab.exclstr 0 : { *(.stab.exclstr) }');
+      add('.stab.index 0 : { *(.stab.index) }');
+      add('.stab.indexstr 0 : { *(.stab.indexstr) }');
+      add('.comment 0 : { *(.comment) }');
+      add('/*	DWARF debug sections.');
+      add('Symbols in the DWARF debugging sections are relative to the beginning');
+      add('of the section so we begin them at 0.  */');
+      add('/* DWARF 1 */');
+      add('.debug          0 : { *(.debug) }');
+      add('.line           0 : { *(.line) }');
+      add('/* GNU DWARF 1 extensions */');
+      add('.debug_srcinfo  0 : { *(.debug_srcinfo) }');
+      add('.debug_sfnames  0 : { *(.debug_sfnames) }');
+      add('/* DWARF 1.1 and DWARF 2 */');
+      add('.debug_aranges  0 : { *(.debug_aranges) }');
+      add('.debug_pubnames 0 : { *(.debug_pubnames) }');
+      add('/* DWARF 2 */');
+      add('.debug_info     0 : { *(.debug_info) }');
+      add('.debug_abbrev   0 : { *(.debug_abbrev) }');
+      add('.debug_line     0 : { *(.debug_line) }');
+      add('.debug_frame    0 : { *(.debug_frame) }');
+      add('.debug_str      0 : { *(.debug_str) }');
+      add('.debug_loc      0 : { *(.debug_loc) }');
+      add('.debug_macinfo  0 : { *(.debug_macinfo) }');
+      add('/* SGI/MIPS DWARF 2 extensions */');
+      add('.debug_weaknames 0 : { *(.debug_weaknames) }');
+      add('.debug_funcnames 0 : { *(.debug_funcnames) }');
+      add('.debug_typenames 0 : { *(.debug_typenames) }');
+      add('.debug_varnames  0 : { *(.debug_varnames) }');
+      add('.stack 0x80000 : { _stack = .; *(.stack) }');
+      add('/* These must appear regardless of  .  */');
+      add('}');
+    end;
 
 { Write and Close response }
   linkres.writetodisk;
@@ -186,8 +498,17 @@ var
   binstr  : string;
   cmdstr  : TCmdStr;
   success : boolean;
-  StripStr: string[40];
+  StaticStr,
+  GCSectionsStr,
+  DynLinkStr,
+  StripStr: string;
 begin
+  { for future use }
+  StaticStr:='';
+  StripStr:='';
+  DynLinkStr:='';
+
+  GCSectionsStr:='--gc-sections';
   //if not(cs_link_extern in aktglobalswitches) then
   if not(cs_link_nolink in aktglobalswitches) then
    Message1(exec_i_linking,current_module.exefilename^);
@@ -200,28 +521,40 @@ begin
   Replace(cmdstr,'$OPT',Info.ExtraOptions);
   if not(cs_link_on_target in aktglobalswitches) then
    begin
-    Replace(cmdstr,'$EXE',(maybequoted(ScriptFixFileName(current_module.exefilename^))));
+    Replace(cmdstr,'$EXE',(maybequoted(ScriptFixFileName(ForceExtension(current_module.exefilename^,'.elf')))));
     Replace(cmdstr,'$RES',(maybequoted(ScriptFixFileName(outputexedir+Info.ResName))));
+    Replace(cmdstr,'$STATIC',StaticStr);
     Replace(cmdstr,'$STRIP',StripStr);
+    Replace(cmdstr,'$GCSECTIONS',GCSectionsStr);
+    Replace(cmdstr,'$DYNLINK',DynLinkStr);
    end
   else
    begin
-    Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(current_module.exefilename^)));
+    Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(ForceExtension(current_module.exefilename^,'.elf'))));
     Replace(cmdstr,'$RES',maybequoted(ScriptFixFileName(outputexedir+Info.ResName)));
+    Replace(cmdstr,'$STATIC',StaticStr);
+    Replace(cmdstr,'$STRIP',StripStr);
+    Replace(cmdstr,'$GCSECTIONS',GCSectionsStr);
+    Replace(cmdstr,'$DYNLINK',DynLinkStr);
    end;
-  success:=DoExec(FindUtil(BinStr),cmdstr,true,false);
+  success:=DoExec(FindUtil(utilsprefix+BinStr),cmdstr,true,false);
 
 { Remove ReponseFile }
   if (success) and not(cs_link_nolink in aktglobalswitches) then
    RemoveFile(outputexedir+Info.ResName);
 
-  MakeExecutable:=success;   { otherwise a recursive call to link method }
-
+{ Post process }
+  if success then
+    begin
+      success:=DoExec(FindUtil(utilsprefix+'objcopy'),'-O binary '+
+        ForceExtension(current_module.exefilename^,'.elf')+' '+
+        current_module.exefilename^,true,false);
+    end;
 
+  MakeExecutable:=success;   { otherwise a recursive call to link method }
 end;
 
 
-
 {*****************************************************************************
                                      Initialize
 *****************************************************************************}