AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix elf/loadtest.c build with GCC 8.

Browse Source 
Building the testsuite with current GCC mainline fails with:

loadtest.c: In function 'main':
loadtest.c:76:3: error: macro expands to multiple statements [-Werror=multistatement-macros]
   for (map = MAPS; map != NULL; map = map->l_next)        \
   ^
loadtest.c:165:2: note: in expansion of macro 'OUT'
  OUT;
  ^~~
loadtest.c:164:7: note: some parts of macro expansion are not guarded by this 'if' clause
       if (debug)
       ^~

This seems like a genuine bug, although fairly harmless; it means the
fflush call in the OUT macro is unconditional instead of being inside
the conditional as presumably intended.  This patch makes this macro
use do { } while (0) to avoid the problem.

Tested for x86_64 (testsuite), and with build-many-glibcs.py for
aarch64-linux-gnu with GCC mainline.

	* elf/loadtest.c (OUT): Define using do { } while (0).
This commit is contained in:
Joseph Myers 2017-06-27 17:52:42 +00:00
parent e4043b84c4
commit ac782f9e9a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2017-06-27 Joseph Myers <joseph@codesourcery.com> 2017-06-27 Joseph Myers <joseph@codesourcery.com>
* elf/loadtest.c (OUT): Define using do { } while (0).
* time/strftime_l.c (DO_NUMBER): Define using do { } while (0). * time/strftime_l.c (DO_NUMBER): Define using do { } while (0).
(DO_NUMBER_SPACEPAD): Likewise. (DO_NUMBER_SPACEPAD): Likewise.

16
elf/loadtest.c
View File

@ -72,12 +72,16 @@ static const struct
#define MAPS ((struct link_map *) _r_debug.r_map) #define MAPS ((struct link_map *) _r_debug.r_map)
#define OUT \ #define OUT \
for (map = MAPS; map != NULL; map = map->l_next) \ do \
if (map->l_type == lt_loaded) \ { \
printf ("name = \"%s\", direct_opencount = %d\n", \ for (map = MAPS; map != NULL; map = map->l_next) \
map->l_name, (int) map->l_direct_opencount); \ if (map->l_type == lt_loaded) \
fflush (stdout) printf ("name = \"%s\", direct_opencount = %d\n", \
map->l_name, (int) map->l_direct_opencount); \
fflush (stdout); \
} \
while (0)
int int