diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-03-01 06:55:57 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-03-01 06:55:57 +0000 |
| commit | 6a8c1091fdc978b0e369f4ca3f58a07c2f8b9d33 (patch) | |
| tree | 754e2649fcc68e83b3ad749cb5a1a1f7549ffafb /nptl/sysdeps/unix/sysv/linux/ia64 | |
| parent | 378b1353df56387b0706bc42cb661ff2227c8eb9 (diff) | |
Updated to fedora-glibc-20060301T0647
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/ia64')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/clone2.S | 11 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S b/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S index 8664056f27..91f28bab37 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S +++ b/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S @@ -1,2 +1,9 @@ -#define RESET_PID -#include <sysdeps/unix/sysv/linux/ia64/clone2.S> +/* We want an #include_next, but we are the main source file. + So, #include ourselves and in that incarnation we can use #include_next. */ +#ifndef INCLUDED_SELF +# define INCLUDED_SELF +# include <clone2.S> +#else +# define RESET_PID +# include_next <clone2.S> +#endif diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h index e07570a939..ece9a7fc72 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h @@ -120,7 +120,7 @@ extern int __lll_robust_lock_wait (int *futex) attribute_hidden; if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ __val = __lll_robust_lock_wait (__futex); \ __val; \ - })) + }) #define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id) @@ -142,7 +142,7 @@ extern int __lll_robust_lock_wait (int *futex) attribute_hidden; if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0) \ __val = __lll_robust_lock_wait (__futex); \ __val; \ - })) + }) #define lll_robust_mutex_cond_lock(futex, id) \ __lll_robust_mutex_cond_lock (&(futex), id) @@ -174,7 +174,7 @@ extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *) if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ __val = __lll_robust_timedlock_wait (__futex, abstime); \ __val; \ - })) + }) #define lll_robust_mutex_timedlock(futex, abstime, id) \ __lll_robust_mutex_timedlock (&(futex), abstime, id) |