patches/glibc/ports-2.6.1/120-lll_lock_t.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Apr 19 16:17:11 2009 +0000 (2009-04-19)
branchnewlib
changeset 1365 c4d124ed9f8e
parent 748 61cd4eb6034d
permissions -rw-r--r--
Update the newlib devel branch with stuf from /trunk.

-------- diffstat follows --------
/devel/newlib/configure | 8 4 4 0
/devel/newlib/scripts/build/kernel/linux.sh | 2 1 1 0
/devel/newlib/scripts/build/cc/gcc.sh | 34 22 12 0 +
/devel/newlib/scripts/build/debug/300-gdb.sh | 52 45 7 0 +
/devel/newlib/scripts/build/libc/uClibc.sh | 6 3 3 0
/devel/newlib/scripts/build/mpfr.sh | 2 1 1 0
/devel/newlib/scripts/crosstool-NG.sh.in | 20 18 2 0 +
/devel/newlib/scripts/functions | 44 34 10 0 +
/devel/newlib/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch | 414 0 414 0 ----------
/devel/newlib/patches/glibc/2_9/140-regex-BZ9697.patch | 111 0 111 0 ---
/devel/newlib/patches/glibc/2_9/190-queue-header-updates.patch | 89 0 89 0 --
/devel/newlib/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch | 32 0 32 0 -
/devel/newlib/patches/glibc/2_9/330-2.3.3-china.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/270-ldbl-nexttowardf.patch | 68 0 68 0 --
/devel/newlib/patches/glibc/2_9/410-2.9-fnmatch.patch | 64 0 64 0 --
/devel/newlib/patches/glibc/2_9/340-new-valencian-locale.patch | 120 0 120 0 ---
/devel/newlib/patches/glibc/2_9/350-2.4-undefine-__i686.patch | 47 0 47 0 -
/devel/newlib/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch | 53 0 53 0 -
/devel/newlib/patches/glibc/2_9/150-regex-BZ697.patch | 28 0 28 0 -
/devel/newlib/patches/glibc/2_9/420-dont-build-timezone.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/2_9/290-no-inline-gmon.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/280-section-comments.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/180-math-tests.patch | 72 0 72 0 --
/devel/newlib/patches/glibc/2_9/250-resolv-dynamic.patch | 44 0 44 0 -
/devel/newlib/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/300-2.9-check_native-headers.patch | 22 0 22 0 -
/devel/newlib/patches/glibc/2_9/130-add_prio-macros.patch | 26 0 26 0 -
/devel/newlib/patches/glibc/2_9/310-2.3.6-fix-pr631.patch | 50 0 50 0 -
/devel/newlib/patches/glibc/2_9/510-sh-no-asm-user-header.patch | 70 0 70 0 --
/devel/newlib/patches/glibc/2_9/260-fadvise64_64.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch | 74 0 74 0 --
/devel/newlib/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch | 18 0 18 0 -
/devel/newlib/patches/glibc/2_9/360-2.8-nscd-one-fork.patch | 45 0 45 0 -
/devel/newlib/patches/glibc/2_9/210-2.9-strlen-hack.patch | 109 0 109 0 ---
/devel/newlib/patches/glibc/2_9/320-2.9-assume-pipe2.patch | 59 0 59 0 -
/devel/newlib/patches/glibc/2_9/100-ssp-compat.patch | 193 0 193 0 -----
/devel/newlib/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/220-manual-no-perl.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch | 198 0 198 0 -----
/devel/newlib/patches/glibc/2_9/520-sh-no-asm-elf-header.patch | 27 0 27 0 -
/devel/newlib/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/200-awk-in-C-locale.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch | 57 0 57 0 -
/devel/newlib/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch | 71 0 71 0 --
/devel/newlib/patches/glibc/2_9/490-ptr-mangling.patch | 114 0 114 0 ---
/devel/newlib/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/ports-2_9/100-arm_linux_tls.patch | 14 0 14 0 -
/devel/newlib/patches/uClibc/0.9.30.1/140-gnu89-inline.patch | 2 1 1 0
/devel/newlib/docs/known-issues.txt | 16 15 1 0 +
/devel/newlib/docs/overview.txt | 2 1 1 0
/devel/newlib/samples/armeb-unknown-linux-uclibc/uClibc-0.9.30.config | 243 0 243 0 ------
/devel/newlib/samples/armeb-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/sh4-unknown-linux-gnu/crosstool.config | 35 18 17 0 +
/devel/newlib/samples/x86_64-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/arm-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/armeb-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/arm-unknown-linux-gnueabi/crosstool.config | 113 73 40 0 +--
/devel/newlib/samples/ia64-unknown-linux-gnu/crosstool.config | 91 61 30 0 +-
/devel/newlib/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.30.config | 245 0 245 0 ------
/devel/newlib/samples/x86_64-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnueabi/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-e500v2-linux-gnuspe/crosstool.config | 96 63 33 0 +-
/devel/newlib/samples/i686-nptl-linux-gnu/crosstool.config | 78 48 30 0 +-
/devel/newlib/samples/arm-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown-linux-gnu/crosstool.config | 103 67 36 0 +-
/devel/newlib/samples/mips-unknown-linux-uclibc/uClibc-0.9.30.config | 254 0 254 0 ------
/devel/newlib/samples/mips-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-iphone-linux-gnueabi/crosstool.config | 84 57 27 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/i586-geode-linux-uclibc/uClibc-0.9.30.config | 263 0 263 0 ------
/devel/newlib/samples/i586-geode-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibc/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.config | 248 0 248 0 ------
/devel/newlib/samples/powerpc-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/mips-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/powerpc-405-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config | 26 13 13 0
/devel/newlib/samples/arm-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/mipsel-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/powerpc64-unknown-linux-gnu/crosstool.config | 75 49 26 0 +-
/devel/newlib/samples/alphaev56-unknown-linux-gnu/crosstool.config | 94 63 31 0 +-
/devel/newlib/samples/powerpc-860-linux-gnu/crosstool.config | 102 67 35 0 +-
/devel/newlib/config/kernel/linux.in | 87 46 41 0 +-
/devel/newlib/config/cc/gcc.in | 35 30 5 0 +
/devel/newlib/config/debug/gdb.in | 2 1 1 0
94 files changed, 1851 insertions(+), 5813 deletions(-)
yann@748
     1
