Skip to content

Commit a0a7718

Browse files
luke-jrlaanwj
authored andcommitted
contrib: Changes to checks for PowerPC64
Changes from #14066.
1 parent 634f6ec commit a0a7718

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

contrib/devtools/security-check.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ def check_ELF_separate_code(executable):
124124
b'.data': R | W,
125125
b'.bss': R | W,
126126
}
127+
if elf.hdr.e_machine == pixie.EM_PPC64:
128+
# .plt is RW on ppc64 even with separate-code
129+
EXPECTED_FLAGS[b'.plt'] = R | W
127130
# For all LOAD program headers get mapping to the list of sections,
128131
# and for each section, remember the flags of the associated program header.
129132
flags_per_section = {}

contrib/devtools/symbol-check.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
'ld-linux.so.2', # 32-bit dynamic linker
6969
'ld-linux-aarch64.so.1', # 64-bit ARM dynamic linker
7070
'ld-linux-armhf.so.3', # 32-bit ARM dynamic linker
71+
'ld64.so.1', # POWER64 ABIv1 dynamic linker
72+
'ld64.so.2', # POWER64 ABIv2 dynamic linker
7173
'ld-linux-riscv64-lp64d.so.1', # 64-bit RISC-V dynamic linker
7274
# bitcoin-qt only
7375
'libxcb.so.1', # part of X11
@@ -80,6 +82,7 @@
8082
pixie.EM_X86_64: (2,2,5),
8183
pixie.EM_ARM: (2,4),
8284
pixie.EM_AARCH64:(2,17),
85+
pixie.EM_PPC64: (2,17),
8386
pixie.EM_RISCV: (2,27)
8487
}
8588

0 commit comments

Comments
 (0)