unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Shahab Vahedi via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com>,
	Florian Weimer <fweimer@redhat.com>,
	Claudiu Zissulescu <Claudiu.Zissulescu@synopsys.com>,
	arcml <linux-snps-arc@lists.infradead.org>
Subject: [PATCH v3 1/2] scripts: Add "|" operator support to glibcpp's parsing
Date: Sun, 27 Nov 2022 18:38:24 +0100	[thread overview]
Message-ID: <20221127173825.3106-2-shahab@synopsys.com> (raw)
In-Reply-To: <20221127173825.3106-1-shahab@synopsys.com>

From the tests point of view, this is a necessary step for another
patch [1] and allows parsing macros such as "#define A | B".  Without
it, a few tests [2] choke when the other patch [1] is applied:

/src/glibc/scripts/../elf/elf.h:4167: error: uninterpretable macro
token sequence: ( EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK )
Traceback (most recent call last):
    File "/src/glibc/elf/tst-glibcelf.py", line 23, in <module>
      import glibcelf
    File "/src/glibc/scripts/glibcelf.py", line 226, in <module>
      _elf_h = _parse_elf_h()
               ^^^^^^^^^^^^^^
    File "/src/glibc/scripts/glibcelf.py", line 223, in _parse_elf_h
      raise IOError('parse error in elf.h')
  OSError: parse error in elf.h

[1] ARC: update definitions in elf/elf.h
https://sourceware.org/pipermail/libc-alpha/2022-November/143503.html

[2]
tst-glibcelf, tst-relro-ldso, and tst-relro-libc

Signed-off-by: Shahab Vahedi <shahab@synopsys.com>
---
 scripts/glibcpp.py     | 1 +
 support/tst-glibcpp.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/glibcpp.py b/scripts/glibcpp.py
index 455459a609..2f39979894 100644
--- a/scripts/glibcpp.py
+++ b/scripts/glibcpp.py
@@ -346,6 +346,7 @@ RE_SPLIT_INTEGER_SUFFIX = re.compile(r'([^ullULL]+)([ullULL]*)')
 BINARY_OPERATORS = {
     '+': operator.add,
     '<<': operator.lshift,
+    '|': operator.or_,
 }
 
 # Use the general-purpose dict type if it is order-preserving.
diff --git a/support/tst-glibcpp.py b/support/tst-glibcpp.py
index a2db1916cc..cca8bd6c44 100644
--- a/support/tst-glibcpp.py
+++ b/support/tst-glibcpp.py
@@ -131,6 +131,7 @@ check_macro_eval('#define A 1', {'A': 1})
 check_macro_eval('#define A (1)', {'A': 1})
 check_macro_eval('#define A (1 + 1)', {'A': 2})
 check_macro_eval('#define A (1U << 31)', {'A': 1 << 31})
+check_macro_eval('#define A (1 | 2)', {'A': 1 | 2})
 check_macro_eval('''\
 #define A (B + 1)
 #define B 10
-- 
2.38.1


  reply	other threads:[~2022-11-27 17:40 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-18 13:15 [PATCH] ARC: update definitions in elf/elf.h Shahab Vahedi via Libc-alpha
2022-11-19  0:34 ` Vineet Gupta via Libc-alpha
2022-11-21 13:07   ` Shahab Vahedi via Libc-alpha
2022-11-21 13:06 ` [PATCH v2] " Shahab Vahedi via Libc-alpha
2022-11-21 14:30   ` Adhemerval Zanella Netto via Libc-alpha
2022-11-23  4:13     ` Vineet Gupta via Libc-alpha
2022-11-27 17:38 ` [PATCH v3 0/2] Update ARC " Shahab Vahedi via Libc-alpha
2022-11-27 17:38   ` Shahab Vahedi via Libc-alpha [this message]
2022-11-27 18:21     ` [PATCH v3 1/2] scripts: Add "|" operator support to glibcpp's parsing Florian Weimer via Libc-alpha
2022-11-30  2:11       ` Vineet Gupta via Libc-alpha
2022-11-27 17:38   ` [PATCH v3 2/2] ARC: update definitions in elf/elf.h Shahab Vahedi via Libc-alpha
2022-11-30  2:11     ` Vineet Gupta via Libc-alpha

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/libc/involved.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221127173825.3106-2-shahab@synopsys.com \
    --to=libc-alpha@sourceware.org \
    --cc=Claudiu.Zissulescu@synopsys.com \
    --cc=Shahab.Vahedi@synopsys.com \
    --cc=fweimer@redhat.com \
    --cc=linux-snps-arc@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).