Module Name: src
Committed By: matt
Date: Mon Aug 6 02:14:16 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000: ldscript
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000: Makefile
ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000: ldscript
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000: ldscript
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000: ldscript
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000: ldscript
Log Message:
Fix to allow EABI compilation.
Make sure to DISCARD new .ARM.attributes and .ARM.ebxidx sections.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile \
src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript
cvs rdiff -u -r1.7 -r1.8 \
src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.19
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18 Fri Jul 20 14:59:33 2012
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.18 2012/07/20 14:59:33 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.19 2012/08/06 02:14:15 matt Exp $
NOMAN= # defined
@@ -90,7 +90,7 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
-LDFLAGS= -M -T ${LDSCRIPT}
+LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
Index: src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript:1.5 src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript:1.6
--- src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript:1.5 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.5 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.6 2012/08/06 02:14:15 matt Exp $ */
OUTPUT_ARCH(arm)
ENTRY(FLASH)
@@ -14,6 +14,8 @@ SECTIONS
{
FLASH = 0x00140000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.2 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.3
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile:1.2 Mon Nov 10 20:30:12 2008
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/10 20:30:12 cliff Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/06 02:14:15 matt Exp $
S= ${.CURDIR}/../../../../..
@@ -12,6 +12,8 @@ CPPFLAGS+= -DCONADDR=0x42000000UL
CPPFLAGS+= -DNS16550_AX4
CPPFLAGS+= -DNS16550_FREQ=48000000
+CPUFLAGS+= -march=armv4
+
LDSCRIPT= ${.CURDIR}/ldscript
# SRCS+= gemini.c ns16550.c gemini_mem.c
Index: src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript:1.2 src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript:1.3
--- src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript:1.2 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript Mon Aug 6 02:14:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.2 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.3 2012/08/06 02:14:15 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
GZBOOT = 0x01600000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = GZBOOT;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript:1.4 src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript:1.5
--- src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript:1.4 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.4 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.5 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
FLASH = 0x80000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript:1.7 src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript:1.8
--- src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript:1.7 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.7 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.8 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
FLASH = 0xf0080000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript:1.4 src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript:1.5
--- src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript:1.4 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.4 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.5 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -20,6 +20,8 @@ SECTIONS
FLASH = 0x00000000;
SDRAM = 0x30000000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
/* __text_store = FLASH; */
.text :
Index: src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript:1.4 src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript:1.5
--- src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript:1.4 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.4 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.5 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -20,6 +20,8 @@ SECTIONS
FLASH = 0x00000000;
SDRAM = 0x08000000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
/* __text_store = FLASH; */
.text :
Index: src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript:1.4 src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript:1.5
--- src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript:1.4 Sat Sep 26 07:29:55 2009
+++ src/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.4 2009/09/26 07:29:55 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.5 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
FLASH = 0x100000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
Index: src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript
diff -u src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript:1.3 src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript:1.4
--- src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript:1.3 Sat Sep 26 07:29:56 2009
+++ src/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript Mon Aug 6 02:14:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript,v 1.3 2009/09/26 07:29:56 skrll Exp $ */
+/* $NetBSD: ldscript,v 1.4 2012/08/06 02:14:16 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -16,6 +16,8 @@ SECTIONS
{
FLASH = 0x60660000;
+ /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
/* Read-only sections, merged into text segment: */
__text_store = FLASH;
.text :
