1708d98eba
* Mon Nov 14 2022 Arjun Shankar <arjun@redhat.com> - 2.34-49 - Sync with upstream branch release/2.34/master, commit: 75b0edb7ef338084e53925139ae81fb0dfc07dd4: - Update NEWS file in the right place - Linux: Support __IPC_64 in sysvctl *ctl command arguments (bug 29771) - io: Fix use-after-free in ftw [BZ #26779] - io: Fix ftw internal realloc buffer (BZ #28126) - regex: fix buffer read overrun in search [BZ#28470] - regex: copy back from Gnulib - Allow #pragma GCC in headers in conformtest - Fix memmove call in vfprintf-internal.c:group_number - mktime: improve heuristic for ca-1986 Indiana DST - Makerules: fix MAKEFLAGS assignment for upcoming make-4.4 [BZ# 29564] - linux: Fix generic struct_stat for 64 bit time (BZ# 29657) - elf: Do not completely clear reused namespace in dlmopen (bug 29600) - nss: Use shared prefix in IPv4 address in tst-reload1 - nss: Fix tst-nss-files-hosts-long on single-stack hosts (bug 24816) - nss: Implement --no-addrconfig option for getent Resolves: #2141728 Resolves: #2110357 Resolves: #2141685
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
commit 291d4402067760edb7c0f339f9e451787a25e20a
|
|
Author: Joseph Myers <joseph@codesourcery.com>
|
|
Date: Fri Aug 27 17:47:46 2021 +0000
|
|
|
|
Allow #pragma GCC in headers in conformtest
|
|
|
|
No "#pragma GCC" pragma allows macro-expansion of its arguments, so no
|
|
namespace issues arise from use of such pragmas in installed headers.
|
|
Ignore them in conformtest tests of header namespace.
|
|
|
|
Tested for x86_64, in conjunction with Paul's patch
|
|
<https://sourceware.org/pipermail/libc-alpha/2021-August/130571.html>
|
|
adding use of such pragmas to installed headers shared with gnulib.
|
|
|
|
(cherry picked from commit 6090a4a1b32fd7859d0ad5b7e9b240bd5fa04b3f)
|
|
|
|
diff --git a/conform/conformtest.py b/conform/conformtest.py
|
|
index 4898e16c9fb96503..164cf2917d464aa1 100644
|
|
--- a/conform/conformtest.py
|
|
+++ b/conform/conformtest.py
|
|
@@ -631,6 +631,14 @@ class HeaderTests(object):
|
|
continue
|
|
if re.match(r'# [1-9]', line):
|
|
continue
|
|
+ if line.startswith('#pragma GCC '):
|
|
+ # No GCC pragma uses macro expansion, so no
|
|
+ # namespace issues arise from such pragmas. (Some
|
|
+ # pragmas not in the GCC namespace do macro-expand
|
|
+ # their arguments and so could be affected by
|
|
+ # macros defined by user code including the
|
|
+ # header.)
|
|
+ continue
|
|
match = re.match(r'#define (.*)', line)
|
|
if match:
|
|
self.check_token(bad_tokens, match.group(1))
|