OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the vxworks crtstuff handling of kernel/rtp variations 

The ports that support RTPs achieve the kernel/rtp compilation
and link distinction through the multilib mechanism.

This patch just removes the bogus explicit extraneous
materialization of this distinction in the common VxWorks
configuration files and leaves the rtp specialization all
to the multilib machinery.

2020-10-15  Olivier Hainque  <hainque@adacore.com>

libgcc/
	* config/t-vxcrtstuff: Remove the -kernel/-rtp specialization.

gcc/
	* config/vxworks.h (VX_CRTBEGIN_SPEC): Likewise.
This commit is contained in:
Olivier Hainque 2020-10-15 17:39:05 +00:00
parent 57dd4e7bb7
commit 2d23fd23bb
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/config/vxworks.h
View File

@ -158,8 +158,7 @@ along with GCC; see the file COPYING3. If not see
/* Setup the crtstuff begin/end we might need for dwarf EH registration. */ /* Setup the crtstuff begin/end we might need for dwarf EH registration. */
#if !defined(CONFIG_SJLJ_EXCEPTIONS) && DWARF2_UNWIND_INFO #if !defined(CONFIG_SJLJ_EXCEPTIONS) && DWARF2_UNWIND_INFO
#define VX_CRTBEGIN_SPEC \ #define VX_CRTBEGIN_SPEC "vx_crtbegin.o%s"
"%{!mrtp:vx_crtbegin-kernel.o%s} %{mrtp:vx_crtbegin-rtp.o%s}"
#define VX_CRTEND_SPEC "-l:vx_crtend.o" #define VX_CRTEND_SPEC "-l:vx_crtend.o"
#else #else
#define VX_CRTBEGIN_SPEC "" #define VX_CRTBEGIN_SPEC ""

12
libgcc/config/t-vxcrtstuff
View File

@ -1,12 +1,12 @@
# crtbegin/crtend for VxWorks (DKM or RTP) # crtbegin/crtend for VxWorks
vx_crtbegin-kernel.o: $(srcdir)/config/vxcrtstuff.c vx_crtbegin.o: $(srcdir)/config/vxcrtstuff.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS) -DCRT_BEGIN -c $< $(crt_compile) $(CRTSTUFF_T_CFLAGS) -DCRT_BEGIN -c $<
vx_crtbegin-rtp.o: $(srcdir)/config/vxcrtstuff.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS) -DCRT_BEGIN -c $< -mrtp
vx_crtend.o: $(srcdir)/config/vxcrtstuff.c vx_crtend.o: $(srcdir)/config/vxcrtstuff.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS) -DCRT_END -c $< $(crt_compile) $(CRTSTUFF_T_CFLAGS) -DCRT_END -c $<
EXTRA_PARTS += vx_crtbegin-kernel.o vx_crtbegin-rtp.o vx_crtend.o # We do pretty different things for kernel vs rtp modes, all
# controlled thanks to __RTP__ and (optional) multilibs.
EXTRA_PARTS += vx_crtbegin.o vx_crtend.o