This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-169-gd2c736f
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Feb 2012 22:15:54 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-169-gd2c736f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via d2c736f809690dd69f1cade53a61b99e401bb0e3 (commit)
from f63f338062e1d390330484412840467b0ec659b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d2c736f809690dd69f1cade53a61b99e401bb0e3
commit d2c736f809690dd69f1cade53a61b99e401bb0e3
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Feb 15 14:14:59 2012 -0800
Hurd: #define away madvise for malloc code.
diff --git a/ChangeLog b/ChangeLog
index 131caa6..2aba4a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,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) */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
sysdeps/mach/hurd/malloc-machine.h | 6 +++++-
2 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources