mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-19 14:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup handling of libgcc and libc_internal for VxWorks

Browse Source 
2018-09-21  Olivier Hainque  <hainque@adacore.com>

	* config/vxworks.h (VXWORKS_LIBGCC_SPEC): Remove -lc_internal.
	Merge block comment with the one ahead of VXWORKS_LIBS_RTP. Then:
	(VXWORKS_LIBS_RTP): Minor reordering.

From-SVN: r264477
This commit is contained in:
Olivier Hainque 2018-09-21 13:05:19 +00:00 committed by Olivier Hainque
parent f509691b96
commit 8d0ef28209
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2018-09-21 Olivier Hainque <hainque@adacore.com>
* config/vxworks.h (VXWORKS_LIBGCC_SPEC): Remove -lc_internal.
Merge block comment with the one ahead of VXWORKS_LIBS_RTP. Then:
(VXWORKS_LIBS_RTP): Minor reordering.
2018-09-21 Olivier Hainque <hainque@adacore.com>
* config/vxworks.h (STARTFILE_PREFIX_SPEC): Define.

18
gcc/config/vxworks.h
View File

@ -65,14 +65,17 @@ along with GCC; see the file COPYING3. If not see
#endif
/* The references to __init and __fini will be satisfied by
libc_internal.a, and some versions of VxWorks rely on explicit
extra libraries for system calls. */
/* For VxWorks static rtps, the system provides libc_internal.a, a superset of
libgcc.a that we need to use e.g. to satisfy references to __init and
__fini. We still want our libgcc to prevail for symbols it would provide
(e.g. register save entry points), so re-place it here between libraries
that might reference it and libc_internal. Also, some versions of VxWorks
rely on explicit extra libraries for system calls. */
#define VXWORKS_SYSCALL_LIBS_RTP
#define VXWORKS_LIBS_RTP \
VXWORKS_SYSCALL_LIBS_RTP " -lc -lgcc -lc_internal -lnet -ldsi"
VXWORKS_SYSCALL_LIBS_RTP " -lnet -ldsi -lc -lgcc -lc_internal"
/* On Vx6 and previous, the libraries to pick up depends on the architecture,
so cannot be defined for all archs at once. On Vx7, a VSB is always needed
@ -118,13 +121,8 @@ along with GCC; see the file COPYING3. If not see
%{mrtp:%{!shared:%{!non-static:-static} \
%{non-static:--force-dynamic --export-dynamic}}}"
/* For VxWorks static rtps, the system provides libc_internal.a, a superset
of libgcc.a that we want to use. Make sure not to dynamically export any
of its symbols, though, and always look for libgcc.a first so that we get
the latest versions of the GNU intrinsics during our builds. */
#undef VXWORKS_LIBGCC_SPEC
#define VXWORKS_LIBGCC_SPEC \
"-lgcc %{mrtp:%{!shared:--exclude-libs=libc_internal,libgcc -lc_internal}}"
#define VXWORKS_LIBGCC_SPEC "-lgcc"
#undef VXWORKS_STARTFILE_SPEC
#define VXWORKS_STARTFILE_SPEC "%{mrtp:%{!shared:-l:crt0.o}}"