aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-12-22 08:04:24 +0800
committerH.J. Lu <hjl.tools@gmail.com>2024-12-22 12:41:05 +0800
commitfe925cb04585dd1cfca4094b255b3390bc56f770 (patch)
tree42f260ae889c5b8fe2f2454ce252e51ae1adc366
parent969d7cf89966d55fbf0732ae7bc0949a970c837d (diff)
downloadglibc-fe925cb04585dd1cfca4094b255b3390bc56f770.tar.xz
glibc-fe925cb04585dd1cfca4094b255b3390bc56f770.zip
conform: Use -dD instead of -dN on compiler invocation
clang does not support -dN. Reviewed-by: Sam James <sam@gentoo.org>
-rw-r--r--conform/conformtest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/conform/conformtest.py b/conform/conformtest.py
index 8337afcdad..d38afb06a8 100644
--- a/conform/conformtest.py
+++ b/conform/conformtest.py
@@ -620,7 +620,7 @@ class HeaderTests(object):
out_file = os.path.join(self.temp_dir, 'namespace-out')
with open(c_file, 'w') as c_file_out:
c_file_out.write('#include <%s>\n' % self.header)
- cmd = ('%s %s -E %s -P -Wp,-dN > %s'
+ cmd = ('%s %s -E %s -P -Wp,-dD > %s'
% (self.cc, self.cflags_namespace, c_file, out_file))
subprocess.check_call(cmd, shell=True)
bad_tokens = set()
@@ -639,11 +639,11 @@ class HeaderTests(object):
# macros defined by user code including the
# header.)
continue
- match = re.match(r'#define (.*)', line)
+ match = re.match(r'#define (.*?[^\(\s]+)', line)
if match:
self.check_token(bad_tokens, match.group(1))
continue
- match = re.match(r'#undef (.*)', line)
+ match = re.match(r'#undef (.*?[^\(\s]+)', line)
if match:
bad_tokens.discard(match.group(1))
continue