PERFORCE change 94922 for review
Warner Losh
imp at FreeBSD.org
Mon Apr 10 17:14:04 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=94922
Change 94922 by imp at imp_Speedy on 2006/04/10 17:13:06
Rewrite makefile from scratch
linker.cfg simplification
Affected files ...
.. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#3 edit
.. //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#2 edit
Differences ...
==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/Makefile#3 (text+ko) ====
@@ -1,38 +1,18 @@
-# ******************************************************************************
-# *
-# * Filename: Makefile
-# *
-# * Classic makefile intended for use in gnu environment. The entries listed
-# * here are intentionally simple to aid the novice user in his/her own
-# * development - for easy modification.
-# *
-# * Revision information:
-# *
-# * 20AUG2004 kb_admin initial creation
-# * 12JAN2005 kb_admin re-org, added emac
-# *
-# * BEGIN_KBDD_BLOCK
-# * No warranty, expressed or implied, is included with this software. It is
-# * provided "AS IS" and no warranty of any kind including statutory or aspects
-# * relating to merchantability or fitness for any purpose is provided. All
-# * intellectual property rights of others is maintained with the respective
-# * owners. This software is not copyrighted and is intended for reference
-# * only.
-# * END_BLOCK
-# ******************************************************************************
-#
+PROG=boot0
+SRCS=arm_init.s at91rm9200_lowlevel.c main.c debug_io.c xmodem.c
+NO_MAN=
+LDFLAGS=-e 0 -T linker.cfg
+CFLAGS=-O2 -mcpu=arm9 -ffreestanding
+OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
+CLEANFILES=${OBJS} ${PROG} ${PROG}.out
+
+all: ${PROG}
-CFILES= at91rm9200_lowlevel.o main.o debug_io.o xmodem.o
-ASFILES= arm_init.o
-OBJCOPY=objcopy
-LD=ld
-CFLAGS=-O2 -mcpu=arm9 -ffreestanding
-PROG=boot0
+${PROG}: ${PROG}.out ${OBJS}
+ objcopy -S -O binary ${PROG}.out ${PROG}
-${PROG}.bin: ${PROG}.out
- ${OBJCOPY} -O binary ${PROG}.out ${PROG}.bin
-${PROG}.out: ${CFILES} ${ASFILES}
- ${LD} -e 0 -o ${PROG}.out -T linker.cfg ${ASFILES} ${CFILES}
+${PROG}.out: ${OBJS}
+ ld ${LDFLAGS} -o ${PROG}.out ${OBJS}
clean:
- rm -f ${CFILES} ${ASFILES} ${PROG}.out ${PROG}.bin
+ rm -f ${CLEANFILES}
==== //depot/projects/arm/src/sys/boot/arm/kb920x/boot0/linker.cfg#2 (text+ko) ====
@@ -23,8 +23,6 @@
OUTPUT_ARCH(arm)
ENTRY(start)
SEARCH_DIR(/usr/local/arm/2.95.3/arm-linux/lib);
-/* Do we need any of these for elf?
- __DYNAMIC = 0; */
SECTIONS
{
/* Read-only sections, merged into text segment: */
@@ -39,137 +37,9 @@
*(.gnu.linkonce.t.*)
*(.glue_7t) *(.glue_7)
}
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rel.init : { *(.rel.init) }
- .rela.init : { *(.rela.init) }
- .rel.text :
- {
- *(.rel.text)
- *(.rel.text.*)
- *(.rel.gnu.linkonce.t.*)
- }
- .rela.text :
- {
- *(.rela.text)
- *(.rela.text.*)
- *(.rela.gnu.linkonce.t.*)
- }
- .rel.fini : { *(.rel.fini) }
- .rela.fini : { *(.rela.fini) }
- .rel.rodata :
- {
- *(.rel.rodata)
- *(.rel.rodata.*)
- *(.rel.gnu.linkonce.r.*)
- }
- .rela.rodata :
- {
- *(.rela.rodata)
- *(.rela.rodata.*)
- *(.rela.gnu.linkonce.r.*)
- }
- .rel.data :
- {
- *(.rel.data)
- *(.rel.data.*)
- *(.rel.gnu.linkonce.d.*)
- }
- .rela.data :
- {
- *(.rela.data)
- *(.rela.data.*)
- *(.rela.gnu.linkonce.d.*)
- }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors : { *(.rela.ctors) }
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors : { *(.rela.dtors) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.sdata :
- {
- *(.rel.sdata)
- *(.rel.sdata.*)
- *(.rel.gnu.linkonce.s.*)
- }
- .rela.sdata :
- {
- *(.rela.sdata)
- *(.rela.sdata.*)
- *(.rela.gnu.linkonce.s.*)
- }
- .rel.sbss :
- {
- *(.rel.sbss)
- *(.rel.sbss.*)
- *(.rel.gnu.linkonce.sb.*)
- }
- .rela.sbss :
- {
- *(.rela.sbss)
- *(.rela.sbss.*)
- *(.rel.gnu.linkonce.sb.*)
- }
- .rel.sdata2 :
- {
- *(.rel.sdata2)
- *(.rel.sdata2.*)
- *(.rel.gnu.linkonce.s2.*)
- }
- .rela.sdata2 :
- {
- *(.rela.sdata2)
- *(.rela.sdata2.*)
- *(.rela.gnu.linkonce.s2.*)
- }
- .rel.sbss2 :
- {
- *(.rel.sbss2)
- *(.rel.sbss2.*)
- *(.rel.gnu.linkonce.sb2.*)
- }
- .rela.sbss2 :
- {
- *(.rela.sbss2)
- *(.rela.sbss2.*)
- *(.rela.gnu.linkonce.sb2.*)
- }
- .rel.bss :
- {
- *(.rel.bss)
- *(.rel.bss.*)
- *(.rel.gnu.linkonce.b.*)
- }
- .rela.bss :
- {
- *(.rela.bss)
- *(.rela.bss.*)
- *(.rela.gnu.linkonce.b.*)
- }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init :
- {
- KEEP (*(.init))
- } =0
- .plt : { *(.plt) }
- .fini :
- {
- KEEP (*(.fini))
- } =0
PROVIDE (__etext = .);
PROVIDE (_etext = .);
PROVIDE (etext = .);
- .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) }
- .rodata1 : { *(.rodata1) }
- .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) }
- .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) }
.data :
{
__data_start = . ;
@@ -178,48 +48,6 @@
*(.gnu.linkonce.d.*)
SORT(CONSTRUCTORS)
}
- .data1 : { *(.data1) }
- . = 0x21200000;
- .eh_frame : { KEEP (*(.eh_frame)) }
- .gcc_except_table : { *(.gcc_except_table) }
- .ctors :
- {
- /* gcc uses crtbegin.o to find the start of
- the constructors, so we make sure it is
- first. Because this is a wildcard, it
- doesn't matter if the user does not
- actually link against crtbegin.o; the
- linker won't look for a file to match a
- wildcard. The wildcard also means that it
- doesn't matter which directory crtbegin.o
- is in. */
- KEEP (*crtbegin.o(.ctors))
- /* We don't want to include the .ctor section from
- from the crtend.o file until after the sorted ctors.
- The .ctor section from the crtend file contains the
- end of ctors marker and it must be last */
- KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
- KEEP (*(SORT(.ctors.*)))
- KEEP (*(.ctors))
- }
- .dtors :
- {
- KEEP (*crtbegin.o(.dtors))
- KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
- KEEP (*(SORT(.dtors.*)))
- KEEP (*(.dtors))
- }
- .got : { *(.got.plt) *(.got) }
- .dynamic : { *(.dynamic) }
- /* We want the small data sections together, so single-instruction offsets
- can access them all, and initialized data all before uninitialized, so
- we can shorten the on-disk segment size. */
- .sdata :
- {
- *(.sdata)
- *(.sdata.*)
- *(.gnu.linkonce.s.*)
- }
_edata = .;
PROVIDE (edata = .);
__bss_start = .;
@@ -252,38 +80,4 @@
_end = .;
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .comment 0 : { *(.comment) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- /* SGI/MIPS DWARF 2 extensions */
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
- /* These must appear regardless of . */
}
More information about the p4-projects
mailing list