On 08/04/2020 10:14, Iain Buclaw via Gcc-patches wrote:
> On 28/01/2020 05:00, Mathias Lang wrote:
>> diff -Nurp a/libphobos/configure.ac b/libphobos/configure.ac
>> --- a/libphobos/configure.ac
>> +++ b/libphobos/configure.ac
>> @@ -140,6 +140,14 @@ case ${host} in
>> esac
>> AC_MSG_RESULT($LIBPHOBOS_SUPPORTED)
>>
>> +AC_MSG_CHECKING([if target needs to link in swapcontext])
>> +AC_MSG_RESULT($LIBDRUNTIME_NEEDS_UCONTEXT)
>> +AS_IF([test "x$LIBDRUNTIME_NEEDS_UCONTEXT" = xyes], [
>> + AC_SEARCH_LIBS([swapcontext], [c ucontext], [], [
>> + AC_MSG_ERROR([[can't find library providing swapcontext]])
>> + ])
>> +])
>> +
>
> Rather than adding LIBDRUNTIME_NEEDS_UCONTEXT, couldn't you just add a
> one-liner AC_SEARCH_LIBS to the WITH_LOCAL_DRUNTIME list?
>
> Testing as I suggest locally, there is no problems on x86 and x86_64.
>
> Iain.
>
Hi Matthias,
Does the following change work well for you on s390x-musl?
Regards
Iain.
---
diff --git a/libphobos/configure b/libphobos/configure
index a6f5aec2bfd..333ac86c977 100755
--- a/libphobos/configure
+++ b/libphobos/configure
@@ -15043,6 +15043,77 @@ $as_echo "$druntime_cv_lib_sockets" >&6; }
LIBS="$LIBS $druntime_cv_lib_sockets"
+ # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
+ # "yes" for targets that have 'version = AsmExternal'.
+ druntime_fiber_asm_external=no
+ case "$target_cpu" in
+ aarch64* | \
+ arm* | \
+ i[34567]86|x86_64 | \
+ powerpc)
+ druntime_fiber_asm_external=yes
+ ;;
+ esac
+ if test "$druntime_fiber_asm_external" = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing
swapcontext" >&5
+$as_echo_n "checking for library containing swapcontext... " >&6; }
+if ${ac_cv_search_swapcontext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char swapcontext ();
+int
+main ()
+{
+return swapcontext ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' c ucontext; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_swapcontext=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_swapcontext+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_swapcontext+:} false; then :
+
+else
+ ac_cv_search_swapcontext=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_swapcontext" >&5
+$as_echo "$ac_cv_search_swapcontext" >&6; }
+ac_res=$ac_cv_search_swapcontext
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+ fi
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/libphobos/configure.ac b/libphobos/configure.ac
index ffd12981d0b..47591668d9d 100644
--- a/libphobos/configure.ac
+++ b/libphobos/configure.ac
@@ -144,6 +144,7 @@ DRUNTIME_LIBRARIES_ATOMIC
DRUNTIME_LIBRARIES_BACKTRACE
DRUNTIME_LIBRARIES_DLOPEN
DRUNTIME_LIBRARIES_NET
+DRUNTIME_LIBRARIES_UCONTEXT
DRUNTIME_LIBRARIES_ZLIB
DRUNTIME_INSTALL_DIRECTORIES
diff --git a/libphobos/m4/druntime/libraries.m4
b/libphobos/m4/druntime/libraries.m4
index 9e8e210df5a..79a45d9fc3e 100644
--- a/libphobos/m4/druntime/libraries.m4
+++ b/libphobos/m4/druntime/libraries.m4
@@ -212,3 +212,26 @@ AC_DEFUN([DRUNTIME_LIBRARIES_CLIB],
AC_SUBST(DCFG_HAVE_QSORT_R)
AC_LANG_POP([C])
])
+
+# DRUNTIME_LIBRARIES_UCONTEXT
+# ------------------------------
+# Autodetect and add ucontext library to LIBS if necessary.
+# This is only required if fiber_switchContext does not have
+# its own internal asm implementation.
+AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
+[
+ # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
+ # "yes" for targets that have 'version = AsmExternal'.
+ druntime_fiber_asm_external=no
+ case "$target_cpu" in
+ aarch64* | \
+ arm* | \
+ i[[34567]]86|x86_64 | \
+ powerpc)
+ druntime_fiber_asm_external=yes
+ ;;
+ esac
+ if test "$druntime_fiber_asm_external" = no; then
+ AC_SEARCH_LIBS([swapcontext], [c ucontext])
+ fi
+])
