qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent warning in pldd.

This commit is contained in:
Marek Polacek 2012-04-16 20:34:28 +02:00
parent 751728a1f1
commit 750b5926bc
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> 2012-04-16 Marek Polacek <polacek@redhat.com>
* sysdeps/i386/fpu/bits/fenv.h (feraiseexcept): Reverse the * sysdeps/i386/fpu/bits/fenv.h (feraiseexcept): Reverse the

18
elf/pldd-xx.c
View File

@ -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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. 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) EW__(e, w, _##t)
#define EW__(e, w, t) 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] typedef int __assert_##name[((exp) != 0) - 1]
@ -39,11 +39,11 @@ struct E(link_map)
EW(Addr) l_libname; EW(Addr) l_libname;
}; };
#if CLASS == __ELF_NATIVE_CLASS #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))); == 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))); == 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))); == offsetof (struct E(link_map), l_next)));
#endif #endif
@ -54,9 +54,9 @@ struct E(libname_list)
EW(Addr) next; EW(Addr) next;
}; };
#if CLASS == __ELF_NATIVE_CLASS #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))); == 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))); == offsetof (struct E(libname_list), next)));
#endif #endif
@ -69,9 +69,9 @@ struct E(r_debug)
EW(Addr) r_map; EW(Addr) r_map;
}; };
#if CLASS == __ELF_NATIVE_CLASS #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))); == 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))); == offsetof (struct E(r_debug), r_map)));
#endif #endif