+2002-08-29 Jakub Jelinek <jakub@redhat.com>
+
+ * stdio-common/vfprintf.c (vfprintf): Add builtin_expect for
+ string_malloced, it is unlikely to be set.
+ Only call free with non-NULL workspace.
+ * sysdeps/sparc/sparc32/sparcv9/Makefile (sysdep-CFLAGS): Use
+ -mcpu=ultrasparc, not only tune for it.
+ (ASFLAGS*): Set unconditionally.
+
+2002-08-29 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/generic/readelflib.c (process_elf_file): Make loadaddr
+ ElfW(Addr). Don't mask upper 32-bits and lower 12 bits off from
+ p_vaddr/p_offset when computing loadaddr.
+
2002-08-29 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Bump to 2.2.92.
+2002-04-24 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * spinlock.c (__pthread_lock): Fix spurious wakeup
+ handling. Don't clear lowest bit of list pointer as sign the thread
+ is still on the wait list. Don't restart after spurious wakeup
+ with spinning to get the lock.
+ (__pthread_unlock): Take set lowest bit into account when handling
+ pointer to list elements.
+ Patch by Steve Munroe <sjmunroe@us.ibm.com>.
+
2002-08-28 Roland McGrath <roland@redhat.com>
* sysdeps/pthread/timer_routines.c (thread_func): Fix type in cast.
spurious_wakeup_count = 0;
spin_count = 0;
-again:
-
/* On SMP, try spinning to get the lock. */
if (__pthread_smp_kernel) {
lock->__spinlock += (spin_count - lock->__spinlock) / 8;
}
+again:
+
/* No luck, try once more or suspend. */
do {
}
if (self != NULL) {
- THREAD_SETMEM(self, p_nextlock, (pthread_descr) (oldstatus & ~1L));
+ THREAD_SETMEM(self, p_nextlock, (pthread_descr) (oldstatus));
/* Make sure the store in p_nextlock completes before performing
the compare-and-swap */
MEMORY_BARRIER();
maxprio = thr->p_priority;
}
ptr = &(thr->p_nextlock);
- thr = *ptr;
+ thr = (pthread_descr)((long)(thr->p_nextlock) & ~1L);
}
/* Remove max prio thread from waiting list. */
least significant bit is clear. */
thr = (pthread_descr) (oldstatus & ~1L);
if (! __compare_and_swap_with_release_semantics
- (&lock->__status, oldstatus, (long)(thr->p_nextlock)))
+ (&lock->__status, oldstatus, (long)(thr->p_nextlock) & ~1L))
goto again;
} else {
/* No risk of concurrent access, remove max prio thread normally.
But in this case we must also flip the least significant bit
of the status to mark the lock as released. */
- thr = *maxptr;
+ thr = (pthread_descr)((long)*maxptr & ~1L);
*maxptr = thr->p_nextlock;
/* Ensure deletion from linked list completes before we
outstring (string, len); \
if (left) \
PAD (L' '); \
- if (string_malloced) \
+ if (__builin_expect (string_malloced, 0)) \
free (string); \
} \
break;
outstring (string, len); \
if (left) \
PAD (' '); \
- if (string_malloced) \
+ if (__builtin_expect (string_malloced, 0)) \
free (string); \
} \
break;
/* The format is correctly handled. */
++nspecs_done;
- free (workstart);
+ if (__builtin_expect (workstart != NULL, 0))
+ free (workstart);
workstart = NULL;
/* Look for next format specifier. */
break;
}
- free (workstart);
+ if (__builtin_expect (workstart != NULL, 0))
+ free (workstart);
workstart = NULL;
/* Write the following constant string. */
}
all_done:
- free (workstart);
+ if (__builtin_expect (workstart != NULL, 0))
+ free (workstart);
/* Unlock the stream. */
#ifdef USE_IN_LIBIO
_IO_funlockfile (s);
} \
} \
while (0);
-
+
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
{
int i;
unsigned int j;
- int loadaddr;
+ ElfW(Addr) loadaddr;
unsigned int dynamic_addr;
size_t dynamic_size;
char *program_interpreter;
-
+
ElfW(Ehdr) *elf_header;
ElfW(Phdr) *elf_pheader, *segment;
ElfW(Dyn) *dynamic_segment, *dyn_entry;
- char *dynamic_strings;
+ char *dynamic_strings;
elf_header = (ElfW(Ehdr) *) file_contents;
*osversion = 0;
elf_header->e_type);
return 1;
}
-
+
/* Get information from elf program header. */
elf_pheader = (ElfW(Phdr) *) (elf_header->e_phoff + file_contents);
check_ptr (elf_pheader);
/* The library is an elf library, now search for soname and
libc5/libc6. */
*flag = FLAG_ELF;
-
+
loadaddr = -1;
dynamic_addr = 0;
dynamic_size = 0;
{
case PT_LOAD:
if (loadaddr == -1)
- loadaddr = (segment->p_vaddr & 0xfffff000)
- - (segment->p_offset & 0xfffff000);
+ loadaddr = segment->p_vaddr - segment_p_offset;
break;
case PT_DYNAMIC:
default:
break;
}
-
+
}
if (loadaddr == -1)
{
/* Now we can read the dynamic sections. */
if (dynamic_size == 0)
return 1;
-
+
dynamic_segment = (ElfW(Dyn) *) (file_contents + dynamic_addr);
check_ptr (dynamic_segment);
if (dyn_entry->d_tag == DT_NEEDED)
{
-
+
if (*flag == FLAG_ELF)
{
/* Check if this is enough to classify the binary. */
else if (dyn_entry->d_tag == DT_SONAME)
*soname = xstrdup (name);
-
+
/* Do we have everything we need? */
if (*soname && *flag != FLAG_ELF)
return 0;
-sysdep-CFLAGS += -mcpu=v8 -mtune=ultrasparc -Wa,-Av9a
+sysdep-CFLAGS += -mcpu=ultrasparc -Wa,-Av9a
ifeq ($(subdir),csu)
sysdep_routines += hp-timing
static-only-routines += hp-timing
endif
-ifeq ($(subst gnulib,string,$(subdir)),string)
ASFLAGS-.o += -Wa,-Av9a
ASFLAGS-.os += -Wa,-Av9a
ASFLAGS-.op += -Wa,-Av9a
ASFLAGS-.og += -Wa,-Av9a
ASFLAGS-.ob += -Wa,-Av9a
ASFLAGS-.oS += -Wa,-Av9a
-endif