diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config.gcc | 9 | ||||
| -rwxr-xr-x | gcc/configure | 48 |
2 files changed, 55 insertions, 2 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index eec544ff1ba..8d5972fecf7 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5518,6 +5518,15 @@ case "${target}" in ;; esac +# VxWorks support for shared libraries has to be requested explicitly, +# so we can factor this part here: + +case "${target}-${enable_shared}" in + *-*-vxworks*-yes) + tmake_file="${tmake_file} t-slibgcc" + ;; +esac + # Targets for which there is at least one VxWorks port should include # vxworks-dummy.h to allow safe references to various TARGET_VXWORKS kinds # of markers from other files in the port, including the vxworks*.h files to diff --git a/gcc/configure b/gcc/configure index b512580414a..db366817cd0 100755 --- a/gcc/configure +++ b/gcc/configure @@ -14737,6 +14737,11 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +vxworks*) + # Assume VxWorks cross toolchains are built on Linux, possibly + # as canadian for Windows hosts. + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -19248,6 +19253,25 @@ uts4*) shlibpath_var=LD_LIBRARY_PATH ;; +# Shared libraries for VwWorks, >= 7 only at this stage +# and (fpic) still incompatible with "large" code models +# in a few configurations. Only for RTP mode in any case, +# and upon explicit request at configure time. +vxworks7*) + dynamic_linker=no + case ${with_multisubdir}-${enable_shared} in + *large*) + ;; + *mrtp*-yes) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker="$host_os module_loader" + ;; + esac + ;; *) dynamic_linker=no ;; @@ -21354,8 +21378,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no + # For VxWorks ports, we assume the use of a GNU linker with + # standard elf conventions. + ld_shlibs_CXX=yes ;; *) @@ -22903,6 +22928,25 @@ uts4*) shlibpath_var=LD_LIBRARY_PATH ;; +# Shared libraries for VwWorks, >= 7 only at this stage +# and (fpic) still incompatible with "large" code models +# in a few configurations. Only for RTP mode in any case, +# and upon explicit request at configure time. +vxworks7*) + dynamic_linker=no + case ${with_multisubdir}-${enable_shared} in + *large*) + ;; + *mrtp*-yes) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker="$host_os module_loader" + ;; + esac + ;; *) dynamic_linker=no ;; |