From bc34e5954e568eebf609485a98043615e60ccb9b Mon Sep 17 00:00:00 2001 From: Hubert Badocha Date: Mon, 23 Sep 2024 13:51:18 +0200 Subject: [PATCH 1/2] build: adapt scripts to noexecstack JIRA: RTOS-999 --- _targets/build.common | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_targets/build.common b/_targets/build.common index 6acccdbdb..d0196ed9f 100644 --- a/_targets/build.common +++ b/_targets/build.common @@ -96,10 +96,10 @@ b_mkscript_user() { kernelimg) printf "alias%s %s 0x%x 0x%x\n" "$RELATIVE_ALIAS" "${KERNEL_FILE}" "$KERNEL_OFFS" "$ksz" fn="${PREFIX_PROG_STRIPPED}$KERNEL_ELF" - tbeg=$(${CROSS}readelf -l "$fn" | awk '/R E/ { print $3 }') - tsz=$(${CROSS}readelf -l "$fn" | awk '/R E/ { print $6 }') - dbeg=$(${CROSS}readelf -l "$fn" | awk '/RW/ { print $3 }') - dsz=$(${CROSS}readelf -l "$fn" | awk '/RW/ { print $6 }') + tbeg=$(${CROSS}readelf -l "$fn" | awk '/LOAD.*R E/ { print $3 }') + tsz=$(${CROSS}readelf -l "$fn" | awk '/LOAD.*R E/ { print $6 }') + dbeg=$(${CROSS}readelf -l "$fn" | awk '/LOAD.*RW/ { print $3 }') + dsz=$(${CROSS}readelf -l "$fn" | awk '/LOAD.*RW/ { print $6 }') tsz=$(((tsz + SIZE_PAGE - 1) & PAGE_MASK)) dsz=$(((dsz + SIZE_PAGE - 1) & PAGE_MASK)) printf "%s %s %x %x %x %x\n" "$cmd" "${KERNEL_FILE}" $((tbeg)) $((tsz)) $((dbeg)) $((dsz));; From 8ca6c584cbdedddb6d74ed23ed824448f8903586 Mon Sep 17 00:00:00 2001 From: Hubert Badocha Date: Mon, 23 Sep 2024 13:50:42 +0200 Subject: [PATCH 2/2] submodule update * phoenix-rtos-build 52927a8...97fb495 (3): < toolchain: update multilib configuration for SPARC < toolchain: add patch with armv7-r/v8-r multilib config < toolchain: add PIC flags to armv7-r/v8-r in libstdcpp --- phoenix-rtos-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-rtos-build b/phoenix-rtos-build index 52927a801..97fb49513 160000 --- a/phoenix-rtos-build +++ b/phoenix-rtos-build @@ -1 +1 @@ -Subproject commit 52927a801619d5f9f228a0e47efaec40e63b6166 +Subproject commit 97fb4951342e453e52d12f65914579e1e5142684