wrapup problem? moving bsp fro 4.5.0 to 4.6pre1

[Wendell Thompson]

Ralf,

Thanks for your response. Please see comments below. I'm still stuck.

Wendell

Ralf Corsepius wrote:
> 
> You are looking at the wrong place. Your clock.rel seems to be
> bsp-specific, so it should be contained in librtemsbsp.a.
> 

Actually, it's cpu specific. An internal timer.

Doesn't the line:
CPU_PIECES = clock console timer
in wrapup/Makefile.am put it into librtemscpu.a?

It isn't in either place:

wentho at linux:/usr/local/rtems-4.6.0pre1/build-rtems-m68k> nm -g 
./m68k-rtems/clc5206_am/lib/librtemsbsp.a | grep Clock
wentho at linux:/usr/local/rtems-4.6.0pre1/build-rtems-m68k> nm -g 
./m68k-rtems/clc5206_am/lib/librtemscpu.a | grep Clock
wentho at linux:/usr/local/rtems-4.6.0pre1/build-rtems-m68k>

> 
>>This is wrapup/Makefile.am:
> 
> This was cpukit/wrapup/Makefile.am
> 
> You might want to look into your BSP's
> c/src/lib/libbsp/<cpu>/<bsp>/wrapup/Makefile.am
> 
> and compare it to the Makefile.ams of similar BSPs. 
> 

Actually, it is c/src/lib/libbsp/m68k/<my bsp>/wrapup/Makefile.am. I 
copied c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am and changed 
the list of files.

> 
> You probably also need to adapt your BSP's bsp_specs.
> 
> [Background: Since 4.5, librtems.a has been split into librtemscpu.a and
> librtemsbsp.a, so you need to reflect this change to your bsp_specs,]
> 

I figured that out already. Here's my bsp-specs:

%rename cpp old_cpp
%rename lib old_lib
%rename endfile old_endfile
%rename startfile old_startfile
%rename link old_link

*cpp:
%(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded)

*lib:
%{!qrtems: %(old_lib)} %{qrtems: --start-group \
%{!qrtems_debug: -lrtemsbsp -lrtemscpu} \
%{qrtems_debug: -lrtemsbsp_g -lrtemscpu_g} \
-lc -lgcc --end-group \
%{!qnolinkcmds: -T linkcmds%s}}

*startfile:
%{!qrtems: %(old_startfile)} %{qrtems: \
%{!qrtems_debug: start.o%s} \
%{qrtems_debug: start_g.o%s} \
crti.o%s crtbegin.o%s }

*link:
%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start}

*endfile:
%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}