From 2f1aef195924fe33cd9d3f8772b2688ced7244ee Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 29 Aug 2017 21:07:51 +0000 Subject: Fix m68k bits/math-inline.h macro namespace (bug 22035). As shown by build bot failures the m68k bits/mathinline.h is not namespace-clean: it fails to compile if the user has defined macros f or l before it is included, because of expansions of those arguments to __inline_functions. This patch changes the __inline_functions definitions to take not the suffix but a macro that concatenates it with the function name, to avoid the spurious macro expansions. Tested for m68k with build-many-glibcs.py. [BZ #22035] * sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__inline_functions): Define to take a second argument that is a macro that concatentates a suffix, not the suffix itself. (__CONCAT_d): New macro. (__CONCAT_f): Likewise. (__CONCAT_l): Likewise. --- ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index e78518a693..addc36ae88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-08-29 Joseph Myers + + [BZ #22035] + * sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__inline_functions): + Define to take a second argument that is a macro that + concatentates a suffix, not the suffix itself. + (__CONCAT_d): New macro. + (__CONCAT_f): Likewise. + (__CONCAT_l): Likewise. + 2017-08-29 Paul Pluzhnikov * stdlib/tst-atexit-common.c (do_test): Test handler inheritance -- cgit 1.4.1