diff options
| author | Ian Lance Taylor <iant@golang.org> | 2023-03-29 09:01:23 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2023-03-29 09:01:23 -0700 |
| commit | 6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced (patch) | |
| tree | 1deecdcfbf185c7044bc861d0ace51285c96cb62 /zlib | |
| parent | 795cffe109e28b248a54b8ee583cbae48368c2a7 (diff) | |
| parent | aa8f4242efc99f24de73c59d53996f28db28c13f (diff) | |
| download | gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.zip gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.tar.gz gcc-6612f4f8cb9b0d5af18ec69ad04e56debc3e6ced.tar.bz2 | |
Merge from trunk revision aa8f4242efc99f24de73c59d53996f28db28c13f.
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog | 24 | ||||
| -rwxr-xr-x | zlib/configure | 28 |
2 files changed, 50 insertions, 2 deletions
diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 3459bc6..9364455 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,27 @@ +2022-11-23 Marek Polacek <polacek@redhat.com> + + Revert: + 2022-11-23 Marek Polacek <polacek@redhat.com> + + * configure.ac (--enable-host-shared): Don't set PICFLAG here. + (--enable-host-pie): New check. Set PICFLAG after this check. + * configure: Regenerate. + +2022-11-23 Marek Polacek <polacek@redhat.com> + + * configure.ac (--enable-host-shared): Don't set PICFLAG here. + (--enable-host-pie): New check. Set PICFLAG after this check. + * configure: Regenerate. + +2022-10-12 Martin Liska <mliska@suse.cz> + + * configure: Regenerate. + +2022-10-11 Olivier Hainque <hainque@adacore.com> + Olivier Hainque <hainque@adacore.com> + + * configure: Regenerate. + 2022-08-25 Martin Liska <mliska@suse.cz> * configure: Regenerate. diff --git a/zlib/configure b/zlib/configure index 05c41b7..e35ac6e 100755 --- a/zlib/configure +++ b/zlib/configure @@ -5482,6 +5482,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 @@ -10279,6 +10284,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 ;; @@ -10735,7 +10759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10738 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10841,7 +10865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10844 "configure" +#line 10868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |