diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/configure.in | 29 | ||||
| -rw-r--r-- | sysdeps/mach/powerpc/machine-lock.h | 20 |
2 files changed, 39 insertions, 10 deletions
diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in index 2a76ead8ed..058a2a05c8 100644 --- a/sysdeps/mach/configure.in +++ b/sysdeps/mach/configure.in @@ -1,6 +1,11 @@ sinclude(./aclocal.m4)dnl Autoconf lossage. GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +### Sanity checks for Mach header installation +AC_CHECK_HEADER(mach/mach_types.h,, [AC_MSG_ERROR([cannot find Mach headers])]) +AC_CHECK_HEADER(mach/mach_types.defs,, [dnl +AC_MSG_ERROR([cannot find Mach .defs files])]) + dnl dnl mach_TYPE_CHECK(foo_t, bar_t) dnl @@ -21,6 +26,9 @@ dnl mach_TYPE_CHECK(task_t, task_port_t) mach_TYPE_CHECK(thread_t, thread_port_t) +dnl +dnl The creation_time field is a GNU Mach addition the other variants lack. +dnl AC_CACHE_CHECK(for creation_time in task_basic_info, libc_cv_mach_task_creation_time, [dnl AC_TRY_COMPILE([#include <mach/task_info.h>], [ @@ -30,3 +38,24 @@ long s = i->creation_time.seconds; if test $libc_cv_mach_task_creation_time = no; then DEFINES="$DEFINES -DNO_CREATION_TIME=1" fi + +dnl +dnl The Darwin variant no longer has <mach/mach.defs> +dnl but instead has several constituent .defs files. +dnl In this scenario we will presume there is a <mach/mach_interface.h> +dnl that contains an #include for each constituent header file, +dnl but we don't do a check for that here because in a bare +dnl environment the compile against those headers will fail. +dnl +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_CHECK_HEADER(mach/${ifc}.defs, [dnl + mach_interface_list="$mach_interface_list $ifc"]) +done +if test "x$mach_interface_list" = x; then + AC_MSG_ERROR([what manner of Mach is this?]) +fi diff --git a/sysdeps/mach/powerpc/machine-lock.h b/sysdeps/mach/powerpc/machine-lock.h index 96e833ca15..cba6b0a6e2 100644 --- a/sysdeps/mach/powerpc/machine-lock.h +++ b/sysdeps/mach/powerpc/machine-lock.h @@ -1,5 +1,5 @@ /* Machine-specific definition for spin locks. PowerPC version. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1994,97,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -40,9 +40,9 @@ __spin_unlock (__spin_lock_t *__lock) { long int __locked; __asm__ __volatile__ ("\ -0: lwarx %0,0,%1 - stwcx. %2,0,%1 - bne- 0b +0: lwarx %0,0,%1\n\ + stwcx. %2,0,%1\n\ + bne- 0b\n\ " : "=&r" (__locked) : "r" (__lock), "r" (0) : "cr0"); } @@ -53,9 +53,9 @@ __spin_try_lock (register __spin_lock_t *__lock) { long int __rtn; __asm__ __volatile__ ("\ -0: lwarx %0,0,%1 - stwcx. %2,0,%1 - bne- 0b +0: lwarx %0,0,%1\n\ + stwcx. %2,0,%1\n\ + bne- 0b\n\ " : "=&r" (__rtn) : "r" (__lock), "r" (1) : "cr0"); return !__rtn; } @@ -67,9 +67,9 @@ __spin_lock_locked (__spin_lock_t *__lock) { long int __rtn; __asm__ __volatile__ ("\ -0: lwarx %0,0,%1 - stwcx. %0,0,%1 - bne- 0b +0: lwarx %0,0,%1\n\ + stwcx. %0,0,%1\n\ + bne- 0b\n\ " : "=&r" (__rtn) : "r" (__lock) : "cr0"); return __rtn; } |