https://github.com/aokblast updated https://github.com/llvm/llvm-project/pull/206568
>From 32ccb0b298889fe8ca5a9e3df761aea4a5a4a4cf Mon Sep 17 00:00:00 2001 From: ShengYi Hung <[email protected]> Date: Sat, 27 Jun 2026 02:35:59 +0800 Subject: [PATCH 1/2] [clang] Rename CLANG_DEFAULT_PIE_ON_LINUX to CLANG_DEFAULT_PIE Rename the platform-specific option CLANG_DEFAULT_PIE_ON_LINUX to the more generic CLANG_DEFAULT_PIE to allow enabling PIE by default on other platforms. This change only renames the option. The default values at each use site remain unchanged, so there is no functional behavior change. --- clang/CMakeLists.txt | 2 +- clang/include/clang/Config/config.h.cmake | 2 +- clang/lib/Driver/ToolChains/Linux.cpp | 4 ++-- clang/test/CMakeLists.txt | 2 +- clang/test/Driver/hip-fpie-option.hip | 2 +- clang/test/Driver/linux-default-pie.c | 4 ++-- clang/test/lit.cfg.py | 4 ++-- clang/test/lit.site.cfg.py.in | 2 +- flang/test/Driver/linker-options.f90 | 16 ++++++++-------- flang/test/Driver/pic-flags.f90 | 2 +- .../clang/include/clang/Config/BUILD.gn | 2 +- llvm/utils/gn/secondary/clang/test/BUILD.gn | 2 +- .../clang/include/clang/Config/config.h | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index cd7ba53b03061..f8b7f35612cf3 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -278,7 +278,7 @@ set(PPC_LINUX_DEFAULT_IEEELONGDOUBLE OFF CACHE BOOL set(CLANG_SPAWN_CC1 OFF CACHE BOOL "Whether clang should use a new process for the CC1 invocation") -option(CLANG_DEFAULT_PIE_ON_LINUX "Default to -fPIE and -pie on linux-gnu" ON) +option(CLANG_DEFAULT_PIE "Default to -fPIE and -pie on linux-gnu" ON) set(CLANG_DEFAULT_LINKER "" CACHE STRING "Default linker to use (linker name or absolute path, empty for platform default)") diff --git a/clang/include/clang/Config/config.h.cmake b/clang/include/clang/Config/config.h.cmake index 11b4096726f67..ea0cd01c6c596 100644 --- a/clang/include/clang/Config/config.h.cmake +++ b/clang/include/clang/Config/config.h.cmake @@ -9,7 +9,7 @@ #define BUG_REPORT_URL "${BUG_REPORT_URL}" /* Default to -fPIE and -pie on Linux. */ -#cmakedefine01 CLANG_DEFAULT_PIE_ON_LINUX +#cmakedefine01 CLANG_DEFAULT_PIE /* Default linker to use. */ #define CLANG_DEFAULT_LINKER "${CLANG_DEFAULT_LINKER}" diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 512788d235fec..6c6b3647e2f81 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -934,8 +934,8 @@ void Linux::addSYCLIncludeArgs(const ArgList &DriverArgs, } bool Linux::isPIEDefault(const llvm::opt::ArgList &Args) const { - return CLANG_DEFAULT_PIE_ON_LINUX || getTriple().isAndroid() || - getTriple().isMusl() || getSanitizerArgs(Args).requiresPIE(); + return CLANG_DEFAULT_PIE || getTriple().isAndroid() || getTriple().isMusl() || + getSanitizerArgs(Args).requiresPIE(); } bool Linux::IsAArch64OutlineAtomicsDefault(const ArgList &Args) const { diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 8dd0084c53224..7807a3e4d00d5 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -5,7 +5,7 @@ llvm_canonicalize_cmake_booleans( BUILD_SHARED_LIBS CLANG_BUILD_EXAMPLES CLANG_BUILT_STANDALONE - CLANG_DEFAULT_PIE_ON_LINUX + CLANG_DEFAULT_PIE CLANG_ENABLE_STATIC_ANALYZER CLANG_PLUGIN_SUPPORT CLANG_SPAWN_CC1 diff --git a/clang/test/Driver/hip-fpie-option.hip b/clang/test/Driver/hip-fpie-option.hip index 426564b67066e..de2cd7fc343ed 100644 --- a/clang/test/Driver/hip-fpie-option.hip +++ b/clang/test/Driver/hip-fpie-option.hip @@ -1,4 +1,4 @@ -// REQUIRES: default-pie-on-linux +// REQUIRES: default-pie // -fPIC and -fPIE only affects host relocation model. // device compilation always uses PIC. diff --git a/clang/test/Driver/linux-default-pie.c b/clang/test/Driver/linux-default-pie.c index 6772a6cd3fd0c..0b1aa0b2d5ab3 100644 --- a/clang/test/Driver/linux-default-pie.c +++ b/clang/test/Driver/linux-default-pie.c @@ -1,5 +1,5 @@ -// REQUIRES: default-pie-on-linux -/// Test -DCLANG_DEFAULT_PIE_ON_LINUX=on. +// REQUIRES: default-pie +/// Test -DCLANG_DEFAULT_PIE=on. // RUN: %clang -### --target=aarch64-linux-gnu %s 2>&1 | FileCheck %s --check-prefix=PIE2 diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py index f7b3a77266cb8..749878690b245 100644 --- a/clang/test/lit.cfg.py +++ b/clang/test/lit.cfg.py @@ -326,8 +326,8 @@ def have_host_clang_repl_cuda(): if config.has_plugins and config.llvm_plugin_ext: config.available_features.add("plugins") -if config.clang_default_pie_on_linux: - config.available_features.add("default-pie-on-linux") +if config.clang_default_pie: + config.available_features.add("default-pie") # Set available features we allow tests to conditionalize on. # diff --git a/clang/test/lit.site.cfg.py.in b/clang/test/lit.site.cfg.py.in index cb35118167d99..0def99827c111 100644 --- a/clang/test/lit.site.cfg.py.in +++ b/clang/test/lit.site.cfg.py.in @@ -21,7 +21,7 @@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.have_zlib = @LLVM_ENABLE_ZLIB@ config.have_zstd = @LLVM_ENABLE_ZSTD@ config.clang_objc_rewriter = @CLANG_ENABLE_OBJC_REWRITER@ -config.clang_default_pie_on_linux = @CLANG_DEFAULT_PIE_ON_LINUX@ +config.clang_default_pie = @CLANG_DEFAULT_PIE@ config.clang_default_cxx_stdlib = "@CLANG_DEFAULT_CXX_STDLIB@" config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@ config.clang_staticanalyzer_z3 = @LLVM_WITH_Z3@ diff --git a/flang/test/Driver/linker-options.f90 b/flang/test/Driver/linker-options.f90 index 07f967b4bac5d..5de7d8c23aacb 100644 --- a/flang/test/Driver/linker-options.f90 +++ b/flang/test/Driver/linker-options.f90 @@ -58,20 +58,20 @@ ! RUN: %flang -target i386-pc-openbsd -pie -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=PIE ! -! On FreeBSD, -pie is not passed to the linker, but can be forced. -! RUN: %flang -target amd64-pc-freebsd -### %s 2>&1 \ +! On FreeBSD, pie is passed to the linker, but can be forced cancelled. +! RUN: %flang -no-pie -target amd64-pc-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target i386-pc-freebsd -### %s 2>&1 \ +! RUN: %flang -no-pie -target i386-pc-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target aarch64-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -no-pie -target aarch64-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target arm-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -no-pie -target arm-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target powerpc-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -no-pie -target powerpc-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target sparc64-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -no-pie -target sparc64-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -target i386-pc-freebsd -pie -### %s 2>&1 \ +! RUN: %flang -no-pie -target i386-pc-freebsd -pie -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=PIE ! ! On AIX, -pie is never passed to the linker. diff --git a/flang/test/Driver/pic-flags.f90 b/flang/test/Driver/pic-flags.f90 index 5a06163c485cd..23315bde96c28 100644 --- a/flang/test/Driver/pic-flags.f90 +++ b/flang/test/Driver/pic-flags.f90 @@ -1,6 +1,6 @@ ! RUN: %if aarch64-registered-target %{ %flang -v -S -emit-llvm -o - %s --target=aarch64-linux-gnu -fno-pie 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-STATIC,CHECK-STATIC-IR %} -! RUN: %if aarch64-registered-target && clang_default_pie_on_linux %{ %flang -v -S -emit-llvm -o - %s --target=aarch64-linux-gnu 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-PIE-LEVEL2,CHECK-PIE-LEVEL2-IR %} +! RUN: %if aarch64-registered-target && clang_default_pie %{ %flang -v -S -emit-llvm -o - %s --target=aarch64-linux-gnu 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-PIE-LEVEL2,CHECK-PIE-LEVEL2-IR %} ! RUN: %if aarch64-registered-target %{ %flang -v -S -emit-llvm -o - %s --target=aarch64-linux-gnu -fpie 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-PIE-LEVEL1,CHECK-PIE-LEVEL1-IR %} ! RUN: %if aarch64-registered-target %{ %flang -v -S -emit-llvm -o - %s --target=aarch64-linux-gnu -fPIE 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-PIE-LEVEL2,CHECK-PIE-LEVEL2-IR %} diff --git a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn index f8196d1b248e5..c569c80cc74ad 100644 --- a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn @@ -8,7 +8,7 @@ write_cmake_config("Config") { output = "$target_gen_dir/config.h" values = [ "BUG_REPORT_URL=https://github.com/llvm/llvm-project/issues/";, - "CLANG_DEFAULT_PIE_ON_LINUX=1", + "CLANG_DEFAULT_PIE=1", "CLANG_DEFAULT_LINKER=", "CLANG_DEFAULT_CXX_STDLIB=", "CLANG_DEFAULT_RTLIB=", diff --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn index 73f3bd020a1e0..16622fa62f4d7 100644 --- a/llvm/utils/gn/secondary/clang/test/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn @@ -52,7 +52,7 @@ write_lit_config("lit_site_cfg") { "CLANG_BUILD_EXAMPLES=0", "CLANG_BUILT_STANDALONE=0", "CLANG_DEFAULT_CXX_STDLIB=", # Empty string means "default value" here. - "CLANG_DEFAULT_PIE_ON_LINUX=0", + "CLANG_DEFAULT_PIE=0", "CLANG_ENABLE_CIR=0", "CLANG_ENABLE_OBJC_REWRITER=0", "CLANG_PLUGIN_SUPPORT=0", # FIXME: Analysis/plugins need global -fPIC diff --git a/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h b/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h index 7f7308f338966..0fbe93028a076 100644 --- a/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h +++ b/utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h @@ -23,7 +23,7 @@ #define BUG_REPORT_URL "https://github.com/llvm/llvm-project/issues/"; /* Default to -fPIE and -pie on Linux. */ -#define CLANG_DEFAULT_PIE_ON_LINUX 1 +#define CLANG_DEFAULT_PIE 1 /* Default linker to use. */ #define CLANG_DEFAULT_LINKER "" >From 0a703529d713eaed0c77aad859c924ac803d8958 Mon Sep 17 00:00:00 2001 From: ShengYi Hung <[email protected]> Date: Tue, 30 Jun 2026 20:28:07 -0500 Subject: [PATCH 2/2] fixup! [clang] Rename CLANG_DEFAULT_PIE_ON_LINUX to CLANG_DEFAULT_PIE --- flang/test/Driver/linker-options.f90 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flang/test/Driver/linker-options.f90 b/flang/test/Driver/linker-options.f90 index 5de7d8c23aacb..07f967b4bac5d 100644 --- a/flang/test/Driver/linker-options.f90 +++ b/flang/test/Driver/linker-options.f90 @@ -58,20 +58,20 @@ ! RUN: %flang -target i386-pc-openbsd -pie -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=PIE ! -! On FreeBSD, pie is passed to the linker, but can be forced cancelled. -! RUN: %flang -no-pie -target amd64-pc-freebsd -### %s 2>&1 \ +! On FreeBSD, -pie is not passed to the linker, but can be forced. +! RUN: %flang -target amd64-pc-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target i386-pc-freebsd -### %s 2>&1 \ +! RUN: %flang -target i386-pc-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target aarch64-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -target aarch64-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target arm-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -target arm-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target powerpc-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -target powerpc-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target sparc64-unknown-freebsd -### %s 2>&1 \ +! RUN: %flang -target sparc64-unknown-freebsd -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=NO-PIE -! RUN: %flang -no-pie -target i386-pc-freebsd -pie -### %s 2>&1 \ +! RUN: %flang -target i386-pc-freebsd -pie -### %s 2>&1 \ ! RUN: | FileCheck %s --check-prefix=PIE ! ! On AIX, -pie is never passed to the linker. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
