From 2a5842e254698b48d1700d078efc9d1585f9b2a3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 27 Jan 2026 20:09:48 +0000
Subject: [PATCH 1/5] Initial plan


From 87ceb03f1fb6773589264cab9b65927fa4a71523 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 27 Jan 2026 20:12:20 +0000
Subject: [PATCH 2/5] Add GLIBC_MIN_VERSION flags to CMake files

Co-authored-by: adityapatwardhan <12820925+adityapatwardhan@users.noreply.github.com>
---
 src/libpsl-native/CMakeLists.txt      | 2 +-
 src/libpsl-native/arm.toolchain.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libpsl-native/CMakeLists.txt b/src/libpsl-native/CMakeLists.txt
index 0b357be..ebe215c 100644
--- a/src/libpsl-native/CMakeLists.txt
+++ b/src/libpsl-native/CMakeLists.txt
@@ -3,7 +3,7 @@ project(PSL-NATIVE)
 
 # Can't use add_compile_options with 2.8.11
 set(CMAKE_BUILD_TYPE "Release")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -gdwarf-5")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.27 -gdwarf-5")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR "FreeBSD")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro,-z,now")
diff --git a/src/libpsl-native/arm.toolchain.cmake b/src/libpsl-native/arm.toolchain.cmake
index f514d40..1746a38 100644
--- a/src/libpsl-native/arm.toolchain.cmake
+++ b/src/libpsl-native/arm.toolchain.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2)
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.35)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now")
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 

From 6b6a72757d236c24163032bb5d968b068ae092d0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 27 Jan 2026 20:15:28 +0000
Subject: [PATCH 3/5] Add GLIBC_MIN_VERSION=2.27 to ARM64 toolchain

Co-authored-by: adityapatwardhan <12820925+adityapatwardhan@users.noreply.github.com>
---
 src/libpsl-native/arm64.toolchain.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpsl-native/arm64.toolchain.cmake b/src/libpsl-native/arm64.toolchain.cmake
index 13d60df..69084b4 100644
--- a/src/libpsl-native/arm64.toolchain.cmake
+++ b/src/libpsl-native/arm64.toolchain.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
-set(CMAKE_CXX_COMPILER g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2)
+set(CMAKE_CXX_COMPILER g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.27)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now")
 set(CMAKE_C_COMPILER gcc)
 

From b401e6dab4e91ff457fd865dd62def58eaf6146b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 27 Jan 2026 14:00:51 -0800
Subject: [PATCH 4/5] Update cmake to remove duplication

---
 src/libpsl-native/CMakeLists.txt        | 11 ++++++++++-
 src/libpsl-native/arm.toolchain.cmake   |  3 ++-
 src/libpsl-native/arm64.toolchain.cmake |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libpsl-native/CMakeLists.txt b/src/libpsl-native/CMakeLists.txt
index ebe215c..33a8598 100644
--- a/src/libpsl-native/CMakeLists.txt
+++ b/src/libpsl-native/CMakeLists.txt
@@ -3,7 +3,16 @@ project(PSL-NATIVE)
 
 # Can't use add_compile_options with 2.8.11
 set(CMAKE_BUILD_TYPE "Release")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.27 -gdwarf-5")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -gdwarf-5")
+
+if(NOT DEFINED PS_GLIBC_MIN_VERSION)
+  set(PS_GLIBC_MIN_VERSION "2.27"
+      CACHE STRING "Minimum glibc version for this build")
+endif()
+
+add_compile_definitions(GLIBC_MIN_VERSION=${PS_GLIBC_MIN_VERSION})
+
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR "FreeBSD")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro,-z,now")
diff --git a/src/libpsl-native/arm.toolchain.cmake b/src/libpsl-native/arm.toolchain.cmake
index 1746a38..9869728 100644
--- a/src/libpsl-native/arm.toolchain.cmake
+++ b/src/libpsl-native/arm.toolchain.cmake
@@ -1,7 +1,8 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.35)
+set(PS_GLIBC_MIN_VERSION "2.35" CACHE STRING "Minimum glibc version for this toolchain")
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now")
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 
diff --git a/src/libpsl-native/arm64.toolchain.cmake b/src/libpsl-native/arm64.toolchain.cmake
index 69084b4..13d60df 100644
--- a/src/libpsl-native/arm64.toolchain.cmake
+++ b/src/libpsl-native/arm64.toolchain.cmake
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
-set(CMAKE_CXX_COMPILER g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DGLIBC_MIN_VERSION=2.27)
+set(CMAKE_CXX_COMPILER g++ -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro,-z,now")
 set(CMAKE_C_COMPILER gcc)
 

From d2113853f513ba451aa29e0426cae4780e9a19b9 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 27 Jan 2026 16:39:55 -0800
Subject: [PATCH 5/5] Add cmake flag

---
 src/libpsl-native/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libpsl-native/CMakeLists.txt b/src/libpsl-native/CMakeLists.txt
index 33a8598..a4e4d4e 100644
--- a/src/libpsl-native/CMakeLists.txt
+++ b/src/libpsl-native/CMakeLists.txt
@@ -4,7 +4,7 @@ project(PSL-NATIVE)
 # Can't use add_compile_options with 2.8.11
 set(CMAKE_BUILD_TYPE "Release")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -gdwarf-5")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -D_FORTIFY_SOURCE=2 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -gdwarf-5")
 
 if(NOT DEFINED PS_GLIBC_MIN_VERSION)
   set(PS_GLIBC_MIN_VERSION "2.27"