Propagate the patch from base glibc that changes lll_lock_t into a plain int,
yann@748
     2
without using a typedef, as glibc-2.7 now does.
yann@748
     3
yann@955
     4
diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
yann@955
     5
--- glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2006-08-04 20:56:15.000000000 +0200
yann@955
     6
+++ glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2008-07-28 23:49:29.000000000 +0200
yann@748
     7
@@ -260,9 +260,6 @@
yann@748
     8
 /* Our internal lock implementation is identical to the binary-compatible
yann@748
     9
    mutex implementation. */
yann@748
    10
 
yann@748
    11
-/* Type for lock object.  */
yann@748
    12
-typedef int lll_lock_t;
yann@748
    13
-
yann@748
    14
 /* Initializers for lock.  */
yann@748
    15
 #define LLL_LOCK_INITIALIZER		(0)
yann@748
    16
 #define LLL_LOCK_INITIALIZER_LOCKED	(1)
yann@955
    17
diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
yann@955
    18
--- glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c	2006-07-14 15:51:24.000000000 +0200
yann@955
    19
+++ glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c	2008-07-28 23:49:56.000000000 +0200
yann@748
    20
@@ -25,7 +25,7 @@
yann@748
    21
 
yann@748
    22
 
yann@748
    23
 void
yann@748
    24
-__lll_lock_wait (lll_lock_t *futex)
yann@748
    25
