From a0a771843fc39c3cc2574a51f009c3391e1808e9 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Fri, 20 Nov 2020 16:08:25 +0100 Subject: [PATCH] contrib: Changes to checks for PowerPC64 Changes from #14066. --- contrib/devtools/security-check.py | 3 +++ contrib/devtools/symbol-check.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py index a7eb7f429b4..7b09c42fdec 100755 --- a/contrib/devtools/security-check.py +++ b/contrib/devtools/security-check.py @@ -124,6 +124,9 @@ def check_ELF_separate_code(executable): b'.data': R | W, b'.bss': R | W, } + if elf.hdr.e_machine == pixie.EM_PPC64: + # .plt is RW on ppc64 even with separate-code + EXPECTED_FLAGS[b'.plt'] = R | W # For all LOAD program headers get mapping to the list of sections, # and for each section, remember the flags of the associated program header. flags_per_section = {} diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 6ca5076d6ff..91c7e325784 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -68,6 +68,8 @@ ELF_ALLOWED_LIBRARIES = { 'ld-linux.so.2', # 32-bit dynamic linker 'ld-linux-aarch64.so.1', # 64-bit ARM dynamic linker 'ld-linux-armhf.so.3', # 32-bit ARM dynamic linker +'ld64.so.1', # POWER64 ABIv1 dynamic linker +'ld64.so.2', # POWER64 ABIv2 dynamic linker 'ld-linux-riscv64-lp64d.so.1', # 64-bit RISC-V dynamic linker # bitcoin-qt only 'libxcb.so.1', # part of X11 @@ -80,6 +82,7 @@ pixie.EM_386: (2,1), pixie.EM_X86_64: (2,2,5), pixie.EM_ARM: (2,4), pixie.EM_AARCH64:(2,17), +pixie.EM_PPC64: (2,17), pixie.EM_RISCV: (2,27) }