diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 15:50:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-03 15:50:30 +0000 |
| commit | ce31a3b1c588f8b8a5c7702c6460d6bd4386bd95 (patch) | |
| tree | 3b8f897b1e40b26d31f18e8095cfd9102612de71 /nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S | |
| parent | 96c502084aeb396c8794723b32bdcad58a634695 (diff) | |
| download | glibc-ce31a3b1c588f8b8a5c7702c6460d6bd4386bd95.tar glibc-ce31a3b1c588f8b8a5c7702c6460d6bd4386bd95.tar.gz glibc-ce31a3b1c588f8b8a5c7702c6460d6bd4386bd95.tar.bz2 glibc-ce31a3b1c588f8b8a5c7702c6460d6bd4386bd95.zip | |
* intl/dcigettext.c (_nl_find_msg): Free encoding if __gconv_open
failed.
* intl/finddomain.c (_nl_find_domain): Free normalized_codeset
on failure.
* elf/dl-load.c (decompose_rpath): Free copy if result couldn't be
allocated.
2007-08-03 Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S index 85ce909259..6ef7fcf0cb 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2007 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 @@ -21,13 +21,10 @@ #include <pthread-errnos.h> #include <tcb-offsets.h> #include <structsem.h> +#include <lowlevellock.h> #include "lowlevel-atomic.h" -#define SYS_gettimeofday __NR_gettimeofday -#define SYS_futex 240 -#define FUTEX_WAIT 0 - #if VALUE != 0 # error "code needs to be rewritten for VALUE != 0" #endif @@ -138,24 +135,26 @@ __new_sem_wait: mov.l .Lerrno0, r0 stc gbr, r1 mov.l @(r0, r12), r0 - add r1, r0 - mov.l r8, @r0 + bra .Lexit + add r1, r0 + .align 2 +.Lerrno0: + .long errno@GOTTPOFF +.Lexit: #else mov.l .Lerrloc0, r1 bsrf r1 nop .Lerrloc0b: - mov.l r8, @r0 #endif + mov.l r8, @r0 bra 9b mov #-1, r0 + .align 2 .Lgot0: .long _GLOBAL_OFFSET_TABLE_ -#if USE___THREAD -.Lerrno0: - .long errno@GOTTPOFF -#else +#if !USE___THREAD .Lerrloc0: .long __errno_location@PLT-(.Lerrloc0b-.) #endif |