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/motorola_powerpc | |
| 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/motorola_powerpc')
4 files changed, 14 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 0eb1a18807..fb4f9ca2c0 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -33,7 +33,8 @@ project_lib_DATA += rtems_crti.$(OBJEXT) libbspstart_a_SOURCES += ../../powerpc/shared/start/vectors_entry.S project_lib_DATA += vectors_entry.$(OBJEXT) -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/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs index 2a245e9a66..2625609327 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs @@ -1,14 +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 \ - vectors_entry%O%s start.o%s -e __rtems_entry_point -u __vectors}} +%{!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/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am index 5071a2dcf1..6396cb5b66 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am @@ -69,7 +69,11 @@ $(PROJECT_LIB)/vectors_entry.$(OBJEXT): vectors_entry.$(OBJEXT) $(PROJECT_LIB)/$ $(INSTALL_DATA) $< $(PROJECT_LIB)/vectors_entry.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/vectors_entry.$(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/motorola_powerpc/startup/linkcmds b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds new file mode 100644 index 0000000000..ae44032d4f --- /dev/null +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds @@ -0,0 +1,6 @@ +INPUT(vectors_entry.o) +STARTUP(start.o) +ENTRY(__rtems_entry_point) +EXTERN(_vectors) + +INCLUDE linkcmds.share |