aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaz Kojima <kkojima@rr.iij4u.or.jp>2012-02-16 07:21:37 +0900
committerKaz Kojima <kkojima@rr.iij4u.or.jp>2012-02-16 07:21:37 +0900
commitaf1dd5d680f6c454382771334de2c05456418f49 (patch)
treee81166409ea9beb7599b43274f702c5186d64241
parentdf83af673b1597bb6b96c855658931b989ec1551 (diff)
parentd2c736f809690dd69f1cade53a61b99e401bb0e3 (diff)
downloadglibc-af1dd5d680f6c454382771334de2c05456418f49.zip
glibc-af1dd5d680f6c454382771334de2c05456418f49.tar.gz
glibc-af1dd5d680f6c454382771334de2c05456418f49.tar.bz2
Merge branch 'master' of git://sources.redhat.com/git/glibc
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/mach/hurd/malloc-machine.h6
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e153fa5..d106b06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@
2012-02-15 Roland McGrath <roland@hack.frob.com>
+ [BZ #4822]
+ * sysdeps/mach/hurd/malloc-machine.h (madvise): New macro.
+
* mach/devstream.c (cookie_io_functions_t): Macro removed.
(write, read, close): Likewise.
Patch by Aurelien Jarno <aurelien@aurel32.net>.
diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h
index 6907327..56ae26d 100644
--- a/sysdeps/mach/hurd/malloc-machine.h
+++ b/sysdeps/mach/hurd/malloc-machine.h
@@ -1,6 +1,6 @@
/* Basic platform-independent macro definitions for mutexes,
thread-specific data and parameters for malloc.
- Copyright (C) 2003, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2003-2012 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
@@ -62,6 +62,10 @@ __libc_tsd_define (static, void *, MALLOC) /* declaration/common definition */
#define tsd_setspecific(key, data) __libc_tsd_set (void *, MALLOC, (data))
#define tsd_getspecific(key, vptr) ((vptr) = __libc_tsd_get (void *, MALLOC))
+/* madvise is a stub on Hurd, so don't bother calling it. */
+#undef madvise
+#define madvise(addr, len, advice) ((void) ((addr), (len), (advice)))
+
#include <sysdeps/generic/malloc-machine.h>
#endif /* !defined(_MALLOC_MACHINE_H) */