2003-08-11  Ulrich Drepper  <drepper@redhat.com>

	* assert/assert.h: Use __builtin_expect in assert and
	assert_perror definitions if possible.
This commit is contained in:
Ulrich Drepper 2003-08-12 03:41:23 +00:00
parent 334fcf2a65
commit ca91553a6f
4 changed files with 31 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2003-08-11 Ulrich Drepper <drepper@redhat.com>
* assert/assert.h: Use __builtin_expect in assert and
assert_perror definitions if possible.
2003-08-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/ldsodefs.h (_rtld_global): Add

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,1992,1994-1999,2000,2001 Free Software Foundation, Inc.
/* Copyright (C) 1991,1992,1994-2001,2003 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
@ -84,16 +84,33 @@ extern void __assert (const char *__assertion, const char *__file, int __line)
__END_DECLS
# define assert(expr) \
/* For the macro definition we use gcc's __builtin_expect if possible
to generate good code for the non-error case. gcc 3.0 is a good
enough estimate for when the feature became available. */
# if __GNUC_PREREQ (3, 0)
# define assert(expr) \
(__ASSERT_VOID_CAST (__builtin_expect (expr, 1) ? 0 : \
(__assert_fail (__STRING(expr), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
# else
# define assert(expr) \
(__ASSERT_VOID_CAST ((expr) ? 0 : \
(__assert_fail (__STRING(expr), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
# endif
# ifdef __USE_GNU
# define assert_perror(errnum) \
# if __GNUC_PREREQ (3, 0)
# define assert_perror(errnum) \
(__ASSERT_VOID_CAST (!(errnum) ? 0 : \
(__assert_perror_fail ((errnum), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
# else
# define assert_perror(errnum) \
(__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 : \
(__assert_perror_fail ((errnum), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
# endif
# endif
/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'

View File

@ -1,3 +1,8 @@
2003-08-11 Steven Munroe <sjmunroe@us.ibm.com>
* manager.c (pthread_start_thread) [!(USE_TLS && HAVE___THREAD)]:
Correct spelling of per thread resolver state.
2003-08-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/pthread/bits/libc-lock.h [_LIBC && SHARED]

View File

@ -290,7 +290,7 @@ pthread_start_thread(void *arg)
__uselocale (LC_GLOBAL_LOCALE);
#else
/* Initialize __resp. */
__resp = &self->p_resp;
__resp = &self->p_res;
#endif
/* Make gdb aware of new thread */
if (__pthread_threads_debug && __pthread_sig_debug > 0) {