summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.topdeps1
-rw-r--r--.topmsg7
-rw-r--r--sysdeps/l4/hurd/pt-sysdep.h9
-rw-r--r--sysdeps/mach/hurd/pt-sysdep.h4
4 files changed, 16 insertions, 5 deletions
diff --git a/.topdeps b/.topdeps
new file mode 100644
index 0000000..1f7391f
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master
diff --git a/.topmsg b/.topmsg
new file mode 100644
index 0000000..d2d5b17
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,7 @@
+Subject: [PATCH] Fix inline usage for recent GCC versions.
+
+From: 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 13e235d..0ce6611 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, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002, 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
@@ -53,7 +53,7 @@
thread; \
})
-extern inline void
+static inline void
__attribute__((__always_inline__))
__pthread_stack_dealloc (void *stackaddr, size_t stacksize)
{