OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: Don't create pth.

Browse Source 
* configure.ac: Don't create pth.
	Check for library containing sched_yield.
	* configure: Regenerate.
	* config.h.in: Regenerate.

	* testsuite/lib/libmudflap.exp (libmudflap-init): Use
	mfconfig_libs in -static check.

From-SVN: r176237
This commit is contained in:
Rainer Orth 2011-07-13 14:57:29 +00:00 committed by Rainer Orth
parent 727a65e6fc
commit dbf32ca5be
5 changed files with 67 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmudflap/ChangeLog
View File

@ -1,3 +1,13 @@
2011-07-13 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac: Don't create pth.
Check for library containing sched_yield.
* configure: Regenerate.
* config.h.in: Regenerate.
* testsuite/lib/libmudflap.exp (libmudflap-init): Use
mfconfig_libs in -static check.
2011-07-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libmudflap/49550

3
libmudflap/config.h.in
View File

@ -126,6 +126,9 @@
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
/* Define to 1 if you have the `rt' library (-lrt). */
#undef HAVE_LIBRT
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET

57
libmudflap/configure vendored
View File

@ -10986,12 +10986,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test ! -d pth
then
# libmudflapth objects are built in this subdirectory
mkdir pth
fi
for ac_header in pthread.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
@ -11138,6 +11132,57 @@ fi
fi
ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield"
if test "x$ac_cv_func_sched_yield" = x""yes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
$as_echo_n "checking for sched_yield in -lrt... " >&6; }
if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lrt $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 sched_yield ();
int
main ()
{
return sched_yield ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_rt_sched_yield=yes
else
ac_cv_lib_rt_sched_yield=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
$as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRT 1
_ACEOF
LIBS="-lrt $LIBS"
fi
fi
# Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir

7
libmudflap/configure.ac
View File

@ -112,12 +112,6 @@ else
fi
AC_SUBST(MF_HAVE_UINTPTR_T)
if test ! -d pth
then
# libmudflapth objects are built in this subdirectory
mkdir pth
fi
AC_CHECK_HEADERS(pthread.h)
AC_MSG_CHECKING([for thread model used by GCC])
@ -150,6 +144,7 @@ AC_SUBST(build_libmudflapth)
AC_CHECK_LIB(dl, dlsym)
AC_CHECK_FUNC(connect,, AC_CHECK_LIB(socket, connect))
AC_CHECK_FUNC(sched_yield,, AC_CHECK_LIB(rt, sched_yield))
# Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir

2
libmudflap/testsuite/lib/libmudflap.exp
View File

@ -124,9 +124,11 @@ proc libmudflap-init { language } {
# If there is no static library then don't run tests with -static.
global tool
global mfconfig_libs
set opts "additional_flags=-static"
lappend opts "additional_flags=-fmudflap"
lappend opts "additional_flags=-lmudflap"
lappend opts "libs=$mfconfig_libs"
set src stlm[pid].c
set exe stlm[pid].x