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

acinclude.m4 (LIBGFOR_CHECK_PRAGMA_WEAK): Rename to...

Browse Source 
libfortran/24991
	* acinclude.m4 (LIBGFOR_CHECK_PRAGMA_WEAK): Rename to...
	(LIBGFOR_GTHREAD_WEAK): ... this.  Define SUPPORTS_WEAK rather
	than HAVE_PRAGMA_WEAK.  Define GTHREAD_USE_WEAK to 0 on hosts
	that shouldn't use weak in gthr.h.
	* configure.ac: Use LIBGFOR_GTHREAD_WEAK instead of
	LIBGFOR_CHECK_PRAGMA_WEAK.
	* config.h.in: Regenerated.
	* configure: Regenerated.
	* io/io.h (SUPPORTS_WEAK): Don't define here.

From-SVN: r107616
This commit is contained in:
Jakub Jelinek 2005-11-28 20:51:02 +01:00 committed by Jakub Jelinek
parent c869fb40ac
commit e669bd2b69
6 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libgfortran/ChangeLog
View File

@ -1,5 +1,16 @@
2005-11-28 Jakub Jelinek <jakub@redhat.com> 2005-11-28 Jakub Jelinek <jakub@redhat.com>
libfortran/24991
* acinclude.m4 (LIBGFOR_CHECK_PRAGMA_WEAK): Rename to...
(LIBGFOR_GTHREAD_WEAK): ... this. Define SUPPORTS_WEAK rather
than HAVE_PRAGMA_WEAK. Define GTHREAD_USE_WEAK to 0 on hosts
that shouldn't use weak in gthr.h.
* configure.ac: Use LIBGFOR_GTHREAD_WEAK instead of
LIBGFOR_CHECK_PRAGMA_WEAK.
* config.h.in: Regenerated.
* configure: Regenerated.
* io/io.h (SUPPORTS_WEAK): Don't define here.
* intrinsics/ftell.c (ftell, FTELL_SUB): Add unlock_unit call. * intrinsics/ftell.c (ftell, FTELL_SUB): Add unlock_unit call.
* intrinsics/fget.c (fgetc, fputs): Likewise. * intrinsics/fget.c (fgetc, fputs): Likewise.
* intrinsics/tty.c (ttynam): Likewise. * intrinsics/tty.c (ttynam): Likewise.

12
libgfortran/acinclude.m4
View File

@ -174,7 +174,7 @@ target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`])
fi]) fi])
dnl Check for pragma weak. dnl Check for pragma weak.
AC_DEFUN([LIBGFOR_CHECK_PRAGMA_WEAK], [ AC_DEFUN([LIBGFOR_GTHREAD_WEAK], [
AC_CACHE_CHECK([whether pragma weak works], AC_CACHE_CHECK([whether pragma weak works],
have_pragma_weak, [ have_pragma_weak, [
gfor_save_CFLAGS="$CFLAGS" gfor_save_CFLAGS="$CFLAGS"
@ -183,9 +183,15 @@ AC_DEFUN([LIBGFOR_CHECK_PRAGMA_WEAK], [
#pragma weak foo], [if (foo) foo ();], #pragma weak foo], [if (foo) foo ();],
have_pragma_weak=yes, have_pragma_weak=no)]) have_pragma_weak=yes, have_pragma_weak=no)])
if test $have_pragma_weak = yes; then if test $have_pragma_weak = yes; then
AC_DEFINE(HAVE_PRAGMA_WEAK, 1, AC_DEFINE(SUPPORTS_WEAK, 1,
[Define to 1 if the target supports #pragma weak]) [Define to 1 if the target supports #pragma weak])
fi]) fi
case "$host" in
*-*-darwin* | *-*-hpux* | *-*-cygwin*)
AC_DEFINE(GTHREAD_USE_WEAK, 0,
[Define to 0 if the target shouldn't use #pragma weak])
;;
esac])
dnl Check whether target can unlink a file still open. dnl Check whether target can unlink a file still open.
AC_DEFUN([LIBGFOR_CHECK_UNLINK_OPEN_FILE], [ AC_DEFUN([LIBGFOR_CHECK_UNLINK_OPEN_FILE], [

9
libgfortran/config.h.in
View File

@ -3,6 +3,9 @@
/* Does gettimeofday take a single argument */ /* Does gettimeofday take a single argument */
#undef GETTIMEOFDAY_ONE_ARGUMENT #undef GETTIMEOFDAY_ONE_ARGUMENT
/* Define to 0 if the target shouldn't use #pragma weak */
#undef GTHREAD_USE_WEAK
/* libm includes acos */ /* libm includes acos */
#undef HAVE_ACOS #undef HAVE_ACOS
@ -465,9 +468,6 @@
/* libm includes powl */ /* libm includes powl */
#undef HAVE_POWL #undef HAVE_POWL
/* Define to 1 if the target supports #pragma weak */
#undef HAVE_PRAGMA_WEAK
/* libm includes round */ /* libm includes round */
#undef HAVE_ROUND #undef HAVE_ROUND
@ -684,6 +684,9 @@
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Define to 1 if the target supports #pragma weak */
#undef SUPPORTS_WEAK
/* Define to 1 if the target is ILP32. */ /* Define to 1 if the target is ILP32. */
#undef TARGET_ILP32 #undef TARGET_ILP32

11
libgfortran/configure vendored
View File

@ -20854,10 +20854,19 @@ echo "${ECHO_T}$have_pragma_weak" >&6
if test $have_pragma_weak = yes; then if test $have_pragma_weak = yes; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_PRAGMA_WEAK 1 #define SUPPORTS_WEAK 1
_ACEOF _ACEOF
fi fi
case "$host" in
*-*-darwin* | *-*-hpux* | *-*-cygwin*)
cat >>confdefs.h <<\_ACEOF
#define GTHREAD_USE_WEAK 0
_ACEOF
;;
esac
# Various other checks on target # Various other checks on target

2
libgfortran/configure.ac
View File

@ -381,7 +381,7 @@ LIBGFOR_CHECK_SYNC_FETCH_AND_ADD
LIBGFOR_CHECK_GTHR_DEFAULT LIBGFOR_CHECK_GTHR_DEFAULT
# Check out #pragma weak. # Check out #pragma weak.
LIBGFOR_CHECK_PRAGMA_WEAK LIBGFOR_GTHREAD_WEAK
# Various other checks on target # Various other checks on target
LIBGFOR_CHECK_UNLINK_OPEN_FILE LIBGFOR_CHECK_UNLINK_OPEN_FILE

4
libgfortran/io/io.h
View File

@ -32,10 +32,6 @@ Boston, MA 02110-1301, USA. */
#include <setjmp.h> #include <setjmp.h>
#include "libgfortran.h" #include "libgfortran.h"
#ifdef HAVE_PRAGMA_WEAK
/* Used by gthr.h. */
#define SUPPORTS_WEAK 1
#endif
#include <gthr.h> #include <gthr.h>