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-606-g750b592
- From: mpolacek at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Apr 2012 18:35:28 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-606-g750b592
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 750b5926bc3c31f33852c011bff32ffaaf5da133 (commit)
from 751728a1f10cdaf35c499c1d508a3a28ccfddc92 (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=750b5926bc3c31f33852c011bff32ffaaf5da133
commit 750b5926bc3c31f33852c011bff32ffaaf5da133
Author: Marek Polacek <polacek@redhat.com>
Date: Mon Apr 16 20:34:28 2012 +0200
Prevent warning in pldd.
diff --git a/ChangeLog b/ChangeLog
index 95c737f..8f7fa94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-04-16 Marek Polacek <polacek@redhat.com>
+ * elf/pldd-xx.c: Rename static_assert to pldd_assert.
+
+2012-04-16 Marek Polacek <polacek@redhat.com>
+
* sysdeps/i386/fpu/bits/fenv.h (feraiseexcept): Reverse the
operands of fdivp instruction.
diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c
index 6a9edcb..cf49c57 100644
--- a/elf/pldd-xx.c
+++ b/elf/pldd-xx.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
@@ -23,7 +23,7 @@
#define EW_(e, w, t) EW__(e, w, _##t)
#define EW__(e, w, t) e##w##t
-#define static_assert(name, exp) \
+#define pldd_assert(name, exp) \
typedef int __assert_##name[((exp) != 0) - 1]
@@ -39,11 +39,11 @@ struct E(link_map)
EW(Addr) l_libname;
};
#if CLASS == __ELF_NATIVE_CLASS
-static_assert (l_addr, (offsetof (struct link_map, l_addr)
+pldd_assert (l_addr, (offsetof (struct link_map, l_addr)
== offsetof (struct E(link_map), l_addr)));
-static_assert (l_name, (offsetof (struct link_map, l_name)
+pldd_assert (l_name, (offsetof (struct link_map, l_name)
== offsetof (struct E(link_map), l_name)));
-static_assert (l_next, (offsetof (struct link_map, l_next)
+pldd_assert (l_next, (offsetof (struct link_map, l_next)
== offsetof (struct E(link_map), l_next)));
#endif
@@ -54,9 +54,9 @@ struct E(libname_list)
EW(Addr) next;
};
#if CLASS == __ELF_NATIVE_CLASS
-static_assert (name, (offsetof (struct libname_list, name)
+pldd_assert (name, (offsetof (struct libname_list, name)
== offsetof (struct E(libname_list), name)));
-static_assert (next, (offsetof (struct libname_list, next)
+pldd_assert (next, (offsetof (struct libname_list, next)
== offsetof (struct E(libname_list), next)));
#endif
@@ -69,9 +69,9 @@ struct E(r_debug)
EW(Addr) r_map;
};
#if CLASS == __ELF_NATIVE_CLASS
-static_assert (r_version, (offsetof (struct r_debug, r_version)
+pldd_assert (r_version, (offsetof (struct r_debug, r_version)
== offsetof (struct E(r_debug), r_version)));
-static_assert (r_map, (offsetof (struct r_debug, r_map)
+pldd_assert (r_map, (offsetof (struct r_debug, r_map)
== offsetof (struct E(r_debug), r_map)));
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
elf/pldd-xx.c | 18 +++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
hooks/post-receive
--
GNU C Library master sources