diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2010-04-12 12:49:10 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2010-04-12 12:50:25 +0200 |
| commit | c28241162c00127bb5c0d03bbbbfc835a15e8f68 (patch) | |
| tree | a72ce25bbf432cbf12407609e380e504bf168c8b | |
| parent | 21e294adba17faaa01675c04557a385d32768b46 (diff) | |
| parent | 66e1606cdf6d7c535fa9036f13d90260af2a9b73 (diff) | |
Merge remote branch 'remotes/savannah/master-fix_inline' into t/fix_inline
| -rw-r--r-- | .topmsg | 9 | ||||
| -rw-r--r-- | sysdeps/l4/hurd/pt-sysdep.h | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/pt-sysdep.h | 4 |
3 files changed, 13 insertions, 9 deletions
@@ -1,6 +1,7 @@ -From: Thomas Schwinge <thomas@schwinge.name> -Subject: [PATCH] t/fix_inline +Subject: [PATCH] Fix inline usage for recent GCC versions. -<patch description> +From: Thomas Schwinge <thomas@schwinge.name> -Signed-off-by: Thomas Schwinge <thomas@schwinge.name> +* sysdeps/l4/hurd/pt-sysdep.h (_pthread_self, __pthread_stack_dealloc): Use +static inline instead of extern inline. +* sysdeps/mach/hurd/pt-sysdep.h (__pthread_stack_dealloc): Likewise. diff --git a/sysdeps/l4/hurd/pt-sysdep.h b/sysdeps/l4/hurd/pt-sysdep.h index 08bcd14..87303b6 100644 --- a/sysdeps/l4/hurd/pt-sysdep.h +++ b/sysdeps/l4/hurd/pt-sysdep.h @@ -1,5 +1,8 @@ /* Internal definitions for pthreads library. - Copyright (C) 2000, 2002, 2005, 2007, 2008 Free Software Foundation, Inc. + + Copyright (C) 2000, 2002, 2005, 2007, 2008, 2009 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 @@ -44,14 +47,14 @@ void *exception_area_va; \ l4_word_t my_errno; -extern inline struct __pthread * +static inline struct __pthread * __attribute__((__always_inline__)) _pthread_self (void) { return (struct __pthread *) l4_user_defined_handle (); } -extern inline void +static inline void __attribute__((__always_inline__)) __pthread_stack_dealloc (void *stackaddr, size_t stacksize) { diff --git a/sysdeps/mach/hurd/pt-sysdep.h b/sysdeps/mach/hurd/pt-sysdep.h index f14a136..d62264e 100644 --- a/sysdeps/mach/hurd/pt-sysdep.h +++ b/sysdeps/mach/hurd/pt-sysdep.h @@ -1,5 +1,5 @@ /* Internal defenitions for pthreads library. - Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2008, 2009 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 @@ -53,7 +53,7 @@ thread; \ }) -extern inline void +static inline void __attribute__((__always_inline__)) __pthread_stack_dealloc (void *stackaddr, size_t stacksize) { |