[glibc] 01/03: hurd-i386/tg-extern_inline.diff: Fix using inlines in libc
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit 4013b1b7996622c5d1231e89285832390fe9d626
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Aug 23 17:46:39 2016 +0000
hurd-i386/tg-extern_inline.diff: Fix using inlines in libc
---
debian/changelog | 1 +
debian/patches/hurd-i386/tg-extern_inline.diff | 166 ++++++++++++++++---------
2 files changed, 108 insertions(+), 59 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37715f9..a8d7086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ glibc (2.23-5) UNRELEASED; urgency=medium
* libc0.3.symbols.hurd-i386: Update symbols.
* hurd-i386/tg-sysvshm.diff: Update from topgit.
* hurd-i386/cvs-check-local-headers.diff: Update from git.
+ * hurd-i386/tg-extern_inline.diff: Fix using inlines in libc.
-- Samuel Thibault <sthibault@debian.org> Tue, 09 Aug 2016 01:45:00 +0200
diff --git a/debian/patches/hurd-i386/tg-extern_inline.diff b/debian/patches/hurd-i386/tg-extern_inline.diff
index 1a7ee99..81ffa50 100644
--- a/debian/patches/hurd-i386/tg-extern_inline.diff
+++ b/debian/patches/hurd-i386/tg-extern_inline.diff
@@ -22,8 +22,10 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
sysdeps/mach/i386/machine-lock.h | 12 ++++++++++++
12 files changed, 139 insertions(+), 3 deletions(-)
---- a/hurd/hurd.h
-+++ b/hurd/hurd.h
+Index: glibc-2.23/hurd/hurd.h
+===================================================================
+--- glibc-2.23.orig/hurd/hurd.h
++++ glibc-2.23/hurd/hurd.h
@@ -46,6 +46,9 @@
#define _HURD_H_EXTERN_INLINE __extern_inline
#endif
@@ -42,27 +44,31 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
/* Basic ports and info, initialized by startup. */
---- a/hurd/hurd/fd.h
-+++ b/hurd/hurd/fd.h
-@@ -58,6 +58,9 @@ extern struct mutex _hurd_dtable_lock; /
+Index: glibc-2.23/hurd/hurd/fd.h
+===================================================================
+--- glibc-2.23.orig/hurd/hurd/fd.h
++++ glibc-2.23/hurd/hurd/fd.h
+@@ -58,6 +58,10 @@ extern struct mutex _hurd_dtable_lock; /
NULL. The cell is unlocked; when ready to use it, lock it and check for
it being unused. */
+struct hurd_fd *_hurd_fd_get (int fd);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_FD_H_EXTERN_INLINE struct hurd_fd *
_hurd_fd_get (int fd)
{
-@@ -90,6 +93,7 @@ _hurd_fd_get (int fd)
+@@ -90,6 +94,8 @@ _hurd_fd_get (int fd)
return descriptor;
}
++# endif
+#endif
/* Evaluate EXPR with the variable `descriptor' bound to a pointer to the
-@@ -137,6 +141,9 @@ _hurd_fd_get (int fd)
+@@ -137,6 +143,9 @@ _hurd_fd_get (int fd)
/* Check if ERR should generate a signal.
Returns the signal to take, or zero if none. */
@@ -72,7 +78,7 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
_HURD_FD_H_EXTERN_INLINE int
_hurd_fd_error_signal (error_t err)
{
-@@ -153,11 +160,15 @@ _hurd_fd_error_signal (error_t err)
+@@ -153,11 +162,15 @@ _hurd_fd_error_signal (error_t err)
return 0;
}
}
@@ -88,7 +94,7 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
_HURD_FD_H_EXTERN_INLINE error_t
_hurd_fd_error (int fd, error_t err)
{
-@@ -170,20 +181,28 @@ _hurd_fd_error (int fd, error_t err)
+@@ -170,20 +183,28 @@ _hurd_fd_error (int fd, error_t err)
}
return err;
}
@@ -117,7 +123,7 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
_HURD_FD_H_EXTERN_INLINE int
__hurd_sockfail (int fd, int flags, error_t err)
{
-@@ -192,6 +211,7 @@ __hurd_sockfail (int fd, int flags, erro
+@@ -192,6 +213,7 @@ __hurd_sockfail (int fd, int flags, erro
errno = err;
return -1;
}
@@ -125,27 +131,31 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
/* Set up *FD to have PORT its server port, doing appropriate ctty magic.
Does no locking or unlocking. */
---- a/hurd/hurd/port.h
-+++ b/hurd/hurd/port.h
-@@ -60,6 +60,9 @@ struct hurd_port
+Index: glibc-2.23/hurd/hurd/port.h
+===================================================================
+--- glibc-2.23.orig/hurd/hurd/port.h
++++ glibc-2.23/hurd/hurd/port.h
+@@ -60,6 +60,10 @@ struct hurd_port
/* Initialize *PORT to INIT. */
+void _hurd_port_init (struct hurd_port *port, mach_port_t init);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE void
_hurd_port_init (struct hurd_port *port, mach_port_t init)
{
-@@ -67,6 +70,7 @@ _hurd_port_init (struct hurd_port *port,
+@@ -67,6 +71,8 @@ _hurd_port_init (struct hurd_port *port,
port->users = NULL;
port->port = init;
}
++# endif
+#endif
/* Cleanup function for non-local exits. */
-@@ -75,6 +79,11 @@ extern void _hurd_port_cleanup (void *,
+@@ -75,6 +81,12 @@ extern void _hurd_port_cleanup (void *,
/* Get a reference to *PORT, which is locked.
Pass return value and LINK to _hurd_port_free when done. */
@@ -153,14 +163,16 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+_hurd_port_locked_get (struct hurd_port *port,
+ struct hurd_userlink *link);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE mach_port_t
_hurd_port_locked_get (struct hurd_port *port,
struct hurd_userlink *link)
-@@ -90,9 +99,15 @@ _hurd_port_locked_get (struct hurd_port
+@@ -90,9 +102,17 @@ _hurd_port_locked_get (struct hurd_port
__spin_unlock (&port->lock);
return result;
}
++# endif
+#endif
/* Same, but locks PORT first. */
@@ -169,14 +181,16 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+_hurd_port_get (struct hurd_port *port,
+ struct hurd_userlink *link);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE mach_port_t
_hurd_port_get (struct hurd_port *port,
struct hurd_userlink *link)
-@@ -104,10 +119,17 @@ _hurd_port_get (struct hurd_port *port,
+@@ -104,10 +124,19 @@ _hurd_port_get (struct hurd_port *port,
HURD_CRITICAL_END;
return result;
}
++# endif
+#endif
@@ -187,14 +201,16 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+ struct hurd_userlink *link,
+ mach_port_t used_port);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE void
_hurd_port_free (struct hurd_port *port,
struct hurd_userlink *link,
-@@ -127,11 +149,15 @@ _hurd_port_free (struct hurd_port *port,
+@@ -127,11 +156,17 @@ _hurd_port_free (struct hurd_port *port,
if (dealloc)
__mach_port_deallocate (__mach_task_self (), used_port);
}
++# endif
+#endif
@@ -203,83 +219,97 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE void
_hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
{
-@@ -142,9 +168,13 @@ _hurd_port_locked_set (struct hurd_port
+@@ -142,9 +177,15 @@ _hurd_port_locked_set (struct hurd_port
if (old != MACH_PORT_NULL)
__mach_port_deallocate (__mach_task_self (), old);
}
++# endif
+#endif
/* Same, but locks PORT first. */
+void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_PORT_H_EXTERN_INLINE void
_hurd_port_set (struct hurd_port *port, mach_port_t newport)
{
-@@ -153,6 +183,7 @@ _hurd_port_set (struct hurd_port *port,
+@@ -153,6 +194,8 @@ _hurd_port_set (struct hurd_port *port,
_hurd_port_locked_set (port, newport);
HURD_CRITICAL_END;
}
++# endif
+#endif
#endif /* hurd/port.h */
---- a/hurd/hurd/signal.h
-+++ b/hurd/hurd/signal.h
-@@ -129,13 +129,15 @@ extern struct hurd_sigstate *_hurd_self_
+Index: glibc-2.23/hurd/hurd/signal.h
+===================================================================
+--- glibc-2.23.orig/hurd/hurd/signal.h
++++ glibc-2.23/hurd/hurd/signal.h
+@@ -128,6 +128,8 @@ extern struct hurd_sigstate *_hurd_self_
#define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline
#endif
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate *
_hurd_self_sigstate (void)
{
- if (THREAD_SELF->_hurd_sigstate == NULL)
+@@ -135,6 +137,8 @@ _hurd_self_sigstate (void)
THREAD_SELF->_hurd_sigstate = _hurd_thread_sigstate (__mach_thread_self ());
return THREAD_SELF->_hurd_sigstate;
}
++# endif
+#endif
/* Thread listening on our message port; also called the "signal thread". */
-@@ -162,6 +164,9 @@ extern int _hurd_core_limit;
+@@ -161,6 +165,10 @@ extern int _hurd_core_limit;
interrupted lest the signal handler try to take the same lock and
deadlock result. */
+void *_hurd_critical_section_lock (void);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_SIGNAL_H_EXTERN_INLINE void *
_hurd_critical_section_lock (void)
{
-@@ -193,7 +198,11 @@ _hurd_critical_section_lock (void)
+@@ -191,7 +199,13 @@ _hurd_critical_section_lock (void)
_hurd_critical_section_unlock to unlock it. */
return ss;
}
++# endif
+#endif
+void _hurd_critical_section_unlock (void *our_lock);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_SIGNAL_H_EXTERN_INLINE void
_hurd_critical_section_unlock (void *our_lock)
{
-@@ -216,6 +225,7 @@ _hurd_critical_section_unlock (void *our
+@@ -214,6 +228,8 @@ _hurd_critical_section_unlock (void *our
__msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ());
}
}
++# endif
+#endif
/* Convenient macros for simple uses of critical sections.
These two must be used as a pair at the same C scoping level. */
---- a/hurd/hurd/userlink.h
-+++ b/hurd/hurd/userlink.h
-@@ -76,6 +76,11 @@ struct hurd_userlink
+Index: glibc-2.23/hurd/hurd/userlink.h
+===================================================================
+--- glibc-2.23.orig/hurd/hurd/userlink.h
++++ glibc-2.23/hurd/hurd/userlink.h
+@@ -76,6 +76,12 @@ struct hurd_userlink
/* Attach LINK to the chain of users at *CHAINP. */
@@ -287,14 +317,16 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+_hurd_userlink_link (struct hurd_userlink **chainp,
+ struct hurd_userlink *link);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_USERLINK_H_EXTERN_INLINE void
_hurd_userlink_link (struct hurd_userlink **chainp,
struct hurd_userlink *link)
-@@ -96,11 +101,15 @@ _hurd_userlink_link (struct hurd_userlin
+@@ -96,11 +102,17 @@ _hurd_userlink_link (struct hurd_userlin
link->thread.prevp = thread_chainp;
*thread_chainp = link;
}
++# endif
+#endif
@@ -303,37 +335,43 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+int _hurd_userlink_unlink (struct hurd_userlink *link);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_USERLINK_H_EXTERN_INLINE int
_hurd_userlink_unlink (struct hurd_userlink *link)
{
-@@ -123,6 +132,7 @@ _hurd_userlink_unlink (struct hurd_userl
+@@ -123,6 +135,8 @@ _hurd_userlink_unlink (struct hurd_userl
return dealloc;
}
++# endif
+#endif
/* Clear all users from *CHAINP. Call this when the resource *CHAINP
-@@ -131,6 +141,9 @@ _hurd_userlink_unlink (struct hurd_userl
+@@ -131,6 +145,10 @@ _hurd_userlink_unlink (struct hurd_userl
value is zero, someone is still using the resource and they will
deallocate it when they are finished. */
+int _hurd_userlink_clear (struct hurd_userlink **chainp);
+
-+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
++#if defined __USE_EXTERN_INLINES && defined _LIBC
++# if IS_IN (libc)
_HURD_USERLINK_H_EXTERN_INLINE int
_hurd_userlink_clear (struct hurd_userlink **chainp)
{
-@@ -143,5 +156,6 @@ _hurd_userlink_clear (struct hurd_userli
+@@ -143,5 +161,7 @@ _hurd_userlink_clear (struct hurd_userli
*chainp = NULL;
return 0;
}
++# endif
+#endif
#endif /* hurd/userlink.h */
---- a/mach/lock-intern.h
-+++ b/mach/lock-intern.h
+Index: glibc-2.23/mach/lock-intern.h
+===================================================================
+--- glibc-2.23.orig/mach/lock-intern.h
++++ glibc-2.23/mach/lock-intern.h
@@ -28,11 +28,15 @@
/* Initialize LOCK. */
@@ -407,8 +445,10 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+#endif
#endif /* lock-intern.h */
---- a/mach/mach/mig_support.h
-+++ b/mach/mach/mig_support.h
+Index: glibc-2.23/mach/mach/mig_support.h
+===================================================================
+--- glibc-2.23.orig/mach/mach/mig_support.h
++++ glibc-2.23/mach/mach/mig_support.h
@@ -66,6 +66,8 @@ extern void mig_reply_setup (const mach_
/* Idiocy support function. */
extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len);
@@ -426,15 +466,19 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
---- a/mach/spin-lock.c
-+++ b/mach/spin-lock.c
+Index: glibc-2.23/mach/spin-lock.c
+===================================================================
+--- glibc-2.23.orig/mach/spin-lock.c
++++ glibc-2.23/mach/spin-lock.c
@@ -1,3 +1,4 @@
+#define __USE_EXTERN_INLINES 1
#define _EXTERN_INLINE /* Empty to define the real functions. */
#include "spin-lock.h"
---- a/sysdeps/generic/machine-lock.h
-+++ b/sysdeps/generic/machine-lock.h
+Index: glibc-2.23/sysdeps/generic/machine-lock.h
+===================================================================
+--- glibc-2.23.orig/sysdeps/generic/machine-lock.h
++++ glibc-2.23/sysdeps/generic/machine-lock.h
@@ -34,14 +34,21 @@ typedef volatile int __spin_lock_t;
/* Unlock LOCK. */
@@ -477,8 +521,10 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
#endif /* machine-lock.h */
---- a/sysdeps/generic/machine-sp.h
-+++ b/sysdeps/generic/machine-sp.h
+Index: glibc-2.23/sysdeps/generic/machine-sp.h
+===================================================================
+--- glibc-2.23.orig/sysdeps/generic/machine-sp.h
++++ glibc-2.23/sysdeps/generic/machine-sp.h
@@ -25,11 +25,15 @@
#define _EXTERN_INLINE __extern_inline
#endif
@@ -495,8 +541,10 @@ glibc-2.8/debian/patches/hurd-i386/submitted-extern_inline.diff 3057
+#endif
#endif /* machine-sp.h */
---- a/sysdeps/mach/i386/machine-lock.h
-+++ b/sysdeps/mach/i386/machine-lock.h
+Index: glibc-2.23/sysdeps/mach/i386/machine-lock.h
+===================================================================
+--- glibc-2.23.orig/sysdeps/mach/i386/machine-lock.h
++++ glibc-2.23/sysdeps/mach/i386/machine-lock.h
@@ -34,6 +34,9 @@ typedef volatile int __spin_lock_t;
/* Unlock LOCK. */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: