proc.c: Conditional include of sys/loadavg.h for Solaris.

2006-01-23  Andreas Tobler  <a.tobler@schweiz.ch>

	* config/posix/proc.c: Conditional include of sys/loadavg.h for
	Solaris.
	* configure.ac: Add check for loadavg.h.
	(link_gomp): Adjust comment.
	* configure: Regenerate.
	* config.h.in: Regenerate.

From-SVN: r110141
This commit is contained in:
Andreas Tobler 2006-01-23 19:28:51 +01:00 committed by Andreas Tobler
parent 993acaec69
commit 192a50ad41
5 changed files with 23 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2006-01-23 Andreas Tobler <a.tobler@schweiz.ch>
* config/posix/proc.c: Conditional include of sys/loadavg.h for
Solaris.
* configure.ac: Add check for loadavg.h.
(link_gomp): Adjust comment.
* configure: Regenerate.
* config.h.in: Regenerate.
2006-01-21 Steve Ellcey <sje@cup.hp.com>
PR libgomp/25877

View File

@ -39,6 +39,9 @@
/* Define to 1 if the target supports __sync_*_compare_and_swap */
#undef HAVE_SYNC_BUILTINS
/* Define to 1 if you have the <sys/loadavg.h> header file. */
#undef HAVE_SYS_LOADAVG_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2005 Free Software Foundation, Inc.
/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
Contributed by Richard Henderson <rth@redhat.com>.
This file is part of the GNU OpenMP Library (libgomp).
@ -34,6 +34,11 @@
#include "libgomp.h"
#include <unistd.h>
#include <stdlib.h>
#ifdef HAVE_GETLOADAVG
# ifdef HAVE_SYS_LOADAVG_H
# include <sys/loadavg.h>
# endif
#endif
/* At startup, determine the default number of threads. It would seem

5
libgomp/configure vendored
View File

@ -5317,7 +5317,8 @@ done
for ac_header in unistd.h semaphore.h sys/time.h
for ac_header in unistd.h semaphore.h sys/loadavg.h sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@ -6633,7 +6634,7 @@ else
fi
# Set up the set of libraries that we need to link against for libgomp.
# Note that the GOMP_DRIVER_SPEC in gcc.c will force -pthread for -fopenmp,
# Note that the GOMP_SELF_SPEC in gcc.c will force -pthread for -fopenmp,
# which will force linkage against -lpthread (or equivalent for the system).
# That's not 100% ideal, but about the best we can do easily.
if test $enable_shared = yes; then

View File

@ -136,7 +136,7 @@ AC_SUBST(libtool_VERSION)
# Check header files.
AC_STDC_HEADERS
AC_HEADER_TIME
AC_CHECK_HEADERS(unistd.h semaphore.h sys/time.h)
AC_CHECK_HEADERS(unistd.h semaphore.h sys/loadavg.h sys/time.h)
AC_CHECK_HEADER([pthread.h],[],
[AC_MSG_ERROR([Pthreads are required to build libgomp])])
@ -204,7 +204,7 @@ else
fi
# Set up the set of libraries that we need to link against for libgomp.
# Note that the GOMP_DRIVER_SPEC in gcc.c will force -pthread for -fopenmp,
# Note that the GOMP_SELF_SPEC in gcc.c will force -pthread for -fopenmp,
# which will force linkage against -lpthread (or equivalent for the system).
# That's not 100% ideal, but about the best we can do easily.
if test $enable_shared = yes; then