aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-12-15 01:01:02 +0000
committerRoland McGrath <roland@gnu.org>2004-12-15 01:01:02 +0000
commita2f63c54dd20343ab3ac9cdce7897e0ecbb95e8d (patch)
tree0b30bcd5424e8464d47da1c86757f070900cad6b
parent9f60a0cb5aba12760c29a1dc3a0c4867cdc12ff6 (diff)
downloadglibc-a2f63c54dd20343ab3ac9cdce7897e0ecbb95e8d.tar
glibc-a2f63c54dd20343ab3ac9cdce7897e0ecbb95e8d.tar.gz
glibc-a2f63c54dd20343ab3ac9cdce7897e0ecbb95e8d.tar.bz2
glibc-a2f63c54dd20343ab3ac9cdce7897e0ecbb95e8d.zip
* sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Use
__NTH instead of __THROW in the inline definition. * sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Likewise. * sysdeps/mips/bits/dlfcn.h (RTLD_DEEPBIND): New macro. * sysdeps/unix/sysv/linux/mips/bits/mman.h (PROT_GROWSDOWN, PROT_GROWSUP): New macros.
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/mips/bits/dlfcn.h6
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/socket.h5
-rw-r--r--sysdeps/unix/sysv/linux/mips/sys/tas.h2
4 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c2b87d0858..176a08920d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-18 Maciej W. Rozycki <macro@mips.com>
+
+ * sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Use
+ __NTH instead of __THROW in the inline definition.
+ * sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set): Likewise.
+
+ * sysdeps/mips/bits/dlfcn.h (RTLD_DEEPBIND): New macro.
+
+ * sysdeps/unix/sysv/linux/mips/bits/mman.h
+ (PROT_GROWSDOWN, PROT_GROWSUP): New macros.
+
2004-10-06 Alan Modra <amodra@bigpond.net.au>
* sysdeps/powerpc/powerpc64/ppc-mcount.S (PROF): Don't undef.
diff --git a/sysdeps/mips/bits/dlfcn.h b/sysdeps/mips/bits/dlfcn.h
index c5b4c5950b..a5b5bf53ff 100644
--- a/sysdeps/mips/bits/dlfcn.h
+++ b/sysdeps/mips/bits/dlfcn.h
@@ -1,5 +1,6 @@
/* System dependent definitions for run-time dynamic loading.
- Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2000, 2001, 2004
+ 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
@@ -24,8 +25,9 @@
/* The MODE argument to `dlopen' contains one of the following: */
#define RTLD_LAZY 0x0001 /* Lazy function call binding. */
#define RTLD_NOW 0x0002 /* Immediate function call binding. */
-#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */
+#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */
#define RTLD_NOLOAD 0x00008 /* Do not load the object. */
+#define RTLD_DEEPBIND 0x00010 /* Use deep binding. */
/* If the following bit is set in the MODE argument to `dlopen',
the symbols of the loaded object and its dependencies are made
diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h
index a10c3a711a..1dd82eb866 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h
@@ -1,5 +1,6 @@
/* System-specific socket constants and types. Linux/MIPS version.
- Copyright (C) 1991,92,1994-1999,2000,2001 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 1994-1999, 2000, 2001, 2004
+ 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
@@ -261,7 +262,7 @@ extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr,
# define _EXTERN_INLINE extern __inline
# endif
_EXTERN_INLINE struct cmsghdr *
-__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
+__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg))
{
if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
diff --git a/sysdeps/unix/sysv/linux/mips/sys/tas.h b/sysdeps/unix/sysv/linux/mips/sys/tas.h
index e5180f9475..1183b867b8 100644
--- a/sysdeps/unix/sysv/linux/mips/sys/tas.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/tas.h
@@ -34,7 +34,7 @@ extern int _test_and_set (int *p, int v) __THROW;
# endif
_EXTERN_INLINE int
-_test_and_set (int *p, int v) __THROW
+__NTH (_test_and_set (int *p, int v))
{
int r, t;