+__lll_lock_wait (int *futex)
yann@748
    26
 {
yann@748
    27
   do
yann@748
    28
     {
yann@748
    29
@@ -38,7 +38,7 @@
yann@748
    30
 
yann@748
    31
 
yann@748
    32
 int
yann@748
    33
-__lll_timedlock_wait (lll_lock_t *futex, const struct timespec *abstime)
yann@748
    34
+__lll_timedlock_wait (int *futex, const struct timespec *abstime)
yann@748
    35
 {
yann@748
    36
   /* Reject invalid timeouts.  */
yann@748
    37
   if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
yann@748
    38
@@ -78,7 +78,7 @@
yann@748
    39
 /* These don't get included in libc.so  */
yann@748
    40
 #ifdef IS_IN_libpthread
yann@748
    41
 int
yann@748
    42
-lll_unlock_wake_cb (lll_lock_t *futex)
yann@748
    43
+lll_unlock_wake_cb (int *futex)
yann@748
    44
 {
yann@748
    45
   int val = atomic_exchange_rel (futex, 0);
yann@748
    46
 
yann@955
    47
diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
yann@955
    48
--- glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h	2006-09-07 18:34:43.000000000 +0200
yann@955
    49
+++ glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h	2008-07-28 23:50:54.000000000 +0200
yann@748
    50
@@ -43,11 +43,6 @@
yann@748
    51
 /* Initialize locks to zero.  */
yann@748
    52
 #define LLL_MUTEX_LOCK_INITIALIZER (0)
yann@748
    53
 
yann@748
    54
-
yann@748
    55
-/* Type for lock object.  */
yann@748
    56
-typedef int lll_lock_t;
yann@748
    57
-
yann@748
    58
-
yann@748
    59
 #define lll_futex_wait(futexp, val) \
yann@748
    60
   ({									      \
yann@748
    61
     INTERNAL_SYSCALL_DECL (__err);					      \
yann@748
    62
@@ -108,7 +103,7 @@
yann@748
    63
   })
yann@748
    64
 
yann@748
    65
 static inline int __attribute__((always_inline))
yann@748
    66
-__lll_mutex_trylock(lll_lock_t *futex)
yann@748
    67
+__lll_mutex_trylock(int *futex)
yann@748
    68
 {
yann@748
    69
   return atomic_compare_and_exchange_val_acq (futex, 1, 0) != 0;
yann@748
    70
 }
yann@748
    71
@@ -124,17 +119,17 @@
yann@748
    72
 
yann@748
    73
 
yann@748
    74
 static inline int __attribute__((always_inline))
yann@748
    75
-__lll_mutex_cond_trylock(lll_lock_t *futex)
yann@748
    76
+__lll_mutex_cond_trylock(int *futex)
yann@748
    77
 {
yann@748
    78
   return atomic_compare_and_exchange_val_acq (futex, 2, 0) != 0;
yann@748
    79
 }
yann@748
    80
 #define lll_mutex_cond_trylock(lock)	__lll_mutex_cond_trylock (&(lock))
yann@748
    81
 
yann@748
    82
 
yann@748
    83
-extern void __lll_lock_wait (lll_lock_t *futex) attribute_hidden;
yann@748
    84
+extern void __lll_lock_wait (int *futex) attribute_hidden;
yann@748
    85
 
yann@748
    86
 static inline void __attribute__((always_inline))
yann@748
    87
-__lll_mutex_lock(lll_lock_t *futex)
yann@748
    88
+__lll_mutex_lock(int *futex)
yann@748
    89
 {
yann@748
    90
   if (atomic_compare_and_exchange_bool_acq (futex, 1, 0) != 0)
yann@748
    91
     __lll_lock_wait (futex);
yann@748
    92
@@ -155,7 +150,7 @@
yann@748
    93
   __lll_robust_mutex_lock (&(futex), id)
yann@748
    94
 
yann@748
    95
 static inline void __attribute__ ((always_inline))
yann@748
    96
-__lll_mutex_cond_lock (lll_lock_t *futex)
yann@748
    97
+__lll_mutex_cond_lock (int *futex)
yann@748
    98
 {
yann@748
    99
   if (atomic_compare_and_exchange_bool_acq (futex, 2, 0) != 0)
yann@748
   100
     __lll_lock_wait (futex);
yann@748
   101
@@ -167,13 +162,13 @@
yann@748
   102
   __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS)
yann@748
   103
 
yann@748
   104
 
yann@748
   105
-extern int __lll_timedlock_wait (lll_lock_t *futex, const struct timespec *)
yann@748
   106
+extern int __lll_timedlock_wait (int *futex, const struct timespec *)
yann@748
   107
 	attribute_hidden;
yann@748
   108
 extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *)
yann@748
   109
 	attribute_hidden;
yann@748
   110
 
yann@748
   111
 static inline int __attribute__ ((always_inline))
yann@748
   112
-__lll_mutex_timedlock (lll_lock_t *futex, const struct timespec *abstime)
yann@748
   113
+__lll_mutex_timedlock (int *futex, const struct timespec *abstime)
yann@748
   114
 {
yann@748
   115
   int result = 0;
yann@748
   116
   if (atomic_compare_and_exchange_bool_acq (futex, 1, 0) != 0)
yann@748
   117
@@ -197,7 +192,7 @@
yann@748
   118
 
yann@748
   119
 
yann@748
   120
 static inline void __attribute__ ((always_inline))
yann@748
   121
-__lll_mutex_unlock (lll_lock_t *futex)
yann@748
   122
+__lll_mutex_unlock (int *futex)
yann@748
   123
 {
yann@748
   124
   int val = atomic_exchange_rel (futex, 0);
yann@748
   125
   if (__builtin_expect (val > 1, 0))
yann@748
   126
@@ -218,7 +213,7 @@
yann@748
   127
 
yann@748
   128
 
yann@748
   129
 static inline void __attribute__ ((always_inline))
yann@748
   130
-__lll_mutex_unlock_force (lll_lock_t *futex)
yann@748
   131
+__lll_mutex_unlock_force (int *futex)
yann@748
   132
 {
yann@748
   133
   (void) atomic_exchange_rel (futex, 0);
yann@748
   134
   lll_futex_wake (futex, 1);
yann@748
   135
@@ -239,7 +234,7 @@
yann@748
   136
 #define THREAD_INIT_LOCK(PD, LOCK) \
yann@748
   137
   (PD)->LOCK = LLL_LOCK_INITIALIZER
yann@748
   138
 
yann@748
   139
-extern int lll_unlock_wake_cb (lll_lock_t *__futex) attribute_hidden;
yann@748
   140
+extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
yann@748
   141
 
yann@748
   142
 /* The states of a lock are:
yann@748
   143
     0  -  untaken
yann@955
   144
diff -durN glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
yann@955
   145
--- glibc-2.6.1.orig/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h	2006-08-04 20:54:56.000000000 +0200
yann@955
   146
+++ glibc-2.6.1/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h	2008-07-28 23:51:14.000000000 +0200
yann@748
   147
@@ -227,9 +227,6 @@
yann@748
   148
 /* Our internal lock implementation is identical to the binary-compatible
yann@748
   149
    mutex implementation. */
yann@748
   150
 
yann@748
   151
-/* Type for lock object.  */
yann@748
   152
-typedef int lll_lock_t;
yann@748
   153
-
yann@748
   154
 /* Initializers for lock.  */
yann@748
   155
 #define LLL_LOCK_INITIALIZER		(0)
yann@748
   156
 #define LLL_LOCK_INITIALIZER_LOCKED	(1)