diff options
author | Joel Sherrill <joel@rtems.org> | 2017-12-20 14:38:28 -0600 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2017-12-20 15:19:17 -0600 |
commit | 2f7a25c9cf54ed7e151f0c2d096029e072397916 (patch) | |
tree | 14ab8cd2dee11a4932fd73b055c8a0e73c0417ba /c/src/lib/libbsp/powerpc/beatnik | |
parent | qemuppc: Simplify bsp_specs (diff) | |
download | rtems-2f7a25c9cf54ed7e151f0c2d096029e072397916.tar.bz2 |
beatnik, motorola_powerpc, mvme3100, mvme5500: Simplify bsp_specs
This collection of BSPs shared the linker script shared/startup/linkcmds.
I renamed that ot shared/startup/linkcmds.share and made a BSP family
specific startup/linkcmds. This was needed because each BSP family had
a different combination of start file name, undefined symbols, etc.
Updates #3520.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/beatnik')
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/Makefile.am | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/bsp_specs | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/preinstall.am | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am index 115a79c880..19d627cac0 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am +++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am @@ -50,7 +50,8 @@ project_lib_DATA += motld_start.$(OBJEXT) #startup -dist_project_lib_DATA += ../shared/startup/linkcmds +dist_project_lib_DATA += ../shared/startup/linkcmds.share +dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = diff --git a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs b/c/src/lib/libbsp/powerpc/beatnik/bsp_specs index c6647045a9..99ca0adb61 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/bsp_specs +++ b/c/src/lib/libbsp/powerpc/beatnik/bsp_specs @@ -1,13 +1,9 @@ %rename endfile old_endfile %rename startfile old_startfile -%rename link old_link *startfile: %{!qrtems: %(old_startfile)} \ -%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s -e __rtems_entry_point -u __vectors motld_start.o%s}} +%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s}} *endfile: %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s} - -*link: -%{!qrtems: %(old_link)} %{qrtems: -dp -Bstatic} diff --git a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am index 38d9b7764e..a80848a923 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/preinstall.am +++ b/c/src/lib/libbsp/powerpc/beatnik/preinstall.am @@ -61,7 +61,11 @@ $(PROJECT_LIB)/motld_start.$(OBJEXT): motld_start.$(OBJEXT) $(PROJECT_LIB)/$(dir $(INSTALL_DATA) $< $(PROJECT_LIB)/motld_start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/motld_start.$(OBJEXT) -$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp) +$(PROJECT_LIB)/linkcmds.share: ../shared/startup/linkcmds.share $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.share +PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.share + +$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds b/c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds new file mode 100644 index 0000000000..b30fb91277 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds @@ -0,0 +1,5 @@ +STARTUP(motld_start.o) +ENTRY(__rtems_entry_point) +EXTERN(__vectors) + +INCLUDE linkcmds.share |