[glibc/azanella/clang] conform: Use -dN instead of -dM on compiler invocation

[Adhemerval Zanella <azanella@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=12d11cdcb8517f8fa8a8964be0556e3f89ba978b

commit 12d11cdcb8517f8fa8a8964be0556e3f89ba978b
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Tue Mar 29 09:48:27 2022 -0300

    conform: Use -dN instead of -dM on compiler invocation

Diff:
---
 conform/conformtest.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conform/conformtest.py b/conform/conformtest.py
index 94a7ee110f..3d2b9cec03 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