aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/Versions3
-rw-r--r--sysdeps/unix/sysv/linux/makedev.c41
-rw-r--r--sysdeps/unix/sysv/linux/sys/sysmacros.h63
5 files changed, 85 insertions, 25 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 219b3d80f9..cdd64e36b4 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -15,6 +15,7 @@ ldd-rewrite.sed
lddlibc4.c
linux_fsinfo.h
llseek.c
+makedev.c
ntp_gettime.c
readahead.c
s_pread64.c
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index c67376d1f8..6864050ea9 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -13,7 +13,7 @@ endif
ifeq ($(subdir),misc)
sysdep_routines += sysctl clone llseek umount umount2 readahead \
- setfsuid setfsgid
+ setfsuid setfsgid makedev
CFLAGS-gethostid.c = -fexceptions
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 7cb8327368..3920f02e0f 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -109,6 +109,9 @@ libc {
# New kernel interfaces.
epoll_create; epoll_ctl; epoll_wait;
}
+ GLIBC_2.3.3 {
+ major; minor; makedev;
+ }
GLIBC_PRIVATE {
# needed by libpthread.
__libc_sigaction;
diff --git a/sysdeps/unix/sysv/linux/makedev.c b/sysdeps/unix/sysv/linux/makedev.c
new file mode 100644
index 0000000000..4708e6d419
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/makedev.c
@@ -0,0 +1,41 @@
+/* Definitions of functions to access `dev_t' values.
+ Copyright (C) 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
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <endian.h>
+#include <sys/sysmacros.h>
+
+unsigned int
+major (unsigned long long int dev)
+{
+ return ((dev >> 8) & 0xfff) | ((unsigned int) (dev >> 32) & ~0xfff);
+}
+
+unsigned int
+minor (unsigned long long int dev)
+{
+ return (dev & 0xff) | ((unsigned int) (dev >> 12) & ~0xff);
+}
+
+unsigned long long int
+makedev (unsigned int major, unsigned int minor)
+{
+ return ((minor & 0xff) | ((major & 0xfff) << 8)
+ | (((unsigned long long int) (minor & ~0xff)) << 12)
+ | (((unsigned long long int) (major & ~0xfff)) << 32));
+}
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index e482aab174..ca1e0d40dc 100644
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -1,5 +1,5 @@
/* Definitions of macros to access `dev_t' values.
- Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 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
@@ -20,30 +20,45 @@
#ifndef _SYS_SYSMACROS_H
#define _SYS_SYSMACROS_H 1
-/* For compatibility we provide alternative names.
-
- The problem here is that compilers other than GCC probably don't
- have the `long long' type and so `dev_t' is actually an array. */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define major(dev) ((int)(((dev) >> 8) & 0xff))
-# define minor(dev) ((int)((dev) & 0xff))
-# define makedev(major, minor) ((((unsigned int) (major)) << 8) \
- | ((unsigned int) (minor)))
-#else
-/* We need to know the word order here. This assumes that the word order
- is consistent with the byte order. */
-# include <endian.h>
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define major(dev) (((dev).__val[1] >> 8) & 0xff)
-# define minor(dev) ((dev).__val[1] & 0xff)
-# define makedev(major, minor) { 0, ((((unsigned int) (major)) << 8) \
- | ((unsigned int) (minor))) }
-# else
-# define major(dev) (((dev).__val[0] >> 8) & 0xff)
-# define minor(dev) ((dev).__val[0] & 0xff)
-# define makedev(major, minor) { ((((unsigned int) (major)) << 8) \
- | ((unsigned int) (minor))), 0 }
+#include <features.h>
+
+/* If the compiler does not know long long it is out of luck. We are
+ not going to hack weird hacks to support the dev_t representation
+ they need. */
+#ifdef __GLIBC_HAVE_LONG_LONG
+extern unsigned int inline major (unsigned long long int __dev) __THROW;
+extern unsigned int inline minor (unsigned long long int __dev) __THROW;
+extern unsigned long long int inline makedev (unsigned int __major,
+ unsigned int __minor) __THROW;
+
+# if defined __GNUC__ && __GNUC__ >= 2
+extern inline unsigned int
+major (unsigned long long int __dev)
+{
+ return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
+}
+
+extern inline unsigned int
+minor (unsigned long long int __dev)
+{
+ return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
+}
+
+extern inline unsigned long long int
+makedev (unsigned int __major, unsigned int __minor)
+{
+ return ((__minor & 0xff) | ((__major & 0xfff) << 8)
+ | (((unsigned long long int) (__minor & ~0xff)) << 12)
+ | (((unsigned long long int) (__major & ~0xfff)) << 32));
+}
# endif
+
+
+/* Historically the three symbols were macros. In case some programs
+ use #ifdef to check for definition provide some dummy macros. */
+# define major(dev) major (dev)
+# define minor(dev) minor (dev)
+# define makedev(maj, min) makedev (maj, min)
#endif
#endif /* sys/sysmacros.h */