[glibc] 01/01: patches/hurd-i386/git-bits-sysmacros.h.diff: New patch
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.25
in repository glibc.
commit 855f3887a1d51a3e51fdfd87f6416f5e003f28d4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Aug 27 20:04:39 2017 +0000
patches/hurd-i386/git-bits-sysmacros.h.diff: New patch
---
debian/changelog | 3 +-
debian/patches/hurd-i386/git-bits-sysmacros.h.diff | 86 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 49df181..09c420e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
glibc (2.25-0experimental4) UNRELEASED; urgency=medium
- *
+ [ Samuel Thibault ]
+ * patches/hurd-i386/git-bits-sysmacros.h.diff: New patch.
-- Aurelien Jarno <aurel32@debian.org> Sun, 27 Aug 2017 01:51:15 +0200
diff --git a/debian/patches/hurd-i386/git-bits-sysmacros.h.diff b/debian/patches/hurd-i386/git-bits-sysmacros.h.diff
new file mode 100644
index 0000000..d286dd1
--- /dev/null
+++ b/debian/patches/hurd-i386/git-bits-sysmacros.h.diff
@@ -0,0 +1,86 @@
+commit 2ef8d46913b10cb1cf8adddfe80ce8d1b57d4f46
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Aug 27 22:00:05 2017 +0200
+
+ hurd: Add system-specific sysmacros.h
+
+ * sysdeps/mach/hurd/bits/sysmacros.h: New file.
+
+diff --git a/ChangeLog b/ChangeLog
+index bc1cf94dc3..1b0f15573a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2017-08-27 Samuel Thibault <samuel.thibault@ens-lyon.org>
++
++ * sysdeps/mach/hurd/bits/sysmacros.h: New file.
++
+ 2017-08-25 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/x86/cpu-features.h [__ASSEMBLER__]
+diff --git a/sysdeps/mach/hurd/bits/sysmacros.h b/sysdeps/mach/hurd/bits/sysmacros.h
+new file mode 100644
+index 0000000000..3fc68f8564
+--- /dev/null
++++ b/sysdeps/mach/hurd/bits/sysmacros.h
+@@ -0,0 +1,60 @@
++/* Definitions of macros to access `dev_t' values. Hurd version.
++ Copyright (C) 1996-2017 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
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++#ifndef _BITS_SYSMACROS_H
++#define _BITS_SYSMACROS_H 1
++
++#ifndef _SYS_SYSMACROS_H
++# error "Never include <bits/sysmacros.h> directly; use <sys/sysmacros.h> instead."
++#endif
++
++/* The Hurd version of dev_t in glibc is a 32-bit quantity, with 8-bit
++ major and 24-bit minor numbers. The encoding is mmmmMMmm, where M is a
++ hex digit of the major number and m is a hex digit of the minor number. */
++
++#define __SYSMACROS_DECLARE_MAJOR(DECL_TEMPL) \
++ DECL_TEMPL(unsigned int, major, (__dev_t __dev))
++
++#define __SYSMACROS_DEFINE_MAJOR(DECL_TEMPL) \
++ __SYSMACROS_DECLARE_MAJOR (DECL_TEMPL) \
++ { \
++ return ((__dev & (__dev_t) 0x0000ff00u) >> 8); \
++ }
++
++#define __SYSMACROS_DECLARE_MINOR(DECL_TEMPL) \
++ DECL_TEMPL(unsigned int, minor, (__dev_t __dev))
++
++#define __SYSMACROS_DEFINE_MINOR(DECL_TEMPL) \
++ __SYSMACROS_DECLARE_MINOR (DECL_TEMPL) \
++ { \
++ return (__dev & (__dev_t) 0xffff00ff); \
++ }
++
++#define __SYSMACROS_DECLARE_MAKEDEV(DECL_TEMPL) \
++ DECL_TEMPL(__dev_t, makedev, (unsigned int __major, unsigned int __minor))
++
++#define __SYSMACROS_DEFINE_MAKEDEV(DECL_TEMPL) \
++ __SYSMACROS_DECLARE_MAKEDEV (DECL_TEMPL) \
++ { \
++ __dev_t __dev; \
++ __dev = (((__dev_t) (__major & 0x000000ffu)) << 8); \
++ __dev |= (((__dev_t) (__minor & 0xffff00ffu)) << 0); \
++ return __dev; \
++ }
++
++#endif /* bits/sysmacros.h */
diff --git a/debian/patches/series b/debian/patches/series
index 9a3f867..102c557 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -132,6 +132,7 @@ hurd-i386/cvs-libc_init_secure.diff
hurd-i386/tg2.25-tls.diff
hurd-i386/git-__inet6_scopeid_pton.diff
hurd-i386/local-nocheck-installed-headers.diff
+hurd-i386/git-bits-sysmacros.h.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: