Skip to content

Bump external/termux-elf-cleaner from ee5385e to 3da3eea #11583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 7 commits into
base: main
Choose a base branch
from
+24 −12
Open

Bump external/termux-elf-cleaner from ee5385e to 3da3eea #11583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
482571e
Bump external/termux-elf-cleaner from `ee5385e` to `3da3eea`
dependabot[bot] Jun 5, 2026
bb1de5f
Fix elfcleaner CMake for renamed source and C++20 requirement
Copilot Jun 5, 2026
bbcbedd
Extract elfcleaner version to a CMake variable
Copilot Jun 5, 2026
12b949e
Bump elfcleaner CMake minimum to 3.20 so C++20 std flag is emitted
Copilot Jun 8, 2026
ed1d77b
Merge branch 'main' into dependabot/submodules/external/termux-elf-cl…
jonathanpeppers Jun 8, 2026
d891855
Address review: scope sync comment, match upstream CXX_EXTENSIONS
Copilot Jun 8, 2026
9b1cd2d
Bump Linux CI from gcc-10/g++-10 to gcc-11/g++-11
Copilot Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ stages:
workspace:
clean: all
variables:
CXX: g++-10
CC: gcc-10
CXX: g++-11
CC: gcc-11
steps:
- checkout: self
path: s/android
Expand All @@ -151,8 +151,8 @@ stages:

- script: |
sudo apt-get update
sudo apt-get install -y g++-10 gcc-10
displayName: install g++-10 and gcc-10
sudo apt-get install -y g++-11 gcc-11
displayName: install g++-11 and gcc-11

- template: /build-tools/automation/yaml-templates/build-linux-steps.yaml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/build-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ stages:
workspace:
clean: all
variables:
CXX: g++-10
CC: gcc-10
CXX: g++-11
CC: gcc-11
${{ if eq(parameters.use1ESTemplate, true) }}:
templateContext:
outputs:
Expand Down
2 changes: 1 addition & 1 deletion build-tools/scripts/generate-pinvoke-tables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ case ${HOST} in
if [ "${RUNNING_ON_CI}" == "no" ]; then
COMPILER="g++"
else
COMPILER="g++-10"
COMPILER="g++-11"
fi ;;

darwin)
Expand Down
2 changes: 1 addition & 1 deletion external/termux-elf-cleaner
Open in desktop
Submodule termux-elf-cleaner updated 35 files
+5 −0 .editorconfig
+6 −0 .github/dependabot.yml
+44 −0 .github/workflows/attach_termux_elf_cleaner_to_release.yml
+26 −0 .github/workflows/build.yml
+23 −1 .gitignore
+70 −0 CMakeLists.txt
+0 −16 Makefile
+28 −6 README.md
+396 −0 elf-cleaner.cpp
+4,428 −158 elf.h
+0 −191 termux-elf-cleaner.cpp
+1 −0 tests/.gitignore
+ − tests/curl-7.83.1-aarch64-api21-cleaned
+ − tests/curl-7.83.1-aarch64-api24-cleaned
+ − tests/curl-7.83.1-aarch64-original
+ − tests/curl-7.83.1-arm-api21-cleaned
+ − tests/curl-7.83.1-arm-api24-cleaned
+ − tests/curl-7.83.1-arm-original
+ − tests/curl-7.83.1-i686-api21-cleaned
+ − tests/curl-7.83.1-i686-api24-cleaned
+ − tests/curl-7.83.1-i686-original
+ − tests/curl-7.83.1-x86_64-api21-cleaned
+ − tests/curl-7.83.1-x86_64-api24-cleaned
+ − tests/curl-7.83.1-x86_64-original
+47 −0 tests/test-dynamic-section.sh
+35 −0 tests/test-threads.sh
+40 −0 tests/test-tls-alignment.sh
+ − tests/valgrind-3.19.0-aarch64-original
+ − tests/valgrind-3.19.0-aarch64-tls-aligned
+ − tests/valgrind-3.19.0-arm-original
+ − tests/valgrind-3.19.0-arm-tls-aligned
+ − tests/valgrind-3.19.0-i686-original
+ − tests/valgrind-3.19.0-i686-tls-aligned
+ − tests/valgrind-3.19.0-x86_64-original
+ − tests/valgrind-3.19.0-x86_64-tls-aligned
20 changes: 16 additions & 4 deletions tools/fastdev/elfcleaner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
# Set the minimum version of CMake that can be used
# To find the cmake version run
# $ cmake --version
cmake_minimum_required(VERSION 3.5)
# 3.20+ is required so policy CMP0128 is NEW and the C++ standard flag
# (e.g. -std=c++20) is always emitted; elf-cleaner.cpp uses std::counting_semaphore.
cmake_minimum_required(VERSION 3.20)

# Set the project name
project (elfcleaner C CXX)

set(CMAKE_CXX_STANDARD 17)
# Keep ELFCLEANER_VERSION, CMAKE_CXX_STANDARD, and the PACKAGE_NAME/
# PACKAGE_VERSION/COPYRIGHT compile definitions below in sync with
# external/termux-elf-cleaner/CMakeLists.txt.
set(ELFCLEANER_VERSION "3.0.1")

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON)
set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON)
Expand All @@ -25,9 +32,14 @@ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -Wall")

set(ELFCLEANER_SOURCES
../../../external/termux-elf-cleaner/termux-elf-cleaner.cpp
../../../external/termux-elf-cleaner/elf-cleaner.cpp
)

# Add an executable
add_executable(elfcleaner ${ELFCLEANER_SOURCES})
target_compile_definitions(elfcleaner
PRIVATE "COPYRIGHT=\"Copyright (C) 2022-2024 Termux and contributors.\""
PRIVATE "PACKAGE_VERSION=\"${ELFCLEANER_VERSION}\""
PRIVATE "PACKAGE_NAME=\"termux-elf-cleaner\""
)
set_target_properties(elfcleaner PROPERTIES LINK_FLAGS_RELEASE -s)