[src/trunk]: src/sys/arch/evbarm/stand/gzboot Fix to allow EABI compilation.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/237f4a68e15c
branches:  trunk
changeset: 780790:237f4a68e15c
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 06 02:14:15 2012 +0000

description:
Fix to allow EABI compilation.
Make sure to DISCARD new .ARM.attributes and .ARM.ebxidx sections.

diffstat:

 sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript  |  4 +++-
 sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile    |  4 +++-
 sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript    |  4 +++-
 sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript  |  4 +++-
 sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript  |  4 +++-
 sys/arch/evbarm/stand/gzboot/Makefile.gzboot                    |  4 ++--
 sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript |  4 +++-
 sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript |  4 +++-
 sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript |  4 +++-
 sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript   |  4 +++-
 10 files changed, 29 insertions(+), 11 deletions(-)

diffs (180 lines):

diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript    Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript    Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   FLASH = 0x00140000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
   /* Read-only sections, merged into text segment: */
   __text_store = FLASH;
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile
--- a/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile      Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/Makefile      Mon Aug 06 02:14:15 2012 +0000
@@ -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+= -DNS16550_AX4
 CPPFLAGS+= -DNS16550_FREQ=48000000
 
+CPUFLAGS+=  -march=armv4
+
 LDSCRIPT= ${.CURDIR}/ldscript
 
 # SRCS+=       gemini.c ns16550.c gemini_mem.c
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript      Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/GEMINI_dram_0x01600000/ldscript      Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   GZBOOT = 0x01600000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }
+
   /* Read-only sections, merged into text segment: */
   __text_store = GZBOOT;
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript    Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/IQ80310_flash_0x00080000/ldscript    Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   FLASH = 0x80000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   __text_store = FLASH;
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript    Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript    Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   FLASH = 0xf0080000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   __text_store = FLASH;
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 cleanlibdir:
        -rm -rf lib
 
-LDFLAGS= -M -T ${LDSCRIPT}
+LDFLAGS= -M -T ${LDSCRIPT} --fix-v4bx
 
 LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
 
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript   Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/SMDK2410_flash_0x00000000/ldscript   Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
   FLASH = 0x00000000;
   SDRAM = 0x30000000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   /* __text_store = FLASH; */
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript   Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00000000/ldscript   Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
   FLASH = 0x00000000;
   SDRAM = 0x08000000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   /* __text_store = FLASH; */
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript   Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/SMDK2800_flash_0x00100000/ldscript   Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   FLASH = 0x100000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   __text_store = FLASH;
   .text      :
diff -r 5897496a2ab8 -r 237f4a68e15c sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript     Mon Aug 06 01:55:13 2012 +0000
+++ b/sys/arch/evbarm/stand/gzboot/TS7200_flash_0x60660000/ldscript     Mon Aug 06 02:14:15 2012 +0000
@@ -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 @@
 {
   FLASH = 0x60660000;
 
+  /DISCARD/ : { *(.ARM.attributes*) *(.ARM.exidx) }  
+
   /* Read-only sections, merged into text segment: */
   __text_store = FLASH;
   .text      :