mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
21297437bb
or <machine/ndr_def.h> and add -DNDR_DEF_HEADER=... to DEFINES. * sysdeps/mach/configure: Regenerated. * mach/mach_init.c [NDR_DEF_HEADER]: #include it. * hurd/hurdfault.c (_hurdsig_fault_init): Add a cast. * hurd/hurd/signal.h: Include <setjmp.h> for `jmp_buf' decl. * mach/msgserver.c (__mach_msg_server_timeout) [! MACH_RCV_LARGE]: Double MAX_SIZE and don't retry on MACH_RCV_TOO_LARGE. * sysdeps/mach/hurd/times.c [NO_CREATION_TIME] (startup_time): New static variable. [NO_CREATION_TIME] (times_init): New static function in __libc_subinit. (__times) [NO_CREATION_TIME]: Use startup_time in lieu of task creation_time from task_basic_info. (__times): Use __gettimeofday instead of __host_get_time. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg) [! MACH_MSG_TYPE_BIT]: Use untyped Mach IPC message format. * hurd/catch-exc.c: Include <assert.h>, missing from last change.
306 lines
8.7 KiB
Plaintext
306 lines
8.7 KiB
Plaintext
|
|
### Sanity checks for Mach header installation
|
|
ac_safe=`echo "mach/mach_types.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for mach/mach_types.h""... $ac_c" 1>&6
|
|
echo "configure:6: checking for mach/mach_types.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 11 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/mach_types.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
{ (eval echo configure:16: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
:
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
{ echo "configure: error: cannot find Mach headers" 1>&2; exit 1; }
|
|
fi
|
|
|
|
ac_safe=`echo "mach/mach_types.defs" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for mach/mach_types.defs""... $ac_c" 1>&6
|
|
echo "configure:40: checking for mach/mach_types.defs" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 45 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/mach_types.defs>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
{ (eval echo configure:50: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
:
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
{ echo "configure: error: cannot find Mach .defs files" 1>&2; exit 1; }
|
|
fi
|
|
|
|
|
|
|
|
|
|
echo $ac_n "checking for task_t in mach/mach_types.h""... $ac_c" 1>&6
|
|
echo "configure:76: checking for task_t in mach/mach_types.h" >&5
|
|
if eval "test \"`echo '$''{'libc_cv_mach_task_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 81 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/mach_types.h>
|
|
int main() {
|
|
extern task_t foo;
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:88: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
libc_cv_mach_task_t=task_t
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
libc_cv_mach_task_t=task_port_t
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
|
|
echo "$ac_t""$libc_cv_mach_task_t" 1>&6
|
|
if test $libc_cv_mach_task_t != task_t; then
|
|
DEFINES="$DEFINES -Dtask_t=task_port_t"
|
|
fi
|
|
echo $ac_n "checking for thread_t in mach/mach_types.h""... $ac_c" 1>&6
|
|
echo "configure:105: checking for thread_t in mach/mach_types.h" >&5
|
|
if eval "test \"`echo '$''{'libc_cv_mach_thread_t'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 110 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/mach_types.h>
|
|
int main() {
|
|
extern thread_t foo;
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
libc_cv_mach_thread_t=thread_t
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
libc_cv_mach_thread_t=thread_port_t
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
|
|
echo "$ac_t""$libc_cv_mach_thread_t" 1>&6
|
|
if test $libc_cv_mach_thread_t != thread_t; then
|
|
DEFINES="$DEFINES -Dthread_t=thread_port_t"
|
|
fi
|
|
|
|
echo $ac_n "checking for creation_time in task_basic_info""... $ac_c" 1>&6
|
|
echo "configure:135: checking for creation_time in task_basic_info" >&5
|
|
if eval "test \"`echo '$''{'libc_cv_mach_task_creation_time'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 140 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/task_info.h>
|
|
int main() {
|
|
|
|
extern struct task_basic_info *i;
|
|
long s = i->creation_time.seconds;
|
|
|
|
; return 0; }
|
|
EOF
|
|
if { (eval echo configure:150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
libc_cv_mach_task_creation_time=yes
|
|
else
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
libc_cv_mach_task_creation_time=no
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
|
|
echo "$ac_t""$libc_cv_mach_task_creation_time" 1>&6
|
|
if test $libc_cv_mach_task_creation_time = no; then
|
|
DEFINES="$DEFINES -DNO_CREATION_TIME=1"
|
|
fi
|
|
|
|
mach_interface_list=
|
|
for ifc in mach mach4 \
|
|
clock_priv host_priv host_security ledger lock_set \
|
|
processor processor_set task thread_act vm_map \
|
|
memory_object memory_object_default default_pager \
|
|
; do
|
|
ac_safe=`echo "mach/${ifc}.defs" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for mach/${ifc}.defs""... $ac_c" 1>&6
|
|
echo "configure:175: checking for mach/${ifc}.defs" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 180 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/${ifc}.defs>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
{ (eval echo configure:185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
mach_interface_list="$mach_interface_list $ifc"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
done
|
|
if test "x$mach_interface_list" = x; then
|
|
{ echo "configure: error: what manner of Mach is this?" 1>&2; exit 1; }
|
|
fi
|
|
|
|
echo $ac_n "checking for host_page_size in mach_host.defs""... $ac_c" 1>&6
|
|
echo "configure:212: checking for host_page_size in mach_host.defs" >&5
|
|
if eval "test \"`echo '$''{'libc_cv_mach_host_page_size'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 217 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/mach_host.defs>
|
|
EOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
egrep "host_page_size" >/dev/null 2>&1; then
|
|
rm -rf conftest*
|
|
libc_cv_mach_host_page_size=yes
|
|
else
|
|
rm -rf conftest*
|
|
libc_cv_mach_host_page_size=no
|
|
fi
|
|
rm -f conftest*
|
|
|
|
fi
|
|
|
|
echo "$ac_t""$libc_cv_mach_host_page_size" 1>&6
|
|
if test $libc_cv_mach_host_page_size = yes; then
|
|
cat >> confdefs.h <<\EOF
|
|
#define HAVE_HOST_PAGE_SIZE 1
|
|
EOF
|
|
|
|
fi
|
|
|
|
ac_safe=`echo "mach/machine/ndr_def.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for mach/machine/ndr_def.h""... $ac_c" 1>&6
|
|
echo "configure:243: checking for mach/machine/ndr_def.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 248 "configure"
|
|
#include "confdefs.h"
|
|
#include <mach/machine/ndr_def.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
{ (eval echo configure:253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
DEFINES="$DEFINES -DNDR_DEF_HEADER='<mach/machine/ndr_def.h>'"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
ac_safe=`echo "machine/ndr_def.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for machine/ndr_def.h""... $ac_c" 1>&6
|
|
echo "configure:274: checking for machine/ndr_def.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
#line 279 "configure"
|
|
#include "confdefs.h"
|
|
#include <machine/ndr_def.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
{ (eval echo configure:284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
echo "configure: failed program was:" >&5
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
rm -f conftest*
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
DEFINES="$DEFINES -DNDR_DEF_HEADER='<machine/ndr_def.h>'"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
fi
|
|
|