From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 9BB363858D1E; Wed, 21 Dec 2022 03:35:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9BB363858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671593706; bh=MwR8Nc2v2lC20yGYmpNuwKZJOc8H5k6WNBXfVgFSyM0=; h=From:To:Subject:Date:From; b=lMI09wr7WhgBuFB/z7WrXhLHyA1RocKifAlIjFI4Ix15Q1xjczJ85u5jdJIGLHu13 Ztk/toO9/hnjVOeg91EFEr2jG1UF4FnGmUw9uu8YLPBiqElvcK9C56vZ50ju6izoWM ZiicfxRakozb1ZOQftWFJ4+cWMkIoqXogUIR7nj4= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4817] libgo: check for makecontext in -lucontext X-Act-Checkin: gcc X-Git-Author: Ian Lance Taylor X-Git-Refname: refs/heads/master X-Git-Oldrev: fb73bfdb67789f10378ed855b0da7f85376e4b6f X-Git-Newrev: 2b1a604a9b28fbf4f382060bebd04adb83acc2f9 Message-Id: <20221221033506.9BB363858D1E@sourceware.org> Date: Wed, 21 Dec 2022 03:35:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2b1a604a9b28fbf4f382060bebd04adb83acc2f9 commit r13-4817-g2b1a604a9b28fbf4f382060bebd04adb83acc2f9 Author: Ian Lance Taylor Date: Mon Dec 19 10:37:06 2022 -0800 libgo: check for makecontext in -lucontext Patch from Sören Tempel. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396 Diff: --- gcc/go/gofrontend/MERGE | 2 +- libgo/configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ libgo/configure.ac | 3 +++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index d8c4e02d6e6..d123c746fb2 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -9906861dc86c1733bb304d3d45b1534adb32712c +ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/configure b/libgo/configure index 460fdad70a8..a607dbff68e 100755 --- a/libgo/configure +++ b/libgo/configure @@ -14818,6 +14818,63 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5 +$as_echo_n "checking for library containing makecontext... " >&6; } +if ${ac_cv_search_makecontext+:} 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 makecontext (); +int +main () +{ +return makecontext (); + ; + return 0; +} +_ACEOF +for ac_lib in '' 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_makecontext=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_makecontext+:} false; then : + break +fi +done +if ${ac_cv_search_makecontext+:} false; then : + +else + ac_cv_search_makecontext=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5 +$as_echo "$ac_cv_search_makecontext" >&6; } +ac_res=$ac_cv_search_makecontext +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5 $as_echo_n "checking for library containing sched_yield... " >&6; } if ${ac_cv_search_sched_yield+:} false; then : diff --git a/libgo/configure.ac b/libgo/configure.ac index 09554a37a23..a59aa091d1d 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -570,6 +570,9 @@ PTHREAD_LIBS= AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread) AC_SUBST(PTHREAD_LIBS) +dnl Test if -lucontext is required for makecontext. +AC_SEARCH_LIBS([makecontext], [ucontext]) + dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime. AC_SEARCH_LIBS([sched_yield], [rt]) AC_SEARCH_LIBS([nanosleep], [rt])