about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorShahab Vahedi <shahab@synopsys.com>2022-11-27 18:38:24 +0100
committerVineet Gupta <vineet.gupta@linux.dev>2022-11-29 14:33:56 -0800
commit987f8647e8d6206cebc613e5c162ff8b4d014d40 (patch)
tree6ca53f8e72e18c0779826d4cbb3c2671f36a5db4 /scripts
parent227df6243a2b5b4d70d11772d12c02eb9cb666ca (diff)
downloadglibc-987f8647e8d6206cebc613e5c162ff8b4d014d40.tar.gz
glibc-987f8647e8d6206cebc613e5c162ff8b4d014d40.tar.xz
glibc-987f8647e8d6206cebc613e5c162ff8b4d014d40.zip
scripts: Add "|" operator support to glibcpp's parsing
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

Reviewed-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Shahab Vahedi <shahab@synopsys.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/glibcpp.py1
1 files changed, 1 insertions, 0 deletions
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.