winpthreads: Regenerate configure and Makefile.in Signed-off-by: LIU Hao <lh_mouse@126.com>
diff --git a/mingw-w64-libraries/winpthreads/build-aux/ltmain.sh b/mingw-w64-libraries/winpthreads/build-aux/ltmain.sh index bd9601d..85b6eee 100644 --- a/mingw-w64-libraries/winpthreads/build-aux/ltmain.sh +++ b/mingw-w64-libraries/winpthreads/build-aux/ltmain.sh
@@ -2,11 +2,11 @@ ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.5.4 +# libtool (GNU libtool) 2.6.2 # Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2026 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -26,13 +26,13 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. PROGRAM=libtool PACKAGE=libtool -VERSION=2.5.4 -package_revision=2.5.4 +VERSION=2.6.2 +package_revision=2.6.2 ## ------ ## @@ -2215,7 +2215,7 @@ # End: # Set a version string. -scriptversion='(GNU libtool) 2.5.4' +scriptversion='(GNU libtool) 2.6.2' # func_version # ------------ @@ -2299,6 +2299,22 @@ func_usage_message $ECHO "$long_help_message +If a TAG is supplied, it must use one of the tag names below: + + Tag Name Language Name + CC C + CXX C++ + OBJC Objective-C + OBJCXX Objective-C++ + GCJ Java + F77 Fortran 77 + FC Fortran + GO Go + RC Windows Resource + +If you do not see a tag name associated with your programming language, then +you are using a compiler that $progname does not support. + MODE must be one of the following: clean remove files from the build directory @@ -2721,9 +2737,9 @@ test : = "$debug_cmd" || func_append preserve_args " --debug" case $host_os in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - cygwin* | msys* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*) + # Solaris2 added to fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2* | *linux*) # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; @@ -2999,8 +3015,9 @@ # was found and let the user know that the "--tag" command # line option must be used. if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with '--tag'" + func_echo "unable to infer tagged configuration with compiler." + func_echo "Possible use of unsupported compiler." + func_fatal_error "specify a tag with '--tag'. For more information, try '$progname --help'." # else # func_verbose "using $tagname tagged configuration" fi @@ -3162,13 +3179,41 @@ { $debug_cmd - # awkward: cmd appends spaces to result + # Compatibility for original MSYS + if test "Xone" = "X$lt_cv_cmd_slashes"; then + func_convert_core_msys_to_w32_result=`( cmd /c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` + else # Assume 'lt_cv_cmd_slashes = "two"' func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` + fi + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_convert_core_msys_to_w32_result= + fi } #end: func_convert_core_msys_to_w32 +# func_convert_core_msys_to_w32_with_cygpath ARG +# Convert file name or path ARG with cygpath from MSYS format to w32 +# format. Return result in func_convert_core_msys_to_w32_with_cygpath_result. +func_convert_core_msys_to_w32_with_cygpath () +{ + $debug_cmd + + # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need + # to use LT_CYGPATH in this case. + func_convert_core_msys_to_w32_with_cygpath_result=`cygpath "$@" 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_convert_core_msys_to_w32_with_cygpath_result= + fi +} +#end: func_convert_core_msys_to_w32_with_cygpath + + # func_convert_file_check ARG1 ARG2 # Verify that ARG1 (a file name in $build format) was converted to $host # format in ARG2. Otherwise, emit an error message, but continue (resetting @@ -3303,8 +3348,13 @@ func_to_host_file_result=$1 if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result=$func_convert_core_msys_to_w32_result + if test "Xyes" = "X$cygpath_installed"; then + func_convert_core_msys_to_w32_with_cygpath -w "$1" + func_to_host_file_result=$func_convert_core_msys_to_w32_with_cygpath_result + else + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result=$func_convert_core_msys_to_w32_result + fi fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -3355,8 +3405,13 @@ func_to_host_file_result=$1 if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" + if test "Xyes" = "X$cygpath_installed"; then + func_convert_core_msys_to_w32_with_cygpath -w "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_with_cygpath_result" + else + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + fi func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" @@ -3457,8 +3512,13 @@ # and winepath ignores them completely. func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result=$func_convert_core_msys_to_w32_result + if test "Xyes" = "X$cygpath_installed"; then + func_convert_core_msys_to_w32_with_cygpath -w -p "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_msys_to_w32_with_cygpath_result + else + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_msys_to_w32_result + fi func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -3522,8 +3582,13 @@ # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + if test "Xyes" = "X$cygpath_installed"; then + func_convert_core_msys_to_w32_with_cygpath -w -p "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_with_cygpath_result" + else + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + fi func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" @@ -3813,7 +3878,7 @@ # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | os2* | cegcc*) + cygwin* | mingw* | windows* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -4455,6 +4520,14 @@ fi echo + echo "After a 'make install' for many GNU/Linux systems, 'ldconfig LIBDIR'" + echo "may need to be executed to help locate newly installed libraries," + echo "but you should consult with a system administrator before updating" + echo "the shared library cache as this should be done with great care" + echo "and consideration. (See the 'Platform-specific configuration notes'" + echo "section of the documentation for more information.)" + echo + echo "See any operating system documentation about shared libraries for" case $host in solaris2.[6789]|solaris2.1[0-9]) @@ -4529,7 +4602,7 @@ prev=$arg fi ;; - -g | -m | -o) + -g | -m | -o | -S | -t) prev=$arg ;; -s) @@ -4709,7 +4782,7 @@ 'exit $?' tstripme=$stripme case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) case $realname in *.dll.a) tstripme= @@ -4822,7 +4895,7 @@ # Do a test to see if this is really a libtool program. case $host in - *cygwin* | *msys* | *mingw* | *windows*) + *cygwin* | *mingw* | *windows*) if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result @@ -4897,7 +4970,7 @@ # remove .exe since cygwin /usr/bin/install will append another # one anyway case $install_prog,$host in - */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*) + */usr/bin/install*,*cygwin*) case $file:$destfile in *.exe:*.exe) # this is ok @@ -5045,12 +5118,12 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols=$output_objdir/$outputname.exp + export_symbols=$output_objdir/$outputname.expsym $opt_dry_run || { $RM $export_symbols eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *msys* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *windows* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; @@ -5058,11 +5131,11 @@ } else $opt_dry_run || { - eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.expsym"' + eval '$GREP -f "$output_objdir/$outputname.expsym" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *msys* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *windows* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -5076,7 +5149,7 @@ func_basename "$dlprefile" name=$func_basename_result case $host in - *cygwin* | *msys* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *windows* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" @@ -5259,7 +5332,7 @@ # Transform the symbol file into the correct name. symfileobj=$output_objdir/${my_outputname}S.$objext case $host in - *cygwin* | *msys* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *windows* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` @@ -5582,7 +5655,7 @@ $RM -rf unfat-$$ cd "$darwin_orig_dir" else - cd $darwin_orig_dir + cd "$darwin_orig_dir" func_extract_an_archive "$my_xdir" "$my_xabs" fi # $darwin_arches } # !$opt_dry_run @@ -5980,6 +6053,7 @@ # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC +# define MSVC_ISDIR(m)(((m) & S_IFMT) == S_IFDIR) #elif defined __MINGW32__ # define setmode _setmode # define stat _stat @@ -6159,7 +6233,7 @@ { EOF case $host in - *mingw* | *windows* | *cygwin* | *msys* ) + *mingw* | *windows* | *cygwin* ) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; @@ -6375,8 +6449,13 @@ if ((!path) || (!*path)) return 0; - if ((stat (path, &st) >= 0) +#ifdef _MSC_VER + if ((stat (path, &st) >= 0) && !MSVC_ISDIR (st.st_mode) && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) +#else + if ((stat (path, &st) >= 0) && !S_ISDIR (st.st_mode) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) +#endif return 1; else return 0; @@ -6933,7 +7012,7 @@ $debug_cmd case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out # what system we are compiling for in order to pass an extra @@ -6945,7 +7024,15 @@ # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes + case $host in + *-*-os2*) + # OS/2 does not allow undefined symbols at all when linking a dll. + allow_undefined=no + ;; + *) + allow_undefined=yes + ;; + esac ;; *) allow_undefined=yes @@ -7017,7 +7104,7 @@ build_old_libs=no break ;; - -all-static | -static | -static-libtool-libs) + -all-static | -static | -static-libtool-libs | --static | -Bstatic) case $arg in -all-static) if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then @@ -7034,7 +7121,7 @@ fi prefer_static_libs=built ;; - -static-libtool-libs) + -static-libtool-libs | --static | -Bstatic) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi @@ -7051,6 +7138,16 @@ # See if our shared archives depend on static archives. test -n "$old_archive_from_new_cmds" && build_old_libs=yes + # make sure "-Xpreprocessor -fopenmp" is processed as one token + case $@ in + *-Xpreprocessor\ -fopenmp*) + fopenmp_match="-Xpreprocessor -fopenmp" + ;; + *) + fopenmp_match=-fopenmp + ;; + esac + # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do arg=$1 @@ -7316,8 +7413,13 @@ continue ;; xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" + func_append linker_flags "$qarg," + # Args in the var 'compiler_flags' causes warnings in MSVC + func_cc_basename "$CC" + case $func_cc_basename_result in + cl|cl.exe) ;; + *) func_append compiler_flags " $wl$qarg" ;; + esac prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -7442,7 +7544,7 @@ ;; esac case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; @@ -7462,7 +7564,7 @@ -l*) if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -7535,7 +7637,7 @@ continue ;; -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -7558,11 +7660,9 @@ -no-install) case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "'-no-install' is ignored for $host" - func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -7684,6 +7784,11 @@ arg=$func_stripname_result ;; + -Wl,--as-needed|-Wl,--no-as-needed) + deplibs="$deplibs $arg" + continue + ;; + -Wl,*) func_stripname '-Wl,' '' "$arg" args=$func_stripname_result @@ -7693,8 +7798,13 @@ IFS=$save_ifs func_quote_arg pretty "$flag" func_append arg " $wl$func_quote_arg_result" - func_append compiler_flags " $wl$func_quote_arg_result" - func_append linker_flags " $func_quote_arg_result" + # Args in the var 'compiler_flags' causes warnings in MSVC + func_cc_basename "$CC" + case $func_cc_basename_result in + cl|cl.exe) ;; + *) func_append compiler_flags " $wl$func_quote_arg_result" ;; + esac + func_append linker_flags "$func_quote_arg_result," done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7740,6 +7850,7 @@ # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support + # --target=* for target architecture support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang @@ -7754,20 +7865,21 @@ # -shared-* direct GCC to link specific libraries dynamically # -static-* direct GCC to link specific libraries statically # -fcilkplus Cilk Plus language extension features for C/C++ + # -resource-dir=* for selecting compiler resource directory with clang # -rtlib=* select c runtime lib with clang # --unwindlib=* select unwinder library with clang # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking # -Wa,* Pass flags directly to the assembler - # -Werror, -Werror=* Report (specified) warnings as errors + # -W* Warnings, needed for lto -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|--target=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \ - -stdlib=*|-rtlib=*|--unwindlib=*| \ + -stdlib=*|-resource-dir=*|-rtlib=*|--unwindlib=*| \ -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \ -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \ -fdiagnostics-color*|-frecord-gcc-switches| \ -ffast-math|-fgnu-tm|-ftree-parallelize-loops=*|-funsafe-math-optimizations|-fvtable-verify*|-shared-*| \ - -fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*) + -fuse-ld=*|-static-*|-fcilkplus|-W*) func_quote_arg pretty "$arg" arg=$func_quote_arg_result func_append compile_command " $arg" @@ -7889,10 +8001,9 @@ fi ;; - *.$libext) - # An archive. + *.$libext|*.so) + # An archive or an explicit shared library. func_append deplibs " $arg" - func_append old_deplibs " $arg" continue ;; @@ -8108,8 +8219,17 @@ lib= found=false case $deplib in + -Wl,--as-needed|-Wl,--no-as-needed) + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + fi + continue + ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -8259,10 +8379,31 @@ func_resolve_sysroot "$deplib" lib=$func_resolve_sysroot_result ;; + *.so) + case $linkmode,$pass in + lib,*) + deplibs="$deplib $deplibs" + newdependency_libs="$deplib $newdependency_libs" + ;; + prog,link) + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + ;; + prog,*) + deplibs="$deplib $deplibs" + ;; + *) + func_warning "'$deplib' is ignored for archives/objects" + ;; + esac + continue + ;; *.$libext) if test conv = "$pass"; then deplibs="$deplib $deplibs" continue + else + func_append old_deplibs " $deplib" fi case $linkmode in lib) @@ -8293,7 +8434,9 @@ ;; esac if $valid_a_lib; then - func_warning "Linking the shared library $output against the static library $deplib is not portable!" + if test yes != "$build_old_libs"; then + func_warning "Linking the shared library $output against the static library $deplib is not portable!" + fi deplibs="$deplib $deplibs" else func_warning "Trying to link with static lib archive $deplib." @@ -8395,19 +8538,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8496,7 +8639,7 @@ fi case $host in # special handling for platforms with PE-DLLs. - *cygwin* | *msys* | *mingw* | *windows* | *cegcc* ) + *cygwin* | *mingw* | *windows* | *cegcc* ) # Linker will automatically link against shared library if both # static and shared are present. Therefore, ensure we extract # symbols from the import library if a shared library is present @@ -8646,7 +8789,7 @@ if test -n "$library_names" && { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host_os in - cygwin* | msys* | mingw* | windows* | cegcc* | os2*) + cygwin* | mingw* | windows* | cegcc* | os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no @@ -8719,7 +8862,7 @@ elif test -n "$soname_spec"; then # bleh windows case $host_os in - cygwin* | msys* | mingw* | windows* | cegcc* | os2*) + cygwin* | mingw* | windows* | cegcc* | os2*) func_arith $current - $age major=$func_arith_result versuffix=-$major @@ -9234,7 +9377,6 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs=$output - func_append objs "$old_deplibs" ;; lib) @@ -9359,29 +9501,21 @@ esac # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT '$current' must be a nonnegative integer" + if echo "$current" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,4}$)' > /dev/null; then + func_error "CURRENT '$current' must be a nonnegative integer and <= 5 digits" func_fatal_error "'$vinfo' is not valid version information" - ;; - esac + fi - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION '$revision' must be a nonnegative integer" + # Currently limiting revision length by Unix epoch time in nanoseconds. + if echo "$revision" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,18}$)' > /dev/null; then + func_error "REVISION '$revision' must be a nonnegative integer and <= 19 digits" func_fatal_error "'$vinfo' is not valid version information" - ;; - esac + fi - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE '$age' must be a nonnegative integer" + if echo "$age" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,4}$)' > /dev/null; then + func_error "AGE '$age' must be a nonnegative integer and <= 5 digits" func_fatal_error "'$vinfo' is not valid version information" - ;; - esac + fi if test "$age" -gt "$current"; then func_error "AGE '$age' is greater than the current interface number '$current'" @@ -9639,7 +9773,7 @@ if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -9752,7 +9886,7 @@ # libraries is allowed, but linking other static libraries is # non-portable. case $potlib in - */libFortran*.$libext) + */libFortran*.$libext | */libflang_rt*.$libext) func_append newdeplibs " $potlib" a_deplib= ;; @@ -10056,7 +10190,7 @@ orig_export_symbols= case $host_os in - cygwin* | msys* | mingw* | windows* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile func_dll_def_p "$export_symbols" || { @@ -10078,7 +10212,7 @@ if test -z "$export_symbols"; then if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then func_verbose "generating symbol list for '$libname.la'" - export_symbols=$output_objdir/$libname.exp + export_symbols=$output_objdir/$libname.expsym $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs=$IFS; IFS='~' @@ -10344,7 +10478,7 @@ ${skipped_export-false} && { func_verbose "generating symbol list for '$libname.la'" - export_symbols=$output_objdir/$libname.exp + export_symbols=$output_objdir/$libname.expsym $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -10615,7 +10749,7 @@ prog) case $host in - *cygwin* | *msys*) func_stripname '' '.exe' "$output" + *cygwin*) func_stripname '' '.exe' "$output" output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ @@ -10726,7 +10860,7 @@ esac fi case $host in - *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; @@ -10804,7 +10938,7 @@ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. wrappers_required=false ;; - *cygwin* | *msys* | *mingw* | *windows* ) + *cygwin* | *mingw* | *windows* ) test yes = "$build_libtool_libs" || wrappers_required=false ;; *) @@ -10951,14 +11085,14 @@ esac # test for cygwin because mv fails w/o .exe extensions case $host in - *cygwin*| *msys*) + *cygwin*) exeext=.exe func_stripname '' '.exe' "$outputname" outputname=$func_stripname_result ;; *) exeext= ;; esac case $host in - *cygwin* | *msys* | *mingw* | windows* ) + *cygwin* | *mingw* | windows* ) func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result @@ -10974,7 +11108,13 @@ # compiling, it, like the target executable, must be # executed on the $host or under an emulation environment. $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + func_cc_basename "$LTCC" + case $func_cc_basename_result in + cl|cl.exe) + $LTCC $LTCFLAGS -Fe$cwrapper $cwrappersource ;; + *) + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource ;; + esac $STRIP $cwrapper } @@ -11029,7 +11169,11 @@ build_libtool_libs=no ;; *) - oldobjs="$old_deplibs $non_pic_objects" + oldobjs=$non_pic_objects + # This is not correct to add old_deplibs creating an archive + # so append them only when creating an executable or a shared + # library. + test yes != "$build_old_libs" && oldobjs="$oldobjs $old_deplibs" $preload && test -f "$symfileobj" \ && func_append oldobjs " $symfileobj" addlibs=$old_convenience @@ -11290,6 +11434,20 @@ done dlprefiles=$newdlprefiles fi + + # Forward old library dependencies only when no shared + # library is being built. When building the shared library, + # the linker uses $deplibs to link the archives into it, but + # then we don't want to add it as transitive dependency. + if test -z "$library_names"; then + for lib in $old_deplibs; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append dependency_libs " $abs" + done + fi $RM $output # place dlname in correct position for cygwin # In fact, it would be nice if we could use this code for all target @@ -11302,7 +11460,7 @@ # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir"
diff --git a/mingw-w64-libraries/winpthreads/configure b/mingw-w64-libraries/winpthreads/configure index c90d81f..19d4d35 100755 --- a/mingw-w64-libraries/winpthreads/configure +++ b/mingw-w64-libraries/winpthreads/configure
@@ -797,6 +797,7 @@ enable_static enable_pic with_pic +enable_cxx_stdlib enable_fast_install enable_aix_soname with_aix_soname @@ -1456,6 +1457,10 @@ --enable-static[=PKGS] build static libraries [default=yes] --enable-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --enable-cxx-stdlib[=PKGS] + let the compiler frontend decide what standard + libraries to link when building C++ shared libraries + and modules [default=no] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --enable-aix-soname=aix|svr4|both @@ -5011,8 +5016,8 @@ -macro_version='2.5.4' -macro_revision='2.5.4' +macro_version='2.6.2' +macro_revision='2.6.2' @@ -5808,7 +5813,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | msys* | mingw* | windows* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -5976,7 +5981,7 @@ *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix @@ -5984,12 +5989,12 @@ ;; esac ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) case $build in *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) lt_cv_to_host_file_cmd=func_convert_file_noop ;; * ) # otherwise, assume *nix @@ -6042,6 +6047,77 @@ +case $host in #( + *-*-mingw* | *-*-windows* | *-*-cygwin*) : + case $build in #( + *-*-mingw* | *-*-windows* | *-*-cygwin*) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cygpath is installed" >&5 +printf %s "checking whether cygpath is installed... " >&6; } + if test ${lt_cv_cygpath_installed+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) lt_cv_cygpath_installed=ignoring + cygpath --help &> /dev/null + _lt_result=$? + if test 0 = "$_lt_result" +then : + lt_cv_cygpath_installed=yes +else case e in #( + e) lt_cv_cygpath_installed=no ;; +esac +fi + ;; +esac +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cygpath_installed" >&5 +printf "%s\n" "$lt_cv_cygpath_installed" >&6; } + + + + + if test "xyes" != "x$lt_cv_cygpath_installed" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use cmd with one slash or two slashes" >&5 +printf %s "checking whether to use cmd with one slash or two slashes... " >&6; } + if test ${lt_cv_cmd_slashes+y} +then : + printf %s "(cached) " >&6 +else case e in #( + e) + _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null` + if test 0 != $? +then : + as_fn_error $? "Do not know how to convert paths" "$LINENO" 5 +fi + case $_lt_result in #( + one-slash*) : + lt_cv_cmd_slashes="one" ;; #( + two-slashes*) : + lt_cv_cmd_slashes="two" ;; #( + *) : + as_fn_error $? "Do not know how to convert paths" "$LINENO" 5 + ;; +esac + ;; +esac +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cmd_slashes" >&5 +printf "%s\n" "$lt_cv_cmd_slashes" >&6; } + +fi + ;; #( + *) : + ;; +esac + + ;; #( + *) : + ;; +esac { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 printf %s "checking for $LD option to reload object files... " >&6; } if test ${lt_cv_ld_reload_flag+y} @@ -6060,14 +6136,14 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) if test yes = "$GCC"; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -6277,7 +6353,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; -cygwin* | msys*) +cygwin*) # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' @@ -6360,12 +6436,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +*-mlibc) lt_cv_deplibs_check_method=pass_all ;; -*-mlibc) +# This must be glibc/ELF. +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -6615,7 +6691,7 @@ e) lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) # two different shell functions defined in ltmain.sh; # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in @@ -7158,7 +7234,7 @@ aix*) symcode='[BCDT]' ;; -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) @@ -7197,13 +7273,13 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_cdecl_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"\1\", (void *) 0},/p'" lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" + -e 's/^I .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"lib\1\", (void *) 0},/p'" else # Disable hooks by default. lt_cv_sys_global_symbol_to_import= @@ -7217,22 +7293,22 @@ # so use this general approach. lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" +" -e 's/^T .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" +" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" +" -e 's/^$symcode$symcode* .* \(lib[a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \([a-zA-Z_][a-zA-Z0-9_]*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -7253,8 +7329,10 @@ # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++ or ICC, - # which start with @ or ?. + # which start with @ or ?. And Cygwin gawk-4.1.4-3 and newer + # treats input as binary, have to drop carriage return first. lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {sub(/\\r\$/,\"\")};"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ @@ -8819,7 +8897,7 @@ enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -9280,6 +9358,47 @@ + stdlibflag=-nostdlib +# Check whether --enable-cxx-stdlib was given. +if test ${enable_cxx_stdlib+y} +then : + enableval=$enable_cxx_stdlib; p=${PACKAGE-default} + case $enableval in + yes) enable_cxx_stdlib=yes ;; + no) enable_cxx_stdlib=no ;; + *) + enable_cxx_stdlib=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_cxx_stdlib=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else case e in #( + e) enable_cxx_stdlib=no ;; +esac +fi + + +if test yes = "$enable_cxx_stdlib"; then + stdlibflag= +fi + + + + + + + + + + + # Check whether --enable-fast-install was given. if test ${enable_fast_install+y} then : @@ -9372,8 +9491,21 @@ fi fi ;; -*) +power*-*-aix[5-9]*,'') + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&5 +printf "%s\n" "$as_me: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } with_aix_soname=aix + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5 +printf "%s\n" "(default) $with_aix_soname" >&6; } + ;; +*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } + with_aix_soname=aix + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5 +printf "%s\n" "(default) $with_aix_soname" >&6; } ;; esac @@ -9750,9 +9882,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes fi fi @@ -9814,7 +9946,7 @@ # PIC is the default for these OSes. ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -9899,7 +10031,7 @@ # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym' fi ;; @@ -9917,7 +10049,7 @@ esac ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -9950,7 +10082,13 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + *-mlibc) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*) case $cc_basename in # old Intel for x86_64, which still supported -KPIC. ecc*) @@ -9966,7 +10104,7 @@ ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) + icc* | ifort* | icx* | ifx*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-fPIC' lt_prog_compiler_static='-static' @@ -9989,6 +10127,12 @@ lt_prog_compiler_pic='-fPIC' lt_prog_compiler_static='-static' ;; + slimcc*) + # Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -10046,12 +10190,6 @@ lt_prog_compiler_static='-Bstatic' ;; - *-mlibc) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *nto* | *qnx*) # QNX uses GNU C++, but need to define -shared option too, otherwise # it will coredump. @@ -10177,9 +10315,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes fi fi @@ -10232,9 +10370,9 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then + if diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes fi else @@ -10292,9 +10430,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi @@ -10349,9 +10487,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes fi fi @@ -10444,7 +10582,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. @@ -10556,7 +10694,7 @@ fi ;; - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -10594,17 +10732,17 @@ hardcode_minus_L=yes allow_undefined_flag=unsupported shrext_cmds=.dll - archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -10613,7 +10751,6 @@ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes file_list_spec='@' ;; @@ -10633,7 +10770,12 @@ archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + *-mlibc) + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + + gnu* | linux* | tpf* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test linux-dietlibc = "$host_os"; then case $cc_basename in @@ -10658,7 +10800,7 @@ tmp_addflag=' -i_dynamic' ;; efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler + ifc* | ifort* | ifx*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= @@ -10713,11 +10855,6 @@ fi ;; - *-mlibc) - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -11116,14 +11253,14 @@ export_dynamic_flag_spec=-rdynamic ;; - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl* | icl* | icx* | icpx*) + # Native MSVC and Intel compilers hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -11133,14 +11270,20 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. + # A check exists to verify if there are linker flags, which will use + # different commands when linking. archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym"; else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym; fi~ - $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + if test -z "$linker_flags"; then + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + else + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + fi~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' @@ -11172,7 +11315,7 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + archive_cmds='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. @@ -11322,9 +11465,9 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then + if diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler__b=yes fi else @@ -11420,6 +11563,9 @@ link_all_deplibs=yes ;; + *-mlibc) + ;; + linux*) case $cc_basename in tcc*) @@ -11431,9 +11577,6 @@ esac ;; - *-mlibc) - ;; - netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -11480,17 +11623,17 @@ hardcode_minus_L=yes allow_undefined_flag=unsupported shrext_cmds=.dll - archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + archive_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + archive_expsym_cmds='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -11499,7 +11642,6 @@ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes file_list_spec='@' ;; @@ -11525,8 +11667,8 @@ else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11543,21 +11685,21 @@ if test yes = "$GCC"; then wlarc='$wl' archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym' ;; *) wlarc='$wl' archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + archive_expsym_cmds='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym' ;; esac fi @@ -12170,7 +12312,7 @@ # libtool to hard-code these into programs ;; -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) version_type=windows shrext_cmds=.dll need_version=no @@ -12210,8 +12352,8 @@ shlibpath_overrides_runpath=yes case $host_os in - cygwin* | msys*) - # MSYS DLLs use 'msys-' prefix rather than 'lib' + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" @@ -12228,8 +12370,8 @@ dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl* | *,icl* | *,icx*) + # Native MSVC and Intel compilers libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -12250,7 +12392,7 @@ # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; - cygwin* | msys*) + cygwin*) # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... @@ -12496,6 +12638,18 @@ hardcode_into_libs=yes ;; +*-mlibc) + version_type=linux # correct to gnu/linux during the next big refactor + 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='mlibc ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + # No shared lib support for Linux oldld, aout, or coff. linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no @@ -12523,7 +12677,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12609,6 +12763,8 @@ shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='NetBSD ld.elf_so' + enable_cxx_stdlib=yes + stdlibflag= ;; netbsd*) @@ -12627,18 +12783,8 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - ;; - -*-mlibc) - version_type=linux # correct to gnu/linux during the next big refactor - 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='mlibc ld.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes + enable_cxx_stdlib=yes + stdlibflag= ;; newsos6) @@ -12683,9 +12829,14 @@ need_lib_prefix=no # OS/2 can only load a DLL with a base name of 8 characters or less. soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' + n=$($ECHO $libname | tr -d .-); + l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l)); + r=$($ECHO $release | tr -d .-); + l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l)); + v=$($ECHO $versuffix | tr -d .- | cut -b -$mv); + r=$($ECHO $r | cut -b -$(($mr - ${#v}))); + n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v}))); + $ECHO $n$r$v`$shared_ext' library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' shlibpath_var=BEGINLIBPATH @@ -12874,7 +13025,7 @@ # PIC is the default for these OSes. ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -12959,7 +13110,7 @@ # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.expsym' fi ;; @@ -12977,7 +13128,7 @@ esac ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -13010,7 +13161,13 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + *-mlibc) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*) case $cc_basename in # old Intel for x86_64, which still supported -KPIC. ecc*) @@ -13026,7 +13183,7 @@ ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) + icc* | ifort* | icx* | ifx*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-fPIC' lt_prog_compiler_static='-static' @@ -13049,6 +13206,12 @@ lt_prog_compiler_pic='-fPIC' lt_prog_compiler_static='-static' ;; + slimcc*) + # Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -13106,12 +13269,6 @@ lt_prog_compiler_static='-Bstatic' ;; - *-mlibc) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *nto* | *qnx*) # QNX uses GNU C++, but need to define -shared option too, otherwise # it will coredump. @@ -13237,9 +13394,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes fi fi @@ -13286,9 +13443,9 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then + if diff conftest.expsym conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes fi else @@ -13507,7 +13664,7 @@ lt_cv_dlopen_libs= ;; - cygwin* | msys*) + cygwin*) lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; @@ -14201,6 +14358,13 @@ + + + + + + + ac_config_commands="$ac_config_commands libtool" @@ -15148,6 +15312,8 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_cxx_stdlib='`$ECHO "$enable_cxx_stdlib" | $SED "$delay_single_quote_subst"`' +stdlibflag='`$ECHO "$stdlibflag" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' @@ -15175,6 +15341,7 @@ lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_cygpath_installed='`$ECHO "$lt_cv_cygpath_installed" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' @@ -15357,6 +15524,7 @@ want_nocaseglob \ sharedlib_from_linklib_cmd \ AR \ +lt_ar_flags \ archiver_list_spec \ STRIP \ RANLIB \ @@ -16217,7 +16385,7 @@ # Provide generalized library-building support services. # Written by Gordon Matzigkeit, 1996 -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2025-2026 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -16237,7 +16405,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # The names of the tagged configurations supported by this script. @@ -16270,6 +16438,12 @@ # What type of objects to build. pic_mode=$pic_mode +# Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules. +enable_cxx_stdlib=$enable_cxx_stdlib + +# Flag used for specifying not to link standard libraries. +stdlibflag=$stdlibflag + # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -16340,6 +16514,9 @@ # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# whether cygpath is installed. +cygpath_installed=$lt_cv_cygpath_installed + # A file(cmd) program that detects file types. FILECMD=$lt_FILECMD @@ -16362,7 +16539,7 @@ AR=$lt_AR # Flags to create an archive (by configure). -lt_ar_flags=$lt_ar_flags +lt_ar_flags=$lt_lt_ar_flags # Flags to create an archive. AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
diff --git a/mingw-w64-libraries/winpthreads/m4/libtool.m4 b/mingw-w64-libraries/winpthreads/m4/libtool.m4 index d998bae..a852f0e 100644 --- a/mingw-w64-libraries/winpthreads/m4/libtool.m4 +++ b/mingw-w64-libraries/winpthreads/m4/libtool.m4
@@ -1,6 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software +# Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software # Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # @@ -9,7 +9,7 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2025-2026 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -29,10 +29,10 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. ]) -# serial 63 LT_INIT +# serial 67 LT_INIT # LT_PREREQ(VERSION) @@ -506,6 +506,87 @@ # ------------------------------ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) +# _LT_OBJECTIVE_C +# ------------------------------ +m4_defun([_LT_OBJECTIVE_C], [ + AC_CACHE_CHECK([for Objective C compilation], + [lt_cv_objc_compiles], + [ save_CFLAGS=$CFLAGS + CFLAGS=$OBJCFLAGS + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#import <Foundation/Foundation.h> +@interface Addition : NSObject +- (int)this:(int)a that:(int)b; +@end + +@implementation Addition +- (int)this:(int)a that:(int)b +{ + return a + b; +} +@end +],[])], + lt_cv_objc_compiles=yes, + lt_cv_objc_compiles=no + ) + CFLAGS=$save_CFLAGS + ] + ) + objc_compiles=$lt_cv_objc_compiles + _LT_DECL([], [objc_compiles], [1], + [Check for compiling Objective C code]) +]) + +# _LT_OBJECTIVE_CXX +# ------------------------------ +m4_defun([_LT_OBJECTIVE_CXX], [ + AC_CACHE_CHECK([for Objective C++ compilation], + [lt_cv_objcxx_compiles], + [ save_CFLAGS=$CFLAGS + CFLAGS=$OBJCXXFLAGS + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#import <Foundation/Foundation.h> +@interface Addition : NSObject +- (int)this:(int)a that:(int)b; +@end + +@implementation Addition +- (int)this:(int)a that:(int)b +{ + return a + b; +} +@end +],[])], + lt_cv_objcxx_compiles=yes, + lt_cv_objcxx_compiles=no + ) + CFLAGS=$save_CFLAGS + ] + ) + objcxx_compiles=$lt_cv_objcxx_compiles + _LT_DECL([], [objcxx_compiles], [1], + [Check for compiling Objective C++ code]) +]) + +m4_defun([_LT_ML64], [ + AC_CACHE_CHECK([for ML64 compilation], + [lt_cv_ml64_compiles], + [ save_CFLAGS=$CFLAGS + CFLAGS=$ML64FLAGS + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ret +],[])], + lt_cv_ml64_compiles=yes, + lt_cv_ml64_compiles=no + ) + CFLAGS=$save_CFLAGS + ] + ) + objc_compiles=$lt_cv_objc_compiles + _LT_DECL([], [ml64_compiles], [1], + [Check for compiling ml64 code]) +]) + # _LT_CONFIG_COMMANDS # ------------------- @@ -651,7 +732,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2024 Free Software Foundation, Inc. +Copyright (C) 2025-2026 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -826,6 +907,9 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Objective-C], [_LT_LANG(OBJC)], + [Objective-C++], [_LT_LANG(OBJCXX)], + [Microsoft Macro Assembler], [_LT_LANG(ML64)], [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], @@ -848,6 +932,26 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_ML64], [ +m4_defun([AC_PROG_ML64], +[AC_LANG_PUSH(ML64)dnl +AC_ARG_VAR([ML64], [ml64 compiler command])dnl +AC_ARG_VAR([ML64FLAGS], [ml64 compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(ML64, ml64) +if test -z "$ML64"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(ML64, [${ac_tool_prefix}ml64], [${ac_tool_prefix}ml64]) + fi +fi +if test -z "$ML64"; then + AC_CHECK_PROG(ML64, ml64, ml64, false) +fi +])#m4_defun +])#m4_ifndef + + + m4_ifndef([AC_PROG_GO], [ ############################################################ # NOTE: This macro has been submitted for inclusion into # @@ -898,19 +1002,34 @@ [LT_LANG(GCJ)], [m4_ifdef([AC_PROG_GCJ], [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - AC_PROVIDE_IFELSE([AC_PROG_GO], [LT_LANG(GO)], [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [LT_LANG(OBJC)], + [m4_define([AC_PROG_OBJC], defn([AC_PROG_OBJC])[LT_LANG(OBJC)])]) + +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [LT_LANG(OBJCXX)], + [m4_define([AC_PROG_OBJCXX], defn([AC_PROG_OBJCXX])[LT_LANG(OBJCXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_ML64], + [LT_LANG(ML64)], + [m4_define([AC_PROG_ML64], defn([AC_PROG_ML64])[LT_LANG(ML64)])]) AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG + + +]) + +# _LT_LANG_DEFAULT_CONFIG # Obsolete macros: AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) @@ -1161,8 +1280,8 @@ _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1537,7 +1656,7 @@ test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} lt_ar_flags=$AR_FLAGS -_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) +_LT_DECL([], [lt_ar_flags], [1], [Flags to create an archive (by configure)]) # Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override # by AR_FLAGS because that was never working and AR_FLAGS is about to die. @@ -1640,9 +1759,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + if test ! -s conftest.er2 || diff conftest.expsym conftest.er2 >/dev/null; then $2=yes fi fi @@ -1680,9 +1799,9 @@ if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.expsym $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then + if diff conftest.expsym conftest.er2 >/dev/null; then $2=yes fi else @@ -1732,7 +1851,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | msys* | mingw* | windows* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -1980,7 +2099,7 @@ lt_cv_dlopen_libs= ;; - cygwin* | msys*) + cygwin*) lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; @@ -2123,9 +2242,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.expsym $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + if test ! -s out/conftest.er2 || diff out/conftest.expsym out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -2570,7 +2689,7 @@ # libtool to hard-code these into programs ;; -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) version_type=windows shrext_cmds=.dll need_version=no @@ -2610,8 +2729,8 @@ shlibpath_overrides_runpath=yes case $host_os in - cygwin* | msys*) - # MSYS DLLs use 'msys-' prefix rather than 'lib' + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) @@ -2628,8 +2747,8 @@ dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl* | *,icl* | *,icx*) + # Native MSVC and Intel compilers libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2650,7 +2769,7 @@ # Convert to MSYS style. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; - cygwin* | msys*) + cygwin*) # Convert to unix form, then to dos form, then back to unix form # but this time dos style (no spaces!) so that the unix form looks # like /cygdrive/c/PROGRA~1:/cygdr... @@ -2889,6 +3008,18 @@ hardcode_into_libs=yes ;; +*-mlibc) + version_type=linux # correct to gnu/linux during the next big refactor + 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='mlibc ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + # No shared lib support for Linux oldld, aout, or coff. linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no @@ -2916,7 +3047,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2976,6 +3107,8 @@ shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='NetBSD ld.elf_so' + enable_cxx_stdlib=yes + stdlibflag= ;; netbsd*) @@ -2994,18 +3127,8 @@ shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - ;; - -*-mlibc) - version_type=linux # correct to gnu/linux during the next big refactor - 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='mlibc ld.so' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes + enable_cxx_stdlib=yes + stdlibflag= ;; newsos6) @@ -3050,9 +3173,14 @@ need_lib_prefix=no # OS/2 can only load a DLL with a base name of 8 characters or less. soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' + n=$($ECHO $libname | tr -d .-); + l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l)); + r=$($ECHO $release | tr -d .-); + l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l)); + v=$($ECHO $versuffix | tr -d .- | cut -b -$mv); + r=$($ECHO $r | cut -b -$(($mr - ${#v}))); + n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v}))); + $ECHO $n$r$v`$shared_ext' library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' shlibpath_var=BEGINLIBPATH @@ -3494,14 +3622,14 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) if test yes = "$GCC"; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -3586,7 +3714,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; -cygwin* | msys*) +cygwin*) # func_win32_libid is a shell function defined in ltmain.sh lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' @@ -3669,12 +3797,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +*-mlibc) lt_cv_deplibs_check_method=pass_all ;; -*-mlibc) +# This must be glibc/ELF. +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3907,7 +4035,7 @@ [lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) # two different shell functions defined in ltmain.sh; # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in @@ -3977,7 +4105,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -4052,7 +4180,7 @@ aix*) symcode='[[BCDT]]' ;; -cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) @@ -4091,13 +4219,13 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_cdecl_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"\1\", (void *) 0},/p'" lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" + -e 's/^I .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"lib\1\", (void *) 0},/p'" else # Disable hooks by default. lt_cv_sys_global_symbol_to_import= @@ -4111,22 +4239,22 @@ # so use this general approach. lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" +" -e 's/^T .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" +" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" +" -e 's/^$symcode$symcode* .* \(lib[[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \([[a-zA-Z_]][[a-zA-Z0-9_]]*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -4147,8 +4275,10 @@ # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++ or ICC, - # which start with @ or ?. + # which start with @ or ?. And Cygwin gawk-4.1.4-3 and newer + # treats input as binary, have to drop carriage return first. lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {sub(/\\r\$/,\"\")};"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ @@ -4359,7 +4489,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | windows* | cygwin* | msys* | os2* | pw32* | cegcc*) + mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4424,7 +4554,7 @@ # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym' fi ;; chorus*) @@ -4435,7 +4565,7 @@ ;; esac ;; - mingw* | windows* | cygwin* | msys* | os2* | pw32* | cegcc*) + mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], @@ -4497,7 +4627,9 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + *-mlibc) + ;; + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4510,7 +4642,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - icpc* ) + icpc* | icpx*) # Intel C++, used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4563,8 +4695,6 @@ ;; netbsd* | netbsdelf*-gnu) ;; - *-mlibc) - ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise # it will coredump. @@ -4687,7 +4817,7 @@ # PIC is the default for these OSes. ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4773,7 +4903,7 @@ # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.expsym' fi ;; @@ -4791,7 +4921,7 @@ esac ;; - mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], @@ -4825,7 +4955,13 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + *-mlibc) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*) case $cc_basename in # old Intel for x86_64, which still supported -KPIC. ecc*) @@ -4841,7 +4977,7 @@ ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) + icc* | ifort* | icx* | ifx*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4864,6 +5000,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + slimcc*) + # Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4921,12 +5063,6 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - *-mlibc) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *nto* | *qnx*) # QNX uses GNU C++, but need to define -shared option too, otherwise # it will coredump. @@ -5081,9 +5217,10 @@ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; - cygwin* | msys* | mingw* | windows* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) case $cc_basename in - cl* | icl*) + cl* | icl* | icx* | icpx*) + # Native MSVC and Intel compilers _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5139,7 +5276,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. @@ -5251,7 +5388,7 @@ fi ;; - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -5289,17 +5426,17 @@ _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -5308,7 +5445,6 @@ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -5328,7 +5464,12 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + *-mlibc) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + + gnu* | linux* | tpf* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test linux-dietlibc = "$host_os"; then case $cc_basename in @@ -5353,7 +5494,7 @@ tmp_addflag=' -i_dynamic' ;; efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler + ifc* | ifort* | ifx*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= @@ -5408,11 +5549,6 @@ fi ;; - *-mlibc) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -5715,14 +5851,14 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl* | icl* | icx* | icpx*) + # Native MSVC and Intel compilers _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5732,14 +5868,20 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. + # A check exists to verify if there are linker flags, which will use + # different commands when linking. _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym"; else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym; fi~ - $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + if test -z "$linker_flags"; then + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + else + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + fi~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' @@ -5771,7 +5913,7 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. @@ -5945,6 +6087,9 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + *-mlibc) + ;; + linux*) case $cc_basename in tcc*) @@ -5956,9 +6101,6 @@ esac ;; - *-mlibc) - ;; - netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -6005,17 +6147,17 @@ _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -6024,7 +6166,6 @@ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -6050,8 +6191,8 @@ else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done; printf "%s\\n" "-hidden">> $lib.expsym~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.expsym $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.expsym' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6068,21 +6209,21 @@ if test yes = "$GCC"; then wlarc='$wl' _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $LD -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.expsym' ;; *) wlarc='$wl' _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -G$allow_undefined_flag -M $lib.expsym -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.expsym' ;; esac fi @@ -6556,8 +6697,8 @@ # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test yes = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' @@ -6582,13 +6723,13 @@ # linker, instead of GNU ld. If possible, this setting should # overridden to take advantage of the native linker features on # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' fi # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' else GXX=no @@ -6797,10 +6938,10 @@ esac ;; - cygwin* | msys* | mingw* | windows* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl* | ,icl* | no,icl*) - # Native MSVC or ICC + ,cl* | no,cl* | ,icl* | no,icl* | ,icx* | no,icx* | ,icpx* | no,icpx*) + # Native MSVC and Intel compilers # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6812,14 +6953,20 @@ # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + # A check exists to verify if there are linker flags, which will use + # different commands when linking. + _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.expsym"; else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.expsym; fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + if test -z "$linker_flags"; then + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + else + $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.expsym" -Wl,$linker_flags-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"; + fi~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' @@ -6853,7 +7000,7 @@ _LT_TAGVAR(file_list_spec, $1)='@' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file, use it as # is; otherwise, prepend EXPORTS... _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then @@ -6862,7 +7009,7 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + $CC -shared $stdlibflag $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6878,17 +7025,17 @@ _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -6897,7 +7044,6 @@ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -6969,7 +7115,7 @@ ;; *) if test yes = "$GXX"; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $stdlibflag $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -7037,13 +7183,13 @@ if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -7084,9 +7230,9 @@ *) if test yes = "$GXX"; then if test no = "$with_gnu_ld"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -7097,7 +7243,11 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + *-mlibc) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -7124,7 +7274,7 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - icpc* | ecpc* ) + icpc* | ecpc* | icpx*) # Intel C++ with_gnu_ld=yes # version 8.0 and above of icpc choke on multiply defined symbols @@ -7262,10 +7412,6 @@ esac ;; - *-mlibc) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' @@ -7273,9 +7419,11 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + else + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + output_verbose_link_cmd=func_echo_all ;; *nto* | *qnx*) @@ -7335,10 +7483,10 @@ *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ - $RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.expsym; done~ + echo "-hidden">> $lib.expsym~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.expsym `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.expsym' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -7360,10 +7508,10 @@ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac @@ -7373,7 +7521,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' else # FIXME: insert proper C++ library support @@ -7417,8 +7565,8 @@ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -G$allow_undefined_flag $wl-M $wl$lib.expsym -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -7453,25 +7601,25 @@ if test yes,no = "$GXX,$with_gnu_ld"; then _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -shared $pic_flag $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.expsym~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.expsym~echo "local: *; };" >> $lib.expsym~ + $CC -G $stdlibflag $wl-M $wl$lib.expsym $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.expsym' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " [[-]]L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' @@ -7556,6 +7704,14 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; + emscripten*) + # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot + # and do not link system libraries (they are imported from the main module + # at runtime). Re-run the verbose link with -sSIDE_MODULE=2 so that the + # detected paths point to the PIC sysroot instead of the non-PIC one. + output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"' + ;; + *) # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -7705,6 +7861,10 @@ # the conftest object file. pre_test_object_deps_done=no + if test yes = "$enable_cxx_stdlib"; then + output_verbose_link_cmd= + fi + for p in `eval "$output_verbose_link_cmd"`; do case $prev$p in @@ -8171,6 +8331,76 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_ML64_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the ML64 assembler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_ML64_CONFIG], +[AC_REQUIRE([LT_PROG_ML64])dnl +AC_LANG_SAVE + +# Source file extension for ML64 test sources. +ac_ext=asm + +#Object file extension for compile ML64 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="main PROC ret main ENDP" + +# Code to be used in simple link tests +lt_simple_link_test_code="main PROC ret main ENDP" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# TODO? Check for compilation issues with ML64 flags. + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${ML64-"gcc"} +CFLAGS=$ML64FLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_ML64_CONFIG + + # _LT_LANG_GO_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for the GNU Go compiler @@ -8242,6 +8472,154 @@ ])# _LT_LANG_GO_CONFIG +# _LT_LANG_OBJC_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Objective-C compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_OBJC_CONFIG], +[AC_REQUIRE([LT_PROG_OBJC])dnl +AC_LANG_SAVE + +# Source file extension for OBJC test sources. +ac_ext=m + +# Object file extension for compiled OBJC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(void){return(0);}' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Check for compilation issues with OBJC flags +_LT_OBJECTIVE_C +if test "yes" = "$lt_cv_gnustep_exists"; then + OBJCFLAGS="$OBJCFLAGS `gnustep-config --objc-flags`" +fi + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${OBJC-"gcc"} +CFLAGS=$OBJCFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_OBJC_CONFIG + + +# _LT_LANG_OBJCXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Objective-C++ compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_OBJCXX_CONFIG], +[AC_REQUIRE([LT_PROG_OBJCXX])dnl +AC_LANG_SAVE + +# Source file extension for OBJCXX test sources. +ac_ext=mm + +# Object file extension for compiled OBJCXX test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Check for compilation issues with OBJCXX flags +_LT_OBJECTIVE_CXX +if test "yes" = "$lt_cv_gnustep_exists"; then + OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`" +fi + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${OBJCXX-"g++"} +CFLAGS=$OBJCXXFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_OBJCXX_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8294,6 +8672,34 @@ CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_RC_CONFIG +# LT_PROG_ML64 +# ----------- +AC_DEFUN([LT_PROG_ML64], +[AC_CHECK_TOOL(ML64, ml64,) +]) + + +# LT_PROG_OBJC +# ----------- +AC_DEFUN([LT_PROG_OBJC], +[AC_CHECK_TOOL(OBJC, gcc,) + AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,) + if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then + test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`" + fi + AC_SUBST(OBJCFLAGS)[]dnl +]) + +# LT_PROG_OBJCXX +# ----------- +AC_DEFUN([LT_PROG_OBJCXX], +[AC_CHECK_TOOL(OBJCXX, g++,) + AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,) + if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then + test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`" + fi + AC_SUBST(OBJCXXFLAGS)[]dnl +]) # LT_PROG_GCJ # ----------- @@ -8436,7 +8842,7 @@ *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 ;; * ) # otherwise, assume *nix @@ -8444,12 +8850,12 @@ ;; esac ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) case $build in *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ;; - *-*-cygwin* | *-*-msys* ) + *-*-cygwin* ) lt_cv_to_host_file_cmd=func_convert_file_noop ;; * ) # otherwise, assume *nix @@ -8485,4 +8891,40 @@ AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], [0], [convert $build files to toolchain format])dnl + +AS_CASE([$host], + [*-*-mingw* | *-*-windows* | *-*-cygwin*], + [AS_CASE([$build], + [*-*-mingw* | *-*-windows* | *-*-cygwin*], + [AC_MSG_CHECKING([whether cygpath is installed]) + AC_CACHE_VAL([lt_cv_cygpath_installed], + [lt_cv_cygpath_installed=ignoring + cygpath --help &> /dev/null + _lt_result=$? + AS_IF([test 0 = "$_lt_result"], + [lt_cv_cygpath_installed=yes], + [lt_cv_cygpath_installed=no]) + ]) + AC_MSG_RESULT([$lt_cv_cygpath_installed]) + _LT_DECL([cygpath_installed], [lt_cv_cygpath_installed], + [0], [whether cygpath is installed])dnl + AS_IF([test "xyes" != "x$lt_cv_cygpath_installed"], + [ + AC_MSG_CHECKING([whether to use cmd with one slash or two slashes]) + AC_CACHE_VAL([lt_cv_cmd_slashes], + [ + _lt_result=`cmd /c echo one-slash works. Not checked //c echo two-slashes 2>/dev/null` + AS_IF([test 0 != $?], + [AC_MSG_ERROR([Do not know how to convert paths])]) + AS_CASE([$_lt_result], + [one-slash*],[lt_cv_cmd_slashes="one"], + [two-slashes*],[lt_cv_cmd_slashes="two"], + [AC_MSG_ERROR([Do not know how to convert paths])] + ) + ]) + AC_MSG_RESULT([$lt_cv_cmd_slashes]) + ]) + ]) + ] +)dnl ])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/mingw-w64-libraries/winpthreads/m4/ltoptions.m4 b/mingw-w64-libraries/winpthreads/m4/ltoptions.m4 index e70908d..994d448 100644 --- a/mingw-w64-libraries/winpthreads/m4/ltoptions.m4 +++ b/mingw-w64-libraries/winpthreads/m4/ltoptions.m4
@@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2024 Free +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2026 Free # Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8,7 +8,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 10 ltoptions.m4 +# serial 12 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -80,6 +80,7 @@ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [cxx-stdlib no-cxx-stdlib], [_LT_ENABLE_CXX_STDLIB]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], [_LT_ENABLE_FAST_INSTALL]) _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], @@ -128,7 +129,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -370,8 +371,16 @@ fi fi ;; -*) +power*-*-aix[[5-9]]*,'') + AC_MSG_WARN([for $host, specify if building shared libraries for versioning (svr4|both)]) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) with_aix_soname=aix + AC_MSG_RESULT([(default) $with_aix_soname]) + ;; +*) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + with_aix_soname=aix + AC_MSG_RESULT([(default) $with_aix_soname]) ;; esac @@ -448,6 +457,49 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +# _LT_ENABLE_CXX_STDLIB([MODE]) +# -------------------- +# implement the --enable-cxx-stdlib flag, and support the 'cxx-stdlib' and 'no-cxx-stdlib' +# LT_INIT options. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'no'. +m4_define([_LT_ENABLE_CXX_STDLIB], +[m4_define([_LT_ENABLE_CXX_STDLIB_DEFAULT], [m4_if($1, yes, yes, no)])dnl +stdlibflag=-nostdlib +AC_ARG_ENABLE([cxx-stdlib], + [AS_HELP_STRING([--enable-cxx-stdlib@<:@=PKGS@:>@], + [let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules @<:@default=]_LT_ENABLE_CXX_STDLIB_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_cxx_stdlib=yes ;; + no) enable_cxx_stdlib=no ;; + *) + enable_cxx_stdlib=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_cxx_stdlib=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_cxx_stdlib=]_LT_ENABLE_CXX_STDLIB_DEFAULT) + +if test yes = "$enable_cxx_stdlib"; then + stdlibflag= +fi + +_LT_DECL([], [enable_cxx_stdlib], [0], [Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules])dnl +_LT_DECL([], [stdlibflag], [0], [Flag used for specifying not to link standard libraries])dnl +])# _LT_ENABLE_CXX_STDLIB + +LT_OPTION_DEFINE([LT_INIT], [cxx-stdlib], [_LT_ENABLE_CXX_STDLIB([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-cxx-stdlib], [_LT_ENABLE_CXX_STDLIB([no])]) + + ## ----------------- ## ## LTDL_INIT Options ## ## ----------------- ##
diff --git a/mingw-w64-libraries/winpthreads/m4/ltsugar.m4 b/mingw-w64-libraries/winpthreads/m4/ltsugar.m4 index 902508b..a15a507 100644 --- a/mingw-w64-libraries/winpthreads/m4/ltsugar.m4 +++ b/mingw-w64-libraries/winpthreads/m4/ltsugar.m4
@@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2026 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 #
diff --git a/mingw-w64-libraries/winpthreads/m4/ltversion.m4 b/mingw-w64-libraries/winpthreads/m4/ltversion.m4 index 228df3f..656867a 100644 --- a/mingw-w64-libraries/winpthreads/m4/ltversion.m4 +++ b/mingw-w64-libraries/winpthreads/m4/ltversion.m4
@@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation, +# Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation, # Inc. # Written by Scott James Remnant, 2004 # @@ -10,15 +10,15 @@ # @configure_input@ -# serial 4441 ltversion.m4 +# serial 4547 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.5.4]) -m4_define([LT_PACKAGE_REVISION], [2.5.4]) +m4_define([LT_PACKAGE_VERSION], [2.6.2]) +m4_define([LT_PACKAGE_REVISION], [2.6.2]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.5.4' -macro_revision='2.5.4' +[macro_version='2.6.2' +macro_revision='2.6.2' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ])
diff --git a/mingw-w64-libraries/winpthreads/m4/lt~obsolete.m4 b/mingw-w64-libraries/winpthreads/m4/lt~obsolete.m4 index 0f7a875..cadcdbe 100644 --- a/mingw-w64-libraries/winpthreads/m4/lt~obsolete.m4 +++ b/mingw-w64-libraries/winpthreads/m4/lt~obsolete.m4
@@ -1,6 +1,6 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2026 Free # Software Foundation, Inc. # Written by Scott James Remnant, 2004. #
diff --git a/mingw-w64-libraries/winpthreads/tests/Makefile.in b/mingw-w64-libraries/winpthreads/tests/Makefile.in index c3f8994..d4afddc 100644 --- a/mingw-w64-libraries/winpthreads/tests/Makefile.in +++ b/mingw-w64-libraries/winpthreads/tests/Makefile.in
@@ -145,22 +145,42 @@ pthread_misc/reuse2$(EXEEXT) pthread_misc/self1$(EXEEXT) \ pthread_misc/self2$(EXEEXT) pthread_misc/stress1$(EXEEXT) \ pthread_misc/valid1$(EXEEXT) pthread_misc/valid2$(EXEEXT) \ - pthread_mutex/mutex1$(EXEEXT) pthread_mutex/mutex1e$(EXEEXT) \ - pthread_mutex/mutex1n$(EXEEXT) pthread_mutex/mutex1r$(EXEEXT) \ - pthread_mutex/mutex2$(EXEEXT) pthread_mutex/mutex2e$(EXEEXT) \ - pthread_mutex/mutex2r$(EXEEXT) pthread_mutex/mutex3$(EXEEXT) \ - pthread_mutex/mutex3e$(EXEEXT) pthread_mutex/mutex3r$(EXEEXT) \ - pthread_mutex/mutex4$(EXEEXT) pthread_mutex/mutex5$(EXEEXT) \ - pthread_mutex/mutex6$(EXEEXT) pthread_mutex/mutex6e$(EXEEXT) \ - pthread_mutex/mutex6es$(EXEEXT) pthread_mutex/mutex6n$(EXEEXT) \ - pthread_mutex/mutex6r$(EXEEXT) pthread_mutex/mutex6rs$(EXEEXT) \ - pthread_mutex/mutex6s$(EXEEXT) pthread_mutex/mutex7$(EXEEXT) \ - pthread_mutex/mutex7e$(EXEEXT) pthread_mutex/mutex7n$(EXEEXT) \ - pthread_mutex/mutex7r$(EXEEXT) pthread_mutex/mutex8$(EXEEXT) \ - pthread_mutex/mutex8e$(EXEEXT) pthread_mutex/mutex8n$(EXEEXT) \ - pthread_mutex/mutex8r$(EXEEXT) pthread_once/once1$(EXEEXT) \ - pthread_once/once2$(EXEEXT) pthread_once/once3$(EXEEXT) \ - pthread_once/once4$(EXEEXT) pthread_rwlock/rwlock1$(EXEEXT) \ + pthread_mutex/default-basic$(EXEEXT) \ + pthread_mutex/default-lock-recursive$(EXEEXT) \ + pthread_mutex/default-static$(EXEEXT) \ + pthread_mutex/default-static-lock-recursive$(EXEEXT) \ + pthread_mutex/default-timedlock$(EXEEXT) \ + pthread_mutex/default-trylock$(EXEEXT) \ + pthread_mutex/default-trylock-recursive$(EXEEXT) \ + pthread_mutex/default-unlock$(EXEEXT) \ + pthread_mutex/errorcheck-basic$(EXEEXT) \ + pthread_mutex/errorcheck-lock-recursive$(EXEEXT) \ + pthread_mutex/errorcheck-static$(EXEEXT) \ + pthread_mutex/errorcheck-static-lock-recursive$(EXEEXT) \ + pthread_mutex/errorcheck-timedlock$(EXEEXT) \ + pthread_mutex/errorcheck-trylock$(EXEEXT) \ + pthread_mutex/errorcheck-trylock-recursive$(EXEEXT) \ + pthread_mutex/errorcheck-unlock$(EXEEXT) \ + pthread_mutex/mutex-types$(EXEEXT) \ + pthread_mutex/normal-basic$(EXEEXT) \ + pthread_mutex/normal-lock-recursive$(EXEEXT) \ + pthread_mutex/normal-static$(EXEEXT) \ + pthread_mutex/normal-static-lock-recursive$(EXEEXT) \ + pthread_mutex/normal-timedlock$(EXEEXT) \ + pthread_mutex/normal-trylock$(EXEEXT) \ + pthread_mutex/normal-trylock-recursive$(EXEEXT) \ + pthread_mutex/normal-unlock$(EXEEXT) \ + pthread_mutex/recursive-basic$(EXEEXT) \ + pthread_mutex/recursive-lock-recursive$(EXEEXT) \ + pthread_mutex/recursive-static$(EXEEXT) \ + pthread_mutex/recursive-static-lock-recursive$(EXEEXT) \ + pthread_mutex/recursive-timedlock$(EXEEXT) \ + pthread_mutex/recursive-trylock$(EXEEXT) \ + pthread_mutex/recursive-trylock-recursive$(EXEEXT) \ + pthread_mutex/recursive-unlock$(EXEEXT) \ + pthread_once/once1$(EXEEXT) pthread_once/once2$(EXEEXT) \ + pthread_once/once3$(EXEEXT) pthread_once/once4$(EXEEXT) \ + pthread_rwlock/rwlock1$(EXEEXT) \ pthread_rwlock/rwlock2$(EXEEXT) \ pthread_rwlock/rwlock2_t$(EXEEXT) \ pthread_rwlock/rwlock3$(EXEEXT) \ @@ -546,116 +566,229 @@ pthread_misc_valid2_OBJECTS = pthread_misc/valid2.$(OBJEXT) pthread_misc_valid2_LDADD = $(LDADD) pthread_misc_valid2_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex1_SOURCES = pthread_mutex/mutex1.c -pthread_mutex_mutex1_OBJECTS = pthread_mutex/mutex1.$(OBJEXT) -pthread_mutex_mutex1_LDADD = $(LDADD) -pthread_mutex_mutex1_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex1e_SOURCES = pthread_mutex/mutex1e.c -pthread_mutex_mutex1e_OBJECTS = pthread_mutex/mutex1e.$(OBJEXT) -pthread_mutex_mutex1e_LDADD = $(LDADD) -pthread_mutex_mutex1e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex1n_SOURCES = pthread_mutex/mutex1n.c -pthread_mutex_mutex1n_OBJECTS = pthread_mutex/mutex1n.$(OBJEXT) -pthread_mutex_mutex1n_LDADD = $(LDADD) -pthread_mutex_mutex1n_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex1r_SOURCES = pthread_mutex/mutex1r.c -pthread_mutex_mutex1r_OBJECTS = pthread_mutex/mutex1r.$(OBJEXT) -pthread_mutex_mutex1r_LDADD = $(LDADD) -pthread_mutex_mutex1r_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex2_SOURCES = pthread_mutex/mutex2.c -pthread_mutex_mutex2_OBJECTS = pthread_mutex/mutex2.$(OBJEXT) -pthread_mutex_mutex2_LDADD = $(LDADD) -pthread_mutex_mutex2_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex2e_SOURCES = pthread_mutex/mutex2e.c -pthread_mutex_mutex2e_OBJECTS = pthread_mutex/mutex2e.$(OBJEXT) -pthread_mutex_mutex2e_LDADD = $(LDADD) -pthread_mutex_mutex2e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex2r_SOURCES = pthread_mutex/mutex2r.c -pthread_mutex_mutex2r_OBJECTS = pthread_mutex/mutex2r.$(OBJEXT) -pthread_mutex_mutex2r_LDADD = $(LDADD) -pthread_mutex_mutex2r_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex3_SOURCES = pthread_mutex/mutex3.c -pthread_mutex_mutex3_OBJECTS = pthread_mutex/mutex3.$(OBJEXT) -pthread_mutex_mutex3_LDADD = $(LDADD) -pthread_mutex_mutex3_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex3e_SOURCES = pthread_mutex/mutex3e.c -pthread_mutex_mutex3e_OBJECTS = pthread_mutex/mutex3e.$(OBJEXT) -pthread_mutex_mutex3e_LDADD = $(LDADD) -pthread_mutex_mutex3e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex3r_SOURCES = pthread_mutex/mutex3r.c -pthread_mutex_mutex3r_OBJECTS = pthread_mutex/mutex3r.$(OBJEXT) -pthread_mutex_mutex3r_LDADD = $(LDADD) -pthread_mutex_mutex3r_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex4_SOURCES = pthread_mutex/mutex4.c -pthread_mutex_mutex4_OBJECTS = pthread_mutex/mutex4.$(OBJEXT) -pthread_mutex_mutex4_LDADD = $(LDADD) -pthread_mutex_mutex4_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex5_SOURCES = pthread_mutex/mutex5.c -pthread_mutex_mutex5_OBJECTS = pthread_mutex/mutex5.$(OBJEXT) -pthread_mutex_mutex5_LDADD = $(LDADD) -pthread_mutex_mutex5_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6_SOURCES = pthread_mutex/mutex6.c -pthread_mutex_mutex6_OBJECTS = pthread_mutex/mutex6.$(OBJEXT) -pthread_mutex_mutex6_LDADD = $(LDADD) -pthread_mutex_mutex6_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6e_SOURCES = pthread_mutex/mutex6e.c -pthread_mutex_mutex6e_OBJECTS = pthread_mutex/mutex6e.$(OBJEXT) -pthread_mutex_mutex6e_LDADD = $(LDADD) -pthread_mutex_mutex6e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6es_SOURCES = pthread_mutex/mutex6es.c -pthread_mutex_mutex6es_OBJECTS = pthread_mutex/mutex6es.$(OBJEXT) -pthread_mutex_mutex6es_LDADD = $(LDADD) -pthread_mutex_mutex6es_DEPENDENCIES = \ +pthread_mutex_default_basic_SOURCES = pthread_mutex/default-basic.c +pthread_mutex_default_basic_OBJECTS = \ + pthread_mutex/default-basic.$(OBJEXT) +pthread_mutex_default_basic_LDADD = $(LDADD) +pthread_mutex_default_basic_DEPENDENCIES = \ $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6n_SOURCES = pthread_mutex/mutex6n.c -pthread_mutex_mutex6n_OBJECTS = pthread_mutex/mutex6n.$(OBJEXT) -pthread_mutex_mutex6n_LDADD = $(LDADD) -pthread_mutex_mutex6n_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6r_SOURCES = pthread_mutex/mutex6r.c -pthread_mutex_mutex6r_OBJECTS = pthread_mutex/mutex6r.$(OBJEXT) -pthread_mutex_mutex6r_LDADD = $(LDADD) -pthread_mutex_mutex6r_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6rs_SOURCES = pthread_mutex/mutex6rs.c -pthread_mutex_mutex6rs_OBJECTS = pthread_mutex/mutex6rs.$(OBJEXT) -pthread_mutex_mutex6rs_LDADD = $(LDADD) -pthread_mutex_mutex6rs_DEPENDENCIES = \ +pthread_mutex_default_lock_recursive_SOURCES = \ + pthread_mutex/default-lock-recursive.c +pthread_mutex_default_lock_recursive_OBJECTS = \ + pthread_mutex/default-lock-recursive.$(OBJEXT) +pthread_mutex_default_lock_recursive_LDADD = $(LDADD) +pthread_mutex_default_lock_recursive_DEPENDENCIES = \ $(top_builddir)/libwinpthread.la -pthread_mutex_mutex6s_SOURCES = pthread_mutex/mutex6s.c -pthread_mutex_mutex6s_OBJECTS = pthread_mutex/mutex6s.$(OBJEXT) -pthread_mutex_mutex6s_LDADD = $(LDADD) -pthread_mutex_mutex6s_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex7_SOURCES = pthread_mutex/mutex7.c -pthread_mutex_mutex7_OBJECTS = pthread_mutex/mutex7.$(OBJEXT) -pthread_mutex_mutex7_LDADD = $(LDADD) -pthread_mutex_mutex7_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex7e_SOURCES = pthread_mutex/mutex7e.c -pthread_mutex_mutex7e_OBJECTS = pthread_mutex/mutex7e.$(OBJEXT) -pthread_mutex_mutex7e_LDADD = $(LDADD) -pthread_mutex_mutex7e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex7n_SOURCES = pthread_mutex/mutex7n.c -pthread_mutex_mutex7n_OBJECTS = pthread_mutex/mutex7n.$(OBJEXT) -pthread_mutex_mutex7n_LDADD = $(LDADD) -pthread_mutex_mutex7n_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex7r_SOURCES = pthread_mutex/mutex7r.c -pthread_mutex_mutex7r_OBJECTS = pthread_mutex/mutex7r.$(OBJEXT) -pthread_mutex_mutex7r_LDADD = $(LDADD) -pthread_mutex_mutex7r_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex8_SOURCES = pthread_mutex/mutex8.c -pthread_mutex_mutex8_OBJECTS = pthread_mutex/mutex8.$(OBJEXT) -pthread_mutex_mutex8_LDADD = $(LDADD) -pthread_mutex_mutex8_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex8e_SOURCES = pthread_mutex/mutex8e.c -pthread_mutex_mutex8e_OBJECTS = pthread_mutex/mutex8e.$(OBJEXT) -pthread_mutex_mutex8e_LDADD = $(LDADD) -pthread_mutex_mutex8e_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex8n_SOURCES = pthread_mutex/mutex8n.c -pthread_mutex_mutex8n_OBJECTS = pthread_mutex/mutex8n.$(OBJEXT) -pthread_mutex_mutex8n_LDADD = $(LDADD) -pthread_mutex_mutex8n_DEPENDENCIES = $(top_builddir)/libwinpthread.la -pthread_mutex_mutex8r_SOURCES = pthread_mutex/mutex8r.c -pthread_mutex_mutex8r_OBJECTS = pthread_mutex/mutex8r.$(OBJEXT) -pthread_mutex_mutex8r_LDADD = $(LDADD) -pthread_mutex_mutex8r_DEPENDENCIES = $(top_builddir)/libwinpthread.la +pthread_mutex_default_static_SOURCES = pthread_mutex/default-static.c +pthread_mutex_default_static_OBJECTS = \ + pthread_mutex/default-static.$(OBJEXT) +pthread_mutex_default_static_LDADD = $(LDADD) +pthread_mutex_default_static_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_default_static_lock_recursive_SOURCES = \ + pthread_mutex/default-static-lock-recursive.c +pthread_mutex_default_static_lock_recursive_OBJECTS = \ + pthread_mutex/default-static-lock-recursive.$(OBJEXT) +pthread_mutex_default_static_lock_recursive_LDADD = $(LDADD) +pthread_mutex_default_static_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_default_timedlock_SOURCES = \ + pthread_mutex/default-timedlock.c +pthread_mutex_default_timedlock_OBJECTS = \ + pthread_mutex/default-timedlock.$(OBJEXT) +pthread_mutex_default_timedlock_LDADD = $(LDADD) +pthread_mutex_default_timedlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_default_trylock_SOURCES = \ + pthread_mutex/default-trylock.c +pthread_mutex_default_trylock_OBJECTS = \ + pthread_mutex/default-trylock.$(OBJEXT) +pthread_mutex_default_trylock_LDADD = $(LDADD) +pthread_mutex_default_trylock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_default_trylock_recursive_SOURCES = \ + pthread_mutex/default-trylock-recursive.c +pthread_mutex_default_trylock_recursive_OBJECTS = \ + pthread_mutex/default-trylock-recursive.$(OBJEXT) +pthread_mutex_default_trylock_recursive_LDADD = $(LDADD) +pthread_mutex_default_trylock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_default_unlock_SOURCES = pthread_mutex/default-unlock.c +pthread_mutex_default_unlock_OBJECTS = \ + pthread_mutex/default-unlock.$(OBJEXT) +pthread_mutex_default_unlock_LDADD = $(LDADD) +pthread_mutex_default_unlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_basic_SOURCES = \ + pthread_mutex/errorcheck-basic.c +pthread_mutex_errorcheck_basic_OBJECTS = \ + pthread_mutex/errorcheck-basic.$(OBJEXT) +pthread_mutex_errorcheck_basic_LDADD = $(LDADD) +pthread_mutex_errorcheck_basic_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_lock_recursive_SOURCES = \ + pthread_mutex/errorcheck-lock-recursive.c +pthread_mutex_errorcheck_lock_recursive_OBJECTS = \ + pthread_mutex/errorcheck-lock-recursive.$(OBJEXT) +pthread_mutex_errorcheck_lock_recursive_LDADD = $(LDADD) +pthread_mutex_errorcheck_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_static_SOURCES = \ + pthread_mutex/errorcheck-static.c +pthread_mutex_errorcheck_static_OBJECTS = \ + pthread_mutex/errorcheck-static.$(OBJEXT) +pthread_mutex_errorcheck_static_LDADD = $(LDADD) +pthread_mutex_errorcheck_static_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_static_lock_recursive_SOURCES = \ + pthread_mutex/errorcheck-static-lock-recursive.c +pthread_mutex_errorcheck_static_lock_recursive_OBJECTS = \ + pthread_mutex/errorcheck-static-lock-recursive.$(OBJEXT) +pthread_mutex_errorcheck_static_lock_recursive_LDADD = $(LDADD) +pthread_mutex_errorcheck_static_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_timedlock_SOURCES = \ + pthread_mutex/errorcheck-timedlock.c +pthread_mutex_errorcheck_timedlock_OBJECTS = \ + pthread_mutex/errorcheck-timedlock.$(OBJEXT) +pthread_mutex_errorcheck_timedlock_LDADD = $(LDADD) +pthread_mutex_errorcheck_timedlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_trylock_SOURCES = \ + pthread_mutex/errorcheck-trylock.c +pthread_mutex_errorcheck_trylock_OBJECTS = \ + pthread_mutex/errorcheck-trylock.$(OBJEXT) +pthread_mutex_errorcheck_trylock_LDADD = $(LDADD) +pthread_mutex_errorcheck_trylock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_trylock_recursive_SOURCES = \ + pthread_mutex/errorcheck-trylock-recursive.c +pthread_mutex_errorcheck_trylock_recursive_OBJECTS = \ + pthread_mutex/errorcheck-trylock-recursive.$(OBJEXT) +pthread_mutex_errorcheck_trylock_recursive_LDADD = $(LDADD) +pthread_mutex_errorcheck_trylock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_errorcheck_unlock_SOURCES = \ + pthread_mutex/errorcheck-unlock.c +pthread_mutex_errorcheck_unlock_OBJECTS = \ + pthread_mutex/errorcheck-unlock.$(OBJEXT) +pthread_mutex_errorcheck_unlock_LDADD = $(LDADD) +pthread_mutex_errorcheck_unlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_mutex_types_SOURCES = pthread_mutex/mutex-types.c +pthread_mutex_mutex_types_OBJECTS = \ + pthread_mutex/mutex-types.$(OBJEXT) +pthread_mutex_mutex_types_LDADD = $(LDADD) +pthread_mutex_mutex_types_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_basic_SOURCES = pthread_mutex/normal-basic.c +pthread_mutex_normal_basic_OBJECTS = \ + pthread_mutex/normal-basic.$(OBJEXT) +pthread_mutex_normal_basic_LDADD = $(LDADD) +pthread_mutex_normal_basic_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_lock_recursive_SOURCES = \ + pthread_mutex/normal-lock-recursive.c +pthread_mutex_normal_lock_recursive_OBJECTS = \ + pthread_mutex/normal-lock-recursive.$(OBJEXT) +pthread_mutex_normal_lock_recursive_LDADD = $(LDADD) +pthread_mutex_normal_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_static_SOURCES = pthread_mutex/normal-static.c +pthread_mutex_normal_static_OBJECTS = \ + pthread_mutex/normal-static.$(OBJEXT) +pthread_mutex_normal_static_LDADD = $(LDADD) +pthread_mutex_normal_static_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_static_lock_recursive_SOURCES = \ + pthread_mutex/normal-static-lock-recursive.c +pthread_mutex_normal_static_lock_recursive_OBJECTS = \ + pthread_mutex/normal-static-lock-recursive.$(OBJEXT) +pthread_mutex_normal_static_lock_recursive_LDADD = $(LDADD) +pthread_mutex_normal_static_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_timedlock_SOURCES = \ + pthread_mutex/normal-timedlock.c +pthread_mutex_normal_timedlock_OBJECTS = \ + pthread_mutex/normal-timedlock.$(OBJEXT) +pthread_mutex_normal_timedlock_LDADD = $(LDADD) +pthread_mutex_normal_timedlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_trylock_SOURCES = pthread_mutex/normal-trylock.c +pthread_mutex_normal_trylock_OBJECTS = \ + pthread_mutex/normal-trylock.$(OBJEXT) +pthread_mutex_normal_trylock_LDADD = $(LDADD) +pthread_mutex_normal_trylock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_trylock_recursive_SOURCES = \ + pthread_mutex/normal-trylock-recursive.c +pthread_mutex_normal_trylock_recursive_OBJECTS = \ + pthread_mutex/normal-trylock-recursive.$(OBJEXT) +pthread_mutex_normal_trylock_recursive_LDADD = $(LDADD) +pthread_mutex_normal_trylock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_normal_unlock_SOURCES = pthread_mutex/normal-unlock.c +pthread_mutex_normal_unlock_OBJECTS = \ + pthread_mutex/normal-unlock.$(OBJEXT) +pthread_mutex_normal_unlock_LDADD = $(LDADD) +pthread_mutex_normal_unlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_basic_SOURCES = \ + pthread_mutex/recursive-basic.c +pthread_mutex_recursive_basic_OBJECTS = \ + pthread_mutex/recursive-basic.$(OBJEXT) +pthread_mutex_recursive_basic_LDADD = $(LDADD) +pthread_mutex_recursive_basic_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_lock_recursive_SOURCES = \ + pthread_mutex/recursive-lock-recursive.c +pthread_mutex_recursive_lock_recursive_OBJECTS = \ + pthread_mutex/recursive-lock-recursive.$(OBJEXT) +pthread_mutex_recursive_lock_recursive_LDADD = $(LDADD) +pthread_mutex_recursive_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_static_SOURCES = \ + pthread_mutex/recursive-static.c +pthread_mutex_recursive_static_OBJECTS = \ + pthread_mutex/recursive-static.$(OBJEXT) +pthread_mutex_recursive_static_LDADD = $(LDADD) +pthread_mutex_recursive_static_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_static_lock_recursive_SOURCES = \ + pthread_mutex/recursive-static-lock-recursive.c +pthread_mutex_recursive_static_lock_recursive_OBJECTS = \ + pthread_mutex/recursive-static-lock-recursive.$(OBJEXT) +pthread_mutex_recursive_static_lock_recursive_LDADD = $(LDADD) +pthread_mutex_recursive_static_lock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_timedlock_SOURCES = \ + pthread_mutex/recursive-timedlock.c +pthread_mutex_recursive_timedlock_OBJECTS = \ + pthread_mutex/recursive-timedlock.$(OBJEXT) +pthread_mutex_recursive_timedlock_LDADD = $(LDADD) +pthread_mutex_recursive_timedlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_trylock_SOURCES = \ + pthread_mutex/recursive-trylock.c +pthread_mutex_recursive_trylock_OBJECTS = \ + pthread_mutex/recursive-trylock.$(OBJEXT) +pthread_mutex_recursive_trylock_LDADD = $(LDADD) +pthread_mutex_recursive_trylock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_trylock_recursive_SOURCES = \ + pthread_mutex/recursive-trylock-recursive.c +pthread_mutex_recursive_trylock_recursive_OBJECTS = \ + pthread_mutex/recursive-trylock-recursive.$(OBJEXT) +pthread_mutex_recursive_trylock_recursive_LDADD = $(LDADD) +pthread_mutex_recursive_trylock_recursive_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la +pthread_mutex_recursive_unlock_SOURCES = \ + pthread_mutex/recursive-unlock.c +pthread_mutex_recursive_unlock_OBJECTS = \ + pthread_mutex/recursive-unlock.$(OBJEXT) +pthread_mutex_recursive_unlock_LDADD = $(LDADD) +pthread_mutex_recursive_unlock_DEPENDENCIES = \ + $(top_builddir)/libwinpthread.la pthread_once_once1_SOURCES = pthread_once/once1.c pthread_once_once1_OBJECTS = pthread_once/once1.$(OBJEXT) pthread_once_once1_LDADD = $(LDADD) @@ -902,33 +1035,39 @@ pthread_misc/$(DEPDIR)/stress1.Po \ pthread_misc/$(DEPDIR)/valid1.Po \ pthread_misc/$(DEPDIR)/valid2.Po \ - pthread_mutex/$(DEPDIR)/mutex1.Po \ - pthread_mutex/$(DEPDIR)/mutex1e.Po \ - pthread_mutex/$(DEPDIR)/mutex1n.Po \ - pthread_mutex/$(DEPDIR)/mutex1r.Po \ - pthread_mutex/$(DEPDIR)/mutex2.Po \ - pthread_mutex/$(DEPDIR)/mutex2e.Po \ - pthread_mutex/$(DEPDIR)/mutex2r.Po \ - pthread_mutex/$(DEPDIR)/mutex3.Po \ - pthread_mutex/$(DEPDIR)/mutex3e.Po \ - pthread_mutex/$(DEPDIR)/mutex3r.Po \ - pthread_mutex/$(DEPDIR)/mutex4.Po \ - pthread_mutex/$(DEPDIR)/mutex5.Po \ - pthread_mutex/$(DEPDIR)/mutex6.Po \ - pthread_mutex/$(DEPDIR)/mutex6e.Po \ - pthread_mutex/$(DEPDIR)/mutex6es.Po \ - pthread_mutex/$(DEPDIR)/mutex6n.Po \ - pthread_mutex/$(DEPDIR)/mutex6r.Po \ - pthread_mutex/$(DEPDIR)/mutex6rs.Po \ - pthread_mutex/$(DEPDIR)/mutex6s.Po \ - pthread_mutex/$(DEPDIR)/mutex7.Po \ - pthread_mutex/$(DEPDIR)/mutex7e.Po \ - pthread_mutex/$(DEPDIR)/mutex7n.Po \ - pthread_mutex/$(DEPDIR)/mutex7r.Po \ - pthread_mutex/$(DEPDIR)/mutex8.Po \ - pthread_mutex/$(DEPDIR)/mutex8e.Po \ - pthread_mutex/$(DEPDIR)/mutex8n.Po \ - pthread_mutex/$(DEPDIR)/mutex8r.Po \ + pthread_mutex/$(DEPDIR)/default-basic.Po \ + pthread_mutex/$(DEPDIR)/default-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/default-static-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/default-static.Po \ + pthread_mutex/$(DEPDIR)/default-timedlock.Po \ + pthread_mutex/$(DEPDIR)/default-trylock-recursive.Po \ + pthread_mutex/$(DEPDIR)/default-trylock.Po \ + pthread_mutex/$(DEPDIR)/default-unlock.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-basic.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-static-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-static.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-timedlock.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-trylock-recursive.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-trylock.Po \ + pthread_mutex/$(DEPDIR)/errorcheck-unlock.Po \ + pthread_mutex/$(DEPDIR)/mutex-types.Po \ + pthread_mutex/$(DEPDIR)/normal-basic.Po \ + pthread_mutex/$(DEPDIR)/normal-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/normal-static-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/normal-static.Po \ + pthread_mutex/$(DEPDIR)/normal-timedlock.Po \ + pthread_mutex/$(DEPDIR)/normal-trylock-recursive.Po \ + pthread_mutex/$(DEPDIR)/normal-trylock.Po \ + pthread_mutex/$(DEPDIR)/normal-unlock.Po \ + pthread_mutex/$(DEPDIR)/recursive-basic.Po \ + pthread_mutex/$(DEPDIR)/recursive-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/recursive-static-lock-recursive.Po \ + pthread_mutex/$(DEPDIR)/recursive-static.Po \ + pthread_mutex/$(DEPDIR)/recursive-timedlock.Po \ + pthread_mutex/$(DEPDIR)/recursive-trylock-recursive.Po \ + pthread_mutex/$(DEPDIR)/recursive-trylock.Po \ + pthread_mutex/$(DEPDIR)/recursive-unlock.Po \ pthread_once/$(DEPDIR)/once1.Po \ pthread_once/$(DEPDIR)/once2.Po \ pthread_once/$(DEPDIR)/once3.Po \ @@ -1016,20 +1155,37 @@ pthread_misc/reuse2.c pthread_misc/self1.c \ pthread_misc/self2.c pthread_misc/stress1.c \ pthread_misc/valid1.c pthread_misc/valid2.c \ - pthread_mutex/mutex1.c pthread_mutex/mutex1e.c \ - pthread_mutex/mutex1n.c pthread_mutex/mutex1r.c \ - pthread_mutex/mutex2.c pthread_mutex/mutex2e.c \ - pthread_mutex/mutex2r.c pthread_mutex/mutex3.c \ - pthread_mutex/mutex3e.c pthread_mutex/mutex3r.c \ - pthread_mutex/mutex4.c pthread_mutex/mutex5.c \ - pthread_mutex/mutex6.c pthread_mutex/mutex6e.c \ - pthread_mutex/mutex6es.c pthread_mutex/mutex6n.c \ - pthread_mutex/mutex6r.c pthread_mutex/mutex6rs.c \ - pthread_mutex/mutex6s.c pthread_mutex/mutex7.c \ - pthread_mutex/mutex7e.c pthread_mutex/mutex7n.c \ - pthread_mutex/mutex7r.c pthread_mutex/mutex8.c \ - pthread_mutex/mutex8e.c pthread_mutex/mutex8n.c \ - pthread_mutex/mutex8r.c pthread_once/once1.c \ + pthread_mutex/default-basic.c \ + pthread_mutex/default-lock-recursive.c \ + pthread_mutex/default-static.c \ + pthread_mutex/default-static-lock-recursive.c \ + pthread_mutex/default-timedlock.c \ + pthread_mutex/default-trylock.c \ + pthread_mutex/default-trylock-recursive.c \ + pthread_mutex/default-unlock.c \ + pthread_mutex/errorcheck-basic.c \ + pthread_mutex/errorcheck-lock-recursive.c \ + pthread_mutex/errorcheck-static.c \ + pthread_mutex/errorcheck-static-lock-recursive.c \ + pthread_mutex/errorcheck-timedlock.c \ + pthread_mutex/errorcheck-trylock.c \ + pthread_mutex/errorcheck-trylock-recursive.c \ + pthread_mutex/errorcheck-unlock.c pthread_mutex/mutex-types.c \ + pthread_mutex/normal-basic.c \ + pthread_mutex/normal-lock-recursive.c \ + pthread_mutex/normal-static.c \ + pthread_mutex/normal-static-lock-recursive.c \ + pthread_mutex/normal-timedlock.c \ + pthread_mutex/normal-trylock.c \ + pthread_mutex/normal-trylock-recursive.c \ + pthread_mutex/normal-unlock.c pthread_mutex/recursive-basic.c \ + pthread_mutex/recursive-lock-recursive.c \ + pthread_mutex/recursive-static.c \ + pthread_mutex/recursive-static-lock-recursive.c \ + pthread_mutex/recursive-timedlock.c \ + pthread_mutex/recursive-trylock.c \ + pthread_mutex/recursive-trylock-recursive.c \ + pthread_mutex/recursive-unlock.c pthread_once/once1.c \ pthread_once/once2.c pthread_once/once3.c pthread_once/once4.c \ pthread_rwlock/rwlock1.c pthread_rwlock/rwlock2.c \ pthread_rwlock/rwlock2_t.c pthread_rwlock/rwlock3.c \ @@ -1084,20 +1240,37 @@ pthread_misc/reuse2.c pthread_misc/self1.c \ pthread_misc/self2.c pthread_misc/stress1.c \ pthread_misc/valid1.c pthread_misc/valid2.c \ - pthread_mutex/mutex1.c pthread_mutex/mutex1e.c \ - pthread_mutex/mutex1n.c pthread_mutex/mutex1r.c \ - pthread_mutex/mutex2.c pthread_mutex/mutex2e.c \ - pthread_mutex/mutex2r.c pthread_mutex/mutex3.c \ - pthread_mutex/mutex3e.c pthread_mutex/mutex3r.c \ - pthread_mutex/mutex4.c pthread_mutex/mutex5.c \ - pthread_mutex/mutex6.c pthread_mutex/mutex6e.c \ - pthread_mutex/mutex6es.c pthread_mutex/mutex6n.c \ - pthread_mutex/mutex6r.c pthread_mutex/mutex6rs.c \ - pthread_mutex/mutex6s.c pthread_mutex/mutex7.c \ - pthread_mutex/mutex7e.c pthread_mutex/mutex7n.c \ - pthread_mutex/mutex7r.c pthread_mutex/mutex8.c \ - pthread_mutex/mutex8e.c pthread_mutex/mutex8n.c \ - pthread_mutex/mutex8r.c pthread_once/once1.c \ + pthread_mutex/default-basic.c \ + pthread_mutex/default-lock-recursive.c \ + pthread_mutex/default-static.c \ + pthread_mutex/default-static-lock-recursive.c \ + pthread_mutex/default-timedlock.c \ + pthread_mutex/default-trylock.c \ + pthread_mutex/default-trylock-recursive.c \ + pthread_mutex/default-unlock.c \ + pthread_mutex/errorcheck-basic.c \ + pthread_mutex/errorcheck-lock-recursive.c \ + pthread_mutex/errorcheck-static.c \ + pthread_mutex/errorcheck-static-lock-recursive.c \ + pthread_mutex/errorcheck-timedlock.c \ + pthread_mutex/errorcheck-trylock.c \ + pthread_mutex/errorcheck-trylock-recursive.c \ + pthread_mutex/errorcheck-unlock.c pthread_mutex/mutex-types.c \ + pthread_mutex/normal-basic.c \ + pthread_mutex/normal-lock-recursive.c \ + pthread_mutex/normal-static.c \ + pthread_mutex/normal-static-lock-recursive.c \ + pthread_mutex/normal-timedlock.c \ + pthread_mutex/normal-trylock.c \ + pthread_mutex/normal-trylock-recursive.c \ + pthread_mutex/normal-unlock.c pthread_mutex/recursive-basic.c \ + pthread_mutex/recursive-lock-recursive.c \ + pthread_mutex/recursive-static.c \ + pthread_mutex/recursive-static-lock-recursive.c \ + pthread_mutex/recursive-timedlock.c \ + pthread_mutex/recursive-trylock.c \ + pthread_mutex/recursive-trylock-recursive.c \ + pthread_mutex/recursive-unlock.c pthread_once/once1.c \ pthread_once/once2.c pthread_once/once3.c pthread_once/once4.c \ pthread_rwlock/rwlock1.c pthread_rwlock/rwlock2.c \ pthread_rwlock/rwlock2_t.c pthread_rwlock/rwlock3.c \ @@ -2085,168 +2258,229 @@ pthread_mutex/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) pthread_mutex/$(DEPDIR) @: > pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex1.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-basic.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex1$(EXEEXT): $(pthread_mutex_mutex1_OBJECTS) $(pthread_mutex_mutex1_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex1_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex1$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex1_OBJECTS) $(pthread_mutex_mutex1_LDADD) $(LIBS) -pthread_mutex/mutex1e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-basic$(EXEEXT): $(pthread_mutex_default_basic_OBJECTS) $(pthread_mutex_default_basic_DEPENDENCIES) $(EXTRA_pthread_mutex_default_basic_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-basic$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_basic_OBJECTS) $(pthread_mutex_default_basic_LDADD) $(LIBS) +pthread_mutex/default-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex1e$(EXEEXT): $(pthread_mutex_mutex1e_OBJECTS) $(pthread_mutex_mutex1e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex1e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex1e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex1e_OBJECTS) $(pthread_mutex_mutex1e_LDADD) $(LIBS) -pthread_mutex/mutex1n.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-lock-recursive$(EXEEXT): $(pthread_mutex_default_lock_recursive_OBJECTS) $(pthread_mutex_default_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_default_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_lock_recursive_OBJECTS) $(pthread_mutex_default_lock_recursive_LDADD) $(LIBS) +pthread_mutex/default-static.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex1n$(EXEEXT): $(pthread_mutex_mutex1n_OBJECTS) $(pthread_mutex_mutex1n_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex1n_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex1n$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex1n_OBJECTS) $(pthread_mutex_mutex1n_LDADD) $(LIBS) -pthread_mutex/mutex1r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-static$(EXEEXT): $(pthread_mutex_default_static_OBJECTS) $(pthread_mutex_default_static_DEPENDENCIES) $(EXTRA_pthread_mutex_default_static_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-static$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_static_OBJECTS) $(pthread_mutex_default_static_LDADD) $(LIBS) +pthread_mutex/default-static-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex1r$(EXEEXT): $(pthread_mutex_mutex1r_OBJECTS) $(pthread_mutex_mutex1r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex1r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex1r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex1r_OBJECTS) $(pthread_mutex_mutex1r_LDADD) $(LIBS) -pthread_mutex/mutex2.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-static-lock-recursive$(EXEEXT): $(pthread_mutex_default_static_lock_recursive_OBJECTS) $(pthread_mutex_default_static_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_default_static_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-static-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_static_lock_recursive_OBJECTS) $(pthread_mutex_default_static_lock_recursive_LDADD) $(LIBS) +pthread_mutex/default-timedlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex2$(EXEEXT): $(pthread_mutex_mutex2_OBJECTS) $(pthread_mutex_mutex2_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex2_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex2$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex2_OBJECTS) $(pthread_mutex_mutex2_LDADD) $(LIBS) -pthread_mutex/mutex2e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-timedlock$(EXEEXT): $(pthread_mutex_default_timedlock_OBJECTS) $(pthread_mutex_default_timedlock_DEPENDENCIES) $(EXTRA_pthread_mutex_default_timedlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-timedlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_timedlock_OBJECTS) $(pthread_mutex_default_timedlock_LDADD) $(LIBS) +pthread_mutex/default-trylock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex2e$(EXEEXT): $(pthread_mutex_mutex2e_OBJECTS) $(pthread_mutex_mutex2e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex2e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex2e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex2e_OBJECTS) $(pthread_mutex_mutex2e_LDADD) $(LIBS) -pthread_mutex/mutex2r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-trylock$(EXEEXT): $(pthread_mutex_default_trylock_OBJECTS) $(pthread_mutex_default_trylock_DEPENDENCIES) $(EXTRA_pthread_mutex_default_trylock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-trylock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_trylock_OBJECTS) $(pthread_mutex_default_trylock_LDADD) $(LIBS) +pthread_mutex/default-trylock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex2r$(EXEEXT): $(pthread_mutex_mutex2r_OBJECTS) $(pthread_mutex_mutex2r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex2r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex2r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex2r_OBJECTS) $(pthread_mutex_mutex2r_LDADD) $(LIBS) -pthread_mutex/mutex3.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-trylock-recursive$(EXEEXT): $(pthread_mutex_default_trylock_recursive_OBJECTS) $(pthread_mutex_default_trylock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_default_trylock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-trylock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_trylock_recursive_OBJECTS) $(pthread_mutex_default_trylock_recursive_LDADD) $(LIBS) +pthread_mutex/default-unlock.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex3$(EXEEXT): $(pthread_mutex_mutex3_OBJECTS) $(pthread_mutex_mutex3_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex3_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex3$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex3_OBJECTS) $(pthread_mutex_mutex3_LDADD) $(LIBS) -pthread_mutex/mutex3e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/default-unlock$(EXEEXT): $(pthread_mutex_default_unlock_OBJECTS) $(pthread_mutex_default_unlock_DEPENDENCIES) $(EXTRA_pthread_mutex_default_unlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/default-unlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_default_unlock_OBJECTS) $(pthread_mutex_default_unlock_LDADD) $(LIBS) +pthread_mutex/errorcheck-basic.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex3e$(EXEEXT): $(pthread_mutex_mutex3e_OBJECTS) $(pthread_mutex_mutex3e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex3e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex3e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex3e_OBJECTS) $(pthread_mutex_mutex3e_LDADD) $(LIBS) -pthread_mutex/mutex3r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-basic$(EXEEXT): $(pthread_mutex_errorcheck_basic_OBJECTS) $(pthread_mutex_errorcheck_basic_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_basic_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-basic$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_basic_OBJECTS) $(pthread_mutex_errorcheck_basic_LDADD) $(LIBS) +pthread_mutex/errorcheck-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex3r$(EXEEXT): $(pthread_mutex_mutex3r_OBJECTS) $(pthread_mutex_mutex3r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex3r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex3r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex3r_OBJECTS) $(pthread_mutex_mutex3r_LDADD) $(LIBS) -pthread_mutex/mutex4.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-lock-recursive$(EXEEXT): $(pthread_mutex_errorcheck_lock_recursive_OBJECTS) $(pthread_mutex_errorcheck_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_lock_recursive_OBJECTS) $(pthread_mutex_errorcheck_lock_recursive_LDADD) $(LIBS) +pthread_mutex/errorcheck-static.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex4$(EXEEXT): $(pthread_mutex_mutex4_OBJECTS) $(pthread_mutex_mutex4_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex4_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex4$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex4_OBJECTS) $(pthread_mutex_mutex4_LDADD) $(LIBS) -pthread_mutex/mutex5.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-static$(EXEEXT): $(pthread_mutex_errorcheck_static_OBJECTS) $(pthread_mutex_errorcheck_static_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_static_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-static$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_static_OBJECTS) $(pthread_mutex_errorcheck_static_LDADD) $(LIBS) +pthread_mutex/errorcheck-static-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex5$(EXEEXT): $(pthread_mutex_mutex5_OBJECTS) $(pthread_mutex_mutex5_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex5_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex5$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex5_OBJECTS) $(pthread_mutex_mutex5_LDADD) $(LIBS) -pthread_mutex/mutex6.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-static-lock-recursive$(EXEEXT): $(pthread_mutex_errorcheck_static_lock_recursive_OBJECTS) $(pthread_mutex_errorcheck_static_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_static_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-static-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_static_lock_recursive_OBJECTS) $(pthread_mutex_errorcheck_static_lock_recursive_LDADD) $(LIBS) +pthread_mutex/errorcheck-timedlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6$(EXEEXT): $(pthread_mutex_mutex6_OBJECTS) $(pthread_mutex_mutex6_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6_OBJECTS) $(pthread_mutex_mutex6_LDADD) $(LIBS) -pthread_mutex/mutex6e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-timedlock$(EXEEXT): $(pthread_mutex_errorcheck_timedlock_OBJECTS) $(pthread_mutex_errorcheck_timedlock_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_timedlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-timedlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_timedlock_OBJECTS) $(pthread_mutex_errorcheck_timedlock_LDADD) $(LIBS) +pthread_mutex/errorcheck-trylock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6e$(EXEEXT): $(pthread_mutex_mutex6e_OBJECTS) $(pthread_mutex_mutex6e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6e_OBJECTS) $(pthread_mutex_mutex6e_LDADD) $(LIBS) -pthread_mutex/mutex6es.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-trylock$(EXEEXT): $(pthread_mutex_errorcheck_trylock_OBJECTS) $(pthread_mutex_errorcheck_trylock_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_trylock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-trylock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_trylock_OBJECTS) $(pthread_mutex_errorcheck_trylock_LDADD) $(LIBS) +pthread_mutex/errorcheck-trylock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6es$(EXEEXT): $(pthread_mutex_mutex6es_OBJECTS) $(pthread_mutex_mutex6es_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6es_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6es$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6es_OBJECTS) $(pthread_mutex_mutex6es_LDADD) $(LIBS) -pthread_mutex/mutex6n.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-trylock-recursive$(EXEEXT): $(pthread_mutex_errorcheck_trylock_recursive_OBJECTS) $(pthread_mutex_errorcheck_trylock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_trylock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-trylock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_trylock_recursive_OBJECTS) $(pthread_mutex_errorcheck_trylock_recursive_LDADD) $(LIBS) +pthread_mutex/errorcheck-unlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6n$(EXEEXT): $(pthread_mutex_mutex6n_OBJECTS) $(pthread_mutex_mutex6n_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6n_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6n$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6n_OBJECTS) $(pthread_mutex_mutex6n_LDADD) $(LIBS) -pthread_mutex/mutex6r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/errorcheck-unlock$(EXEEXT): $(pthread_mutex_errorcheck_unlock_OBJECTS) $(pthread_mutex_errorcheck_unlock_DEPENDENCIES) $(EXTRA_pthread_mutex_errorcheck_unlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/errorcheck-unlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_errorcheck_unlock_OBJECTS) $(pthread_mutex_errorcheck_unlock_LDADD) $(LIBS) +pthread_mutex/mutex-types.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6r$(EXEEXT): $(pthread_mutex_mutex6r_OBJECTS) $(pthread_mutex_mutex6r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6r_OBJECTS) $(pthread_mutex_mutex6r_LDADD) $(LIBS) -pthread_mutex/mutex6rs.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/mutex-types$(EXEEXT): $(pthread_mutex_mutex_types_OBJECTS) $(pthread_mutex_mutex_types_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex_types_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/mutex-types$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex_types_OBJECTS) $(pthread_mutex_mutex_types_LDADD) $(LIBS) +pthread_mutex/normal-basic.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6rs$(EXEEXT): $(pthread_mutex_mutex6rs_OBJECTS) $(pthread_mutex_mutex6rs_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6rs_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6rs$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6rs_OBJECTS) $(pthread_mutex_mutex6rs_LDADD) $(LIBS) -pthread_mutex/mutex6s.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-basic$(EXEEXT): $(pthread_mutex_normal_basic_OBJECTS) $(pthread_mutex_normal_basic_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_basic_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-basic$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_basic_OBJECTS) $(pthread_mutex_normal_basic_LDADD) $(LIBS) +pthread_mutex/normal-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex6s$(EXEEXT): $(pthread_mutex_mutex6s_OBJECTS) $(pthread_mutex_mutex6s_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex6s_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex6s$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex6s_OBJECTS) $(pthread_mutex_mutex6s_LDADD) $(LIBS) -pthread_mutex/mutex7.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-lock-recursive$(EXEEXT): $(pthread_mutex_normal_lock_recursive_OBJECTS) $(pthread_mutex_normal_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_lock_recursive_OBJECTS) $(pthread_mutex_normal_lock_recursive_LDADD) $(LIBS) +pthread_mutex/normal-static.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex7$(EXEEXT): $(pthread_mutex_mutex7_OBJECTS) $(pthread_mutex_mutex7_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex7_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex7$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex7_OBJECTS) $(pthread_mutex_mutex7_LDADD) $(LIBS) -pthread_mutex/mutex7e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-static$(EXEEXT): $(pthread_mutex_normal_static_OBJECTS) $(pthread_mutex_normal_static_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_static_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-static$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_static_OBJECTS) $(pthread_mutex_normal_static_LDADD) $(LIBS) +pthread_mutex/normal-static-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex7e$(EXEEXT): $(pthread_mutex_mutex7e_OBJECTS) $(pthread_mutex_mutex7e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex7e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex7e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex7e_OBJECTS) $(pthread_mutex_mutex7e_LDADD) $(LIBS) -pthread_mutex/mutex7n.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-static-lock-recursive$(EXEEXT): $(pthread_mutex_normal_static_lock_recursive_OBJECTS) $(pthread_mutex_normal_static_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_static_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-static-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_static_lock_recursive_OBJECTS) $(pthread_mutex_normal_static_lock_recursive_LDADD) $(LIBS) +pthread_mutex/normal-timedlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex7n$(EXEEXT): $(pthread_mutex_mutex7n_OBJECTS) $(pthread_mutex_mutex7n_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex7n_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex7n$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex7n_OBJECTS) $(pthread_mutex_mutex7n_LDADD) $(LIBS) -pthread_mutex/mutex7r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-timedlock$(EXEEXT): $(pthread_mutex_normal_timedlock_OBJECTS) $(pthread_mutex_normal_timedlock_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_timedlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-timedlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_timedlock_OBJECTS) $(pthread_mutex_normal_timedlock_LDADD) $(LIBS) +pthread_mutex/normal-trylock.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex7r$(EXEEXT): $(pthread_mutex_mutex7r_OBJECTS) $(pthread_mutex_mutex7r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex7r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex7r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex7r_OBJECTS) $(pthread_mutex_mutex7r_LDADD) $(LIBS) -pthread_mutex/mutex8.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-trylock$(EXEEXT): $(pthread_mutex_normal_trylock_OBJECTS) $(pthread_mutex_normal_trylock_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_trylock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-trylock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_trylock_OBJECTS) $(pthread_mutex_normal_trylock_LDADD) $(LIBS) +pthread_mutex/normal-trylock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex8$(EXEEXT): $(pthread_mutex_mutex8_OBJECTS) $(pthread_mutex_mutex8_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex8_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex8$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex8_OBJECTS) $(pthread_mutex_mutex8_LDADD) $(LIBS) -pthread_mutex/mutex8e.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-trylock-recursive$(EXEEXT): $(pthread_mutex_normal_trylock_recursive_OBJECTS) $(pthread_mutex_normal_trylock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_trylock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-trylock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_trylock_recursive_OBJECTS) $(pthread_mutex_normal_trylock_recursive_LDADD) $(LIBS) +pthread_mutex/normal-unlock.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex8e$(EXEEXT): $(pthread_mutex_mutex8e_OBJECTS) $(pthread_mutex_mutex8e_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex8e_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex8e$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex8e_OBJECTS) $(pthread_mutex_mutex8e_LDADD) $(LIBS) -pthread_mutex/mutex8n.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/normal-unlock$(EXEEXT): $(pthread_mutex_normal_unlock_OBJECTS) $(pthread_mutex_normal_unlock_DEPENDENCIES) $(EXTRA_pthread_mutex_normal_unlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/normal-unlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_normal_unlock_OBJECTS) $(pthread_mutex_normal_unlock_LDADD) $(LIBS) +pthread_mutex/recursive-basic.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex8n$(EXEEXT): $(pthread_mutex_mutex8n_OBJECTS) $(pthread_mutex_mutex8n_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex8n_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex8n$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex8n_OBJECTS) $(pthread_mutex_mutex8n_LDADD) $(LIBS) -pthread_mutex/mutex8r.$(OBJEXT): pthread_mutex/$(am__dirstamp) \ +pthread_mutex/recursive-basic$(EXEEXT): $(pthread_mutex_recursive_basic_OBJECTS) $(pthread_mutex_recursive_basic_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_basic_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-basic$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_basic_OBJECTS) $(pthread_mutex_recursive_basic_LDADD) $(LIBS) +pthread_mutex/recursive-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ pthread_mutex/$(DEPDIR)/$(am__dirstamp) -pthread_mutex/mutex8r$(EXEEXT): $(pthread_mutex_mutex8r_OBJECTS) $(pthread_mutex_mutex8r_DEPENDENCIES) $(EXTRA_pthread_mutex_mutex8r_DEPENDENCIES) pthread_mutex/$(am__dirstamp) - @rm -f pthread_mutex/mutex8r$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(pthread_mutex_mutex8r_OBJECTS) $(pthread_mutex_mutex8r_LDADD) $(LIBS) +pthread_mutex/recursive-lock-recursive$(EXEEXT): $(pthread_mutex_recursive_lock_recursive_OBJECTS) $(pthread_mutex_recursive_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_lock_recursive_OBJECTS) $(pthread_mutex_recursive_lock_recursive_LDADD) $(LIBS) +pthread_mutex/recursive-static.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-static$(EXEEXT): $(pthread_mutex_recursive_static_OBJECTS) $(pthread_mutex_recursive_static_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_static_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-static$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_static_OBJECTS) $(pthread_mutex_recursive_static_LDADD) $(LIBS) +pthread_mutex/recursive-static-lock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-static-lock-recursive$(EXEEXT): $(pthread_mutex_recursive_static_lock_recursive_OBJECTS) $(pthread_mutex_recursive_static_lock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_static_lock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-static-lock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_static_lock_recursive_OBJECTS) $(pthread_mutex_recursive_static_lock_recursive_LDADD) $(LIBS) +pthread_mutex/recursive-timedlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-timedlock$(EXEEXT): $(pthread_mutex_recursive_timedlock_OBJECTS) $(pthread_mutex_recursive_timedlock_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_timedlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-timedlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_timedlock_OBJECTS) $(pthread_mutex_recursive_timedlock_LDADD) $(LIBS) +pthread_mutex/recursive-trylock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-trylock$(EXEEXT): $(pthread_mutex_recursive_trylock_OBJECTS) $(pthread_mutex_recursive_trylock_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_trylock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-trylock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_trylock_OBJECTS) $(pthread_mutex_recursive_trylock_LDADD) $(LIBS) +pthread_mutex/recursive-trylock-recursive.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-trylock-recursive$(EXEEXT): $(pthread_mutex_recursive_trylock_recursive_OBJECTS) $(pthread_mutex_recursive_trylock_recursive_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_trylock_recursive_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-trylock-recursive$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_trylock_recursive_OBJECTS) $(pthread_mutex_recursive_trylock_recursive_LDADD) $(LIBS) +pthread_mutex/recursive-unlock.$(OBJEXT): \ + pthread_mutex/$(am__dirstamp) \ + pthread_mutex/$(DEPDIR)/$(am__dirstamp) + +pthread_mutex/recursive-unlock$(EXEEXT): $(pthread_mutex_recursive_unlock_OBJECTS) $(pthread_mutex_recursive_unlock_DEPENDENCIES) $(EXTRA_pthread_mutex_recursive_unlock_DEPENDENCIES) pthread_mutex/$(am__dirstamp) + @rm -f pthread_mutex/recursive-unlock$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(pthread_mutex_recursive_unlock_OBJECTS) $(pthread_mutex_recursive_unlock_LDADD) $(LIBS) pthread_once/$(am__dirstamp): @$(MKDIR_P) pthread_once @: > pthread_once/$(am__dirstamp) @@ -2584,33 +2818,39 @@ @AMDEP_TRUE@@am__include@ @am__quote@pthread_misc/$(DEPDIR)/stress1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@pthread_misc/$(DEPDIR)/valid1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@pthread_misc/$(DEPDIR)/valid2.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex1.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex1e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex1n.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex1r.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex2.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex2e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex2r.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex3.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex3e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex3r.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex4.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex5.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6es.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6n.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6r.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6rs.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex6s.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex7.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex7e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex7n.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex7r.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex8.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex8e.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex8n.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex8r.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-static-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-static.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-timedlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-trylock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-trylock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/default-unlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-static-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-static.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-timedlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-trylock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-trylock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/errorcheck-unlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/mutex-types.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-static-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-static.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-timedlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-trylock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-trylock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/normal-unlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-basic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-static-lock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-static.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-timedlock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-trylock-recursive.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-trylock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@pthread_mutex/$(DEPDIR)/recursive-unlock.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@pthread_once/$(DEPDIR)/once1.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@pthread_once/$(DEPDIR)/once2.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@pthread_once/$(DEPDIR)/once3.Po@am__quote@ # am--include-marker @@ -3438,191 +3678,233 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex1.log: pthread_mutex/mutex1$(EXEEXT) - @p='pthread_mutex/mutex1$(EXEEXT)'; \ - b='pthread_mutex/mutex1'; \ +pthread_mutex/default-basic.log: pthread_mutex/default-basic$(EXEEXT) + @p='pthread_mutex/default-basic$(EXEEXT)'; \ + b='pthread_mutex/default-basic'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex1e.log: pthread_mutex/mutex1e$(EXEEXT) - @p='pthread_mutex/mutex1e$(EXEEXT)'; \ - b='pthread_mutex/mutex1e'; \ +pthread_mutex/default-lock-recursive.log: pthread_mutex/default-lock-recursive$(EXEEXT) + @p='pthread_mutex/default-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/default-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex1n.log: pthread_mutex/mutex1n$(EXEEXT) - @p='pthread_mutex/mutex1n$(EXEEXT)'; \ - b='pthread_mutex/mutex1n'; \ +pthread_mutex/default-static.log: pthread_mutex/default-static$(EXEEXT) + @p='pthread_mutex/default-static$(EXEEXT)'; \ + b='pthread_mutex/default-static'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex1r.log: pthread_mutex/mutex1r$(EXEEXT) - @p='pthread_mutex/mutex1r$(EXEEXT)'; \ - b='pthread_mutex/mutex1r'; \ +pthread_mutex/default-static-lock-recursive.log: pthread_mutex/default-static-lock-recursive$(EXEEXT) + @p='pthread_mutex/default-static-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/default-static-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex2.log: pthread_mutex/mutex2$(EXEEXT) - @p='pthread_mutex/mutex2$(EXEEXT)'; \ - b='pthread_mutex/mutex2'; \ +pthread_mutex/default-timedlock.log: pthread_mutex/default-timedlock$(EXEEXT) + @p='pthread_mutex/default-timedlock$(EXEEXT)'; \ + b='pthread_mutex/default-timedlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex2e.log: pthread_mutex/mutex2e$(EXEEXT) - @p='pthread_mutex/mutex2e$(EXEEXT)'; \ - b='pthread_mutex/mutex2e'; \ +pthread_mutex/default-trylock.log: pthread_mutex/default-trylock$(EXEEXT) + @p='pthread_mutex/default-trylock$(EXEEXT)'; \ + b='pthread_mutex/default-trylock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex2r.log: pthread_mutex/mutex2r$(EXEEXT) - @p='pthread_mutex/mutex2r$(EXEEXT)'; \ - b='pthread_mutex/mutex2r'; \ +pthread_mutex/default-trylock-recursive.log: pthread_mutex/default-trylock-recursive$(EXEEXT) + @p='pthread_mutex/default-trylock-recursive$(EXEEXT)'; \ + b='pthread_mutex/default-trylock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex3.log: pthread_mutex/mutex3$(EXEEXT) - @p='pthread_mutex/mutex3$(EXEEXT)'; \ - b='pthread_mutex/mutex3'; \ +pthread_mutex/default-unlock.log: pthread_mutex/default-unlock$(EXEEXT) + @p='pthread_mutex/default-unlock$(EXEEXT)'; \ + b='pthread_mutex/default-unlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex3e.log: pthread_mutex/mutex3e$(EXEEXT) - @p='pthread_mutex/mutex3e$(EXEEXT)'; \ - b='pthread_mutex/mutex3e'; \ +pthread_mutex/errorcheck-basic.log: pthread_mutex/errorcheck-basic$(EXEEXT) + @p='pthread_mutex/errorcheck-basic$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-basic'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex3r.log: pthread_mutex/mutex3r$(EXEEXT) - @p='pthread_mutex/mutex3r$(EXEEXT)'; \ - b='pthread_mutex/mutex3r'; \ +pthread_mutex/errorcheck-lock-recursive.log: pthread_mutex/errorcheck-lock-recursive$(EXEEXT) + @p='pthread_mutex/errorcheck-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex4.log: pthread_mutex/mutex4$(EXEEXT) - @p='pthread_mutex/mutex4$(EXEEXT)'; \ - b='pthread_mutex/mutex4'; \ +pthread_mutex/errorcheck-static.log: pthread_mutex/errorcheck-static$(EXEEXT) + @p='pthread_mutex/errorcheck-static$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-static'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex5.log: pthread_mutex/mutex5$(EXEEXT) - @p='pthread_mutex/mutex5$(EXEEXT)'; \ - b='pthread_mutex/mutex5'; \ +pthread_mutex/errorcheck-static-lock-recursive.log: pthread_mutex/errorcheck-static-lock-recursive$(EXEEXT) + @p='pthread_mutex/errorcheck-static-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-static-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6.log: pthread_mutex/mutex6$(EXEEXT) - @p='pthread_mutex/mutex6$(EXEEXT)'; \ - b='pthread_mutex/mutex6'; \ +pthread_mutex/errorcheck-timedlock.log: pthread_mutex/errorcheck-timedlock$(EXEEXT) + @p='pthread_mutex/errorcheck-timedlock$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-timedlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6e.log: pthread_mutex/mutex6e$(EXEEXT) - @p='pthread_mutex/mutex6e$(EXEEXT)'; \ - b='pthread_mutex/mutex6e'; \ +pthread_mutex/errorcheck-trylock.log: pthread_mutex/errorcheck-trylock$(EXEEXT) + @p='pthread_mutex/errorcheck-trylock$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-trylock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6es.log: pthread_mutex/mutex6es$(EXEEXT) - @p='pthread_mutex/mutex6es$(EXEEXT)'; \ - b='pthread_mutex/mutex6es'; \ +pthread_mutex/errorcheck-trylock-recursive.log: pthread_mutex/errorcheck-trylock-recursive$(EXEEXT) + @p='pthread_mutex/errorcheck-trylock-recursive$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-trylock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6n.log: pthread_mutex/mutex6n$(EXEEXT) - @p='pthread_mutex/mutex6n$(EXEEXT)'; \ - b='pthread_mutex/mutex6n'; \ +pthread_mutex/errorcheck-unlock.log: pthread_mutex/errorcheck-unlock$(EXEEXT) + @p='pthread_mutex/errorcheck-unlock$(EXEEXT)'; \ + b='pthread_mutex/errorcheck-unlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6r.log: pthread_mutex/mutex6r$(EXEEXT) - @p='pthread_mutex/mutex6r$(EXEEXT)'; \ - b='pthread_mutex/mutex6r'; \ +pthread_mutex/mutex-types.log: pthread_mutex/mutex-types$(EXEEXT) + @p='pthread_mutex/mutex-types$(EXEEXT)'; \ + b='pthread_mutex/mutex-types'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6rs.log: pthread_mutex/mutex6rs$(EXEEXT) - @p='pthread_mutex/mutex6rs$(EXEEXT)'; \ - b='pthread_mutex/mutex6rs'; \ +pthread_mutex/normal-basic.log: pthread_mutex/normal-basic$(EXEEXT) + @p='pthread_mutex/normal-basic$(EXEEXT)'; \ + b='pthread_mutex/normal-basic'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex6s.log: pthread_mutex/mutex6s$(EXEEXT) - @p='pthread_mutex/mutex6s$(EXEEXT)'; \ - b='pthread_mutex/mutex6s'; \ +pthread_mutex/normal-lock-recursive.log: pthread_mutex/normal-lock-recursive$(EXEEXT) + @p='pthread_mutex/normal-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/normal-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex7.log: pthread_mutex/mutex7$(EXEEXT) - @p='pthread_mutex/mutex7$(EXEEXT)'; \ - b='pthread_mutex/mutex7'; \ +pthread_mutex/normal-static.log: pthread_mutex/normal-static$(EXEEXT) + @p='pthread_mutex/normal-static$(EXEEXT)'; \ + b='pthread_mutex/normal-static'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex7e.log: pthread_mutex/mutex7e$(EXEEXT) - @p='pthread_mutex/mutex7e$(EXEEXT)'; \ - b='pthread_mutex/mutex7e'; \ +pthread_mutex/normal-static-lock-recursive.log: pthread_mutex/normal-static-lock-recursive$(EXEEXT) + @p='pthread_mutex/normal-static-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/normal-static-lock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex7n.log: pthread_mutex/mutex7n$(EXEEXT) - @p='pthread_mutex/mutex7n$(EXEEXT)'; \ - b='pthread_mutex/mutex7n'; \ +pthread_mutex/normal-timedlock.log: pthread_mutex/normal-timedlock$(EXEEXT) + @p='pthread_mutex/normal-timedlock$(EXEEXT)'; \ + b='pthread_mutex/normal-timedlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex7r.log: pthread_mutex/mutex7r$(EXEEXT) - @p='pthread_mutex/mutex7r$(EXEEXT)'; \ - b='pthread_mutex/mutex7r'; \ +pthread_mutex/normal-trylock.log: pthread_mutex/normal-trylock$(EXEEXT) + @p='pthread_mutex/normal-trylock$(EXEEXT)'; \ + b='pthread_mutex/normal-trylock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex8.log: pthread_mutex/mutex8$(EXEEXT) - @p='pthread_mutex/mutex8$(EXEEXT)'; \ - b='pthread_mutex/mutex8'; \ +pthread_mutex/normal-trylock-recursive.log: pthread_mutex/normal-trylock-recursive$(EXEEXT) + @p='pthread_mutex/normal-trylock-recursive$(EXEEXT)'; \ + b='pthread_mutex/normal-trylock-recursive'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex8e.log: pthread_mutex/mutex8e$(EXEEXT) - @p='pthread_mutex/mutex8e$(EXEEXT)'; \ - b='pthread_mutex/mutex8e'; \ +pthread_mutex/normal-unlock.log: pthread_mutex/normal-unlock$(EXEEXT) + @p='pthread_mutex/normal-unlock$(EXEEXT)'; \ + b='pthread_mutex/normal-unlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex8n.log: pthread_mutex/mutex8n$(EXEEXT) - @p='pthread_mutex/mutex8n$(EXEEXT)'; \ - b='pthread_mutex/mutex8n'; \ +pthread_mutex/recursive-basic.log: pthread_mutex/recursive-basic$(EXEEXT) + @p='pthread_mutex/recursive-basic$(EXEEXT)'; \ + b='pthread_mutex/recursive-basic'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pthread_mutex/mutex8r.log: pthread_mutex/mutex8r$(EXEEXT) - @p='pthread_mutex/mutex8r$(EXEEXT)'; \ - b='pthread_mutex/mutex8r'; \ +pthread_mutex/recursive-lock-recursive.log: pthread_mutex/recursive-lock-recursive$(EXEEXT) + @p='pthread_mutex/recursive-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/recursive-lock-recursive'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-static.log: pthread_mutex/recursive-static$(EXEEXT) + @p='pthread_mutex/recursive-static$(EXEEXT)'; \ + b='pthread_mutex/recursive-static'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-static-lock-recursive.log: pthread_mutex/recursive-static-lock-recursive$(EXEEXT) + @p='pthread_mutex/recursive-static-lock-recursive$(EXEEXT)'; \ + b='pthread_mutex/recursive-static-lock-recursive'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-timedlock.log: pthread_mutex/recursive-timedlock$(EXEEXT) + @p='pthread_mutex/recursive-timedlock$(EXEEXT)'; \ + b='pthread_mutex/recursive-timedlock'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-trylock.log: pthread_mutex/recursive-trylock$(EXEEXT) + @p='pthread_mutex/recursive-trylock$(EXEEXT)'; \ + b='pthread_mutex/recursive-trylock'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-trylock-recursive.log: pthread_mutex/recursive-trylock-recursive$(EXEEXT) + @p='pthread_mutex/recursive-trylock-recursive$(EXEEXT)'; \ + b='pthread_mutex/recursive-trylock-recursive'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +pthread_mutex/recursive-unlock.log: pthread_mutex/recursive-unlock$(EXEEXT) + @p='pthread_mutex/recursive-unlock$(EXEEXT)'; \ + b='pthread_mutex/recursive-unlock'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -4060,33 +4342,39 @@ -rm -f pthread_misc/$(DEPDIR)/stress1.Po -rm -f pthread_misc/$(DEPDIR)/valid1.Po -rm -f pthread_misc/$(DEPDIR)/valid2.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex4.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex5.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6es.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6rs.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6s.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8r.Po + -rm -f pthread_mutex/$(DEPDIR)/default-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/default-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-static.Po + -rm -f pthread_mutex/$(DEPDIR)/default-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/default-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/default-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-static.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/mutex-types.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-static.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-static.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-unlock.Po -rm -f pthread_once/$(DEPDIR)/once1.Po -rm -f pthread_once/$(DEPDIR)/once2.Po -rm -f pthread_once/$(DEPDIR)/once3.Po @@ -4243,33 +4531,39 @@ -rm -f pthread_misc/$(DEPDIR)/stress1.Po -rm -f pthread_misc/$(DEPDIR)/valid1.Po -rm -f pthread_misc/$(DEPDIR)/valid2.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex1r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex2r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex3r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex4.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex5.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6es.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6rs.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex6s.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex7r.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8e.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8n.Po - -rm -f pthread_mutex/$(DEPDIR)/mutex8r.Po + -rm -f pthread_mutex/$(DEPDIR)/default-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/default-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-static.Po + -rm -f pthread_mutex/$(DEPDIR)/default-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/default-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/default-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/default-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-static.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/errorcheck-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/mutex-types.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-static.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/normal-unlock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-basic.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-static-lock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-static.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-timedlock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-trylock-recursive.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-trylock.Po + -rm -f pthread_mutex/$(DEPDIR)/recursive-unlock.Po -rm -f pthread_once/$(DEPDIR)/once1.Po -rm -f pthread_once/$(DEPDIR)/once2.Po -rm -f pthread_once/$(DEPDIR)/once3.Po