From bb592695d624742e91f81f9e401b437119639c75 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Dec 2017 16:04:57 -0600 Subject: ARM BSPs: Simplify bsp_specs Updates #3520. --- c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs | 6 +----- c/src/lib/libbsp/arm/atsam/bsp_specs | 6 +----- c/src/lib/libbsp/arm/beagle/bsp_specs | 6 +----- c/src/lib/libbsp/arm/csb336/bsp_specs | 6 +----- c/src/lib/libbsp/arm/csb337/bsp_specs | 6 +----- c/src/lib/libbsp/arm/edb7312/bsp_specs | 6 +----- c/src/lib/libbsp/arm/gdbarmsim/bsp_specs | 6 +----- c/src/lib/libbsp/arm/gumstix/bsp_specs | 6 +----- c/src/lib/libbsp/arm/imx/bsp_specs | 6 +----- c/src/lib/libbsp/arm/lm3s69xx/bsp_specs | 6 +----- c/src/lib/libbsp/arm/lpc176x/bsp_specs | 6 +----- c/src/lib/libbsp/arm/lpc24xx/bsp_specs | 6 +----- c/src/lib/libbsp/arm/lpc32xx/bsp_specs | 6 +----- c/src/lib/libbsp/arm/raspberrypi/bsp_specs | 6 +----- c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs | 6 +----- c/src/lib/libbsp/arm/rtl22xx/bsp_specs | 6 +----- c/src/lib/libbsp/arm/shared/startup/linkcmds.base | 1 + c/src/lib/libbsp/arm/smdk2410/bsp_specs | 6 +----- c/src/lib/libbsp/arm/stm32f4/bsp_specs | 6 +----- c/src/lib/libbsp/arm/tms570/bsp_specs | 6 +----- c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs | 6 +----- 21 files changed, 21 insertions(+), 100 deletions(-) diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs b/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs +++ b/c/src/lib/libbsp/arm/altera-cyclone-v/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/atsam/bsp_specs b/c/src/lib/libbsp/arm/atsam/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/atsam/bsp_specs +++ b/c/src/lib/libbsp/arm/atsam/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/beagle/bsp_specs b/c/src/lib/libbsp/arm/beagle/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/beagle/bsp_specs +++ b/c/src/lib/libbsp/arm/beagle/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/csb336/bsp_specs b/c/src/lib/libbsp/arm/csb336/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/csb336/bsp_specs +++ b/c/src/lib/libbsp/arm/csb336/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/csb337/bsp_specs b/c/src/lib/libbsp/arm/csb337/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/csb337/bsp_specs +++ b/c/src/lib/libbsp/arm/csb337/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/edb7312/bsp_specs b/c/src/lib/libbsp/arm/edb7312/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/edb7312/bsp_specs +++ b/c/src/lib/libbsp/arm/edb7312/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs b/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs +++ b/c/src/lib/libbsp/arm/gdbarmsim/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/gumstix/bsp_specs b/c/src/lib/libbsp/arm/gumstix/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/gumstix/bsp_specs +++ b/c/src/lib/libbsp/arm/gumstix/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/imx/bsp_specs b/c/src/lib/libbsp/arm/imx/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/imx/bsp_specs +++ b/c/src/lib/libbsp/arm/imx/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs b/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs +++ b/c/src/lib/libbsp/arm/lm3s69xx/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/lpc176x/bsp_specs b/c/src/lib/libbsp/arm/lpc176x/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/lpc176x/bsp_specs +++ b/c/src/lib/libbsp/arm/lpc176x/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/lpc24xx/bsp_specs b/c/src/lib/libbsp/arm/lpc24xx/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/bsp_specs +++ b/c/src/lib/libbsp/arm/lpc24xx/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/lpc32xx/bsp_specs b/c/src/lib/libbsp/arm/lpc32xx/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/lpc32xx/bsp_specs +++ b/c/src/lib/libbsp/arm/lpc32xx/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/raspberrypi/bsp_specs b/c/src/lib/libbsp/arm/raspberrypi/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/bsp_specs +++ b/c/src/lib/libbsp/arm/raspberrypi/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs b/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs +++ b/c/src/lib/libbsp/arm/realview-pbx-a9/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/rtl22xx/bsp_specs b/c/src/lib/libbsp/arm/rtl22xx/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/bsp_specs +++ b/c/src/lib/libbsp/arm/rtl22xx/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base index 61f2b6f027..c6314547eb 100644 --- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base +++ b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base @@ -25,6 +25,7 @@ OUTPUT_FORMAT ("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") OUTPUT_ARCH (arm) ENTRY (_start) +STARTUP (start.o) /* * Global symbols that may be defined externally diff --git a/c/src/lib/libbsp/arm/smdk2410/bsp_specs b/c/src/lib/libbsp/arm/smdk2410/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/smdk2410/bsp_specs +++ b/c/src/lib/libbsp/arm/smdk2410/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/stm32f4/bsp_specs b/c/src/lib/libbsp/arm/stm32f4/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/stm32f4/bsp_specs +++ b/c/src/lib/libbsp/arm/stm32f4/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} diff --git a/c/src/lib/libbsp/arm/tms570/bsp_specs b/c/src/lib/libbsp/arm/tms570/bsp_specs index e0ee7b931d..9c4b57c578 100644 --- a/c/src/lib/libbsp/arm/tms570/bsp_specs +++ b/c/src/lib/libbsp/arm/tms570/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -EB} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s } diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs b/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs index f1a3265ea5..47dd31d46b 100644 --- a/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs +++ b/c/src/lib/libbsp/arm/xilinx-zynq/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e _start}} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} +%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s} -- cgit v1.2.3