Skip to content

Commit

Permalink
* sysdeps/unix/sysv/linux/mips/bits/socket.h (__cmsg_nxthdr): Use
Browse files Browse the repository at this point in the history
	__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.
  • Loading branch information
Roland McGrath committed Dec 15, 2004
1 parent 9f60a0c commit a2f63c5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 4 additions & 2 deletions sysdeps/mips/bits/dlfcn.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions sysdeps/unix/sysv/linux/mips/bits/socket.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/mips/sys/tas.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a2f63c5

Please sign in to comment.