diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-13 15:54:17 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-13 15:54:17 +0200 |
| commit | bd21c04269deded2c7476ceca1100a26f28ea526 (patch) | |
| tree | 197bf75eedac69362078a4ccc0afe5615c45c327 /libgfortran | |
| parent | d9e7934d25da4a78ffef1f738206aa1d897911df (diff) | |
| parent | 786e4c024f941671a233f5779d73a5d22f4e9588 (diff) | |
| download | gcc-bd21c04269deded2c7476ceca1100a26f28ea526.zip gcc-bd21c04269deded2c7476ceca1100a26f28ea526.tar.gz gcc-bd21c04269deded2c7476ceca1100a26f28ea526.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 14 | ||||
| -rwxr-xr-x | libgfortran/configure | 47 | ||||
| -rw-r--r-- | libgfortran/io/async.h | 2 |
3 files changed, 60 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 864bf6a..8423825 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,17 @@ +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-10-10 LIU Hao <lh_mouse@126.com> + + * io/async.h (struct async_unit): Use `__gthread_t` instead + of `pthread_t`. + 2022-09-21 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> * ieee/ieee_arithmetic.F90 (IEEE_SET_ROUNDING_MODE): Handle diff --git a/libgfortran/configure b/libgfortran/configure index beb0ec4..d7c3a5e 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -7783,6 +7783,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 @@ -12311,6 +12316,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 ;; @@ -12767,7 +12791,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12770 "configure" +#line 12794 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12873,7 +12897,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12876 "configure" +#line 12900 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16075,6 +16099,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 ;; diff --git a/libgfortran/io/async.h b/libgfortran/io/async.h index efd542a..d57722a 100644 --- a/libgfortran/io/async.h +++ b/libgfortran/io/async.h @@ -351,7 +351,7 @@ typedef struct async_unit struct adv_cond work; struct adv_cond emptysignal; struct st_parameter_dt *pdt; - pthread_t thread; + __gthread_t thread; struct transfer_queue *head; struct transfer_queue *tail; |