https://github.com/playstation-edd updated
https://github.com/llvm/llvm-project/pull/114435
>From ebbb513f4f938c8d17a21b6061a815ffc7d8b004 Mon Sep 17 00:00:00 2001
From: Edd Dawson <edd.daw...@sony.com>
Date: Thu, 31 Oct 2024 16:09:30 +0000
Subject: [PATCH 1/4] [PS5][Driver] Pass layout metrics to the linker
Until now, these have been hardcoded as a downstream patches in lld. Add them
to the driver so that the private patch can be removed.
PS5 only. On PS4, the equivalent hardcoded configuration will remain in
the proprietary linker.
SIE tracker: TOOLCHAIN-16704
---
clang/lib/Driver/ToolChains/PS4CPU.cpp | 14 ++++++++++++--
clang/test/Driver/ps5-linker.c | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp
b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index aaba95951c5060..3b1ffee7fb6b43 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -248,8 +248,9 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C,
const JobAction &JA,
Args.MakeArgString("--sysroot=" + TC.getSDKLibraryRootDir()));
// Default to PIE for non-static executables.
- const bool PIE = !Relocatable && !Shared && !Static;
- if (Args.hasFlag(options::OPT_pie, options::OPT_no_pie, PIE))
+ const bool PIE = Args.hasFlag(options::OPT_pie, options::OPT_no_pie,
+ !Relocatable && !Shared && !Static);
+ if (PIE)
CmdArgs.push_back("-pie");
if (!Relocatable) {
@@ -276,6 +277,12 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C,
const JobAction &JA,
CmdArgs.push_back("-z");
CmdArgs.push_back("start-stop-visibility=hidden");
+ CmdArgs.push_back("-z");
+ CmdArgs.push_back("common-page-size=16384");
+
+ CmdArgs.push_back("-z");
+ CmdArgs.push_back("max-page-size=16384");
+
// Patch relocated regions of DWARF whose targets are eliminated at link
// time with specific tombstones, such that they're recognisable by the
// PlayStation debugger.
@@ -295,6 +302,9 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C,
const JobAction &JA,
if (Shared)
CmdArgs.push_back("--shared");
+ if (!Relocatable && !Shared && !PIE)
+ CmdArgs.push_back("--image-base=0x400000");
+
assert((Output.isFilename() || Output.isNothing()) && "Invalid output.");
if (Output.isFilename()) {
CmdArgs.push_back("-o");
diff --git a/clang/test/Driver/ps5-linker.c b/clang/test/Driver/ps5-linker.c
index 5175d8dbca567a..8dcd32ec1ebd87 100644
--- a/clang/test/Driver/ps5-linker.c
+++ b/clang/test/Driver/ps5-linker.c
@@ -21,6 +21,22 @@
// CHECK-NO-PIE-NOT: "-pie"
// CHECK-SHARED: "--shared"
+// Test the driver supplies an --image-base to the linker only for non-pie
+// executables.
+
+// RUN: %clang --target=x86_64-sie-ps5 -static %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-BASE %s
+// RUN: %clang --target=x86_64-sie-ps5 -no-pie %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-BASE %s
+
+// CHECK-BASE: {{ld(\.exe)?}}"
+// CHECK-BASE-SAME: "--image-base=0x400000"
+
+// RUN: %clang --target=x86_64-sie-ps5 %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-NO-BASE %s
+// RUN: %clang --target=x86_64-sie-ps5 -r %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-NO-BASE %s
+// RUN: %clang --target=x86_64-sie-ps5 -shared %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-NO-BASE %s
+
+// CHECK-NO-BASE: {{ld(\.exe)?}}"
+// CHECK-NO-BASE-NOT: "--image-base=0x400000"
+
// Test the driver passes PlayStation-specific options to the linker that are
// appropriate for the type of output. Many options don't apply for relocatable
// output (-r).
@@ -37,6 +53,8 @@
// CHECK-EXE-SAME: "--unresolved-symbols=report-all"
// CHECK-EXE-SAME: "-z" "now"
// CHECK-EXE-SAME: "-z" "start-stop-visibility=hidden"
+// CHECK-EXE-SAME: "-z" "common-page-size=16384"
+// CHECK-EXE-SAME: "-z" "max-page-size=16384"
// CHECK-EXE-SAME: "-z" "dead-reloc-in-nonalloc=.debug_*=0xffffffffffffffff"
// CHECK-EXE-SAME: "-z"
"dead-reloc-in-nonalloc=.debug_ranges=0xfffffffffffffffe"
// CHECK-EXE-SAME: "-z" "dead-reloc-in-nonalloc=.debug_loc=0xfffffffffffffffe"
>From ee87f5958f616fa97f6468e8a35f985086f4f717 Mon Sep 17 00:00:00 2001
From: Edd Dawson <edd.daw...@sony.com>
Date: Fri, 1 Nov 2024 09:42:35 +0000
Subject: [PATCH 2/4] Confirm the complete absense of --image-base, when
appropriate
---
clang/test/Driver/ps5-linker.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/Driver/ps5-linker.c b/clang/test/Driver/ps5-linker.c
index 8dcd32ec1ebd87..5eeb25cb2044a3 100644
--- a/clang/test/Driver/ps5-linker.c
+++ b/clang/test/Driver/ps5-linker.c
@@ -35,7 +35,7 @@
// RUN: %clang --target=x86_64-sie-ps5 -shared %s -### 2>&1 | FileCheck
--check-prefixes=CHECK-NO-BASE %s
// CHECK-NO-BASE: {{ld(\.exe)?}}"
-// CHECK-NO-BASE-NOT: "--image-base=0x400000"
+// CHECK-NO-BASE-NOT: --image-base
// Test the driver passes PlayStation-specific options to the linker that are
// appropriate for the type of output. Many options don't apply for relocatable
>From 911409cdd18773a7be457bda5283f5572ed89821 Mon Sep 17 00:00:00 2001
From: Edd Dawson <edd.daw...@sony.com>
Date: Fri, 1 Nov 2024 10:01:29 +0000
Subject: [PATCH 3/4] Explain lack of check for static when setting an
image-base (-static implies non-pie on PS5)
---
clang/lib/Driver/ToolChains/PS4CPU.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp
b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index 3b1ffee7fb6b43..e3d1eca046b260 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -302,6 +302,8 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C,
const JobAction &JA,
if (Shared)
CmdArgs.push_back("--shared");
+ // Provide a base address for non-PIE executables. This includes cases where
+ // -static is supplied without -pie.
if (!Relocatable && !Shared && !PIE)
CmdArgs.push_back("--image-base=0x400000");
>From 1b0c46ab6cdda0d4770c1494e83ef2f6e6b10fda Mon Sep 17 00:00:00 2001
From: Edd Dawson <edd.daw...@sony.com>
Date: Fri, 1 Nov 2024 10:12:09 +0000
Subject: [PATCH 4/4] Supply all metrics as hex. IME, the norm.
---
clang/lib/Driver/ToolChains/PS4CPU.cpp | 4 ++--
clang/test/Driver/ps5-linker.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp
b/clang/lib/Driver/ToolChains/PS4CPU.cpp
index e3d1eca046b260..877cb4e7b1261f 100644
--- a/clang/lib/Driver/ToolChains/PS4CPU.cpp
+++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp
@@ -278,10 +278,10 @@ void tools::PS5cpu::Linker::ConstructJob(Compilation &C,
const JobAction &JA,
CmdArgs.push_back("start-stop-visibility=hidden");
CmdArgs.push_back("-z");
- CmdArgs.push_back("common-page-size=16384");
+ CmdArgs.push_back("common-page-size=0x4000");
CmdArgs.push_back("-z");
- CmdArgs.push_back("max-page-size=16384");
+ CmdArgs.push_back("max-page-size=0x4000");
// Patch relocated regions of DWARF whose targets are eliminated at link
// time with specific tombstones, such that they're recognisable by the
diff --git a/clang/test/Driver/ps5-linker.c b/clang/test/Driver/ps5-linker.c
index 5eeb25cb2044a3..0fcc0f02f5a901 100644
--- a/clang/test/Driver/ps5-linker.c
+++ b/clang/test/Driver/ps5-linker.c
@@ -53,8 +53,8 @@
// CHECK-EXE-SAME: "--unresolved-symbols=report-all"
// CHECK-EXE-SAME: "-z" "now"
// CHECK-EXE-SAME: "-z" "start-stop-visibility=hidden"
-// CHECK-EXE-SAME: "-z" "common-page-size=16384"
-// CHECK-EXE-SAME: "-z" "max-page-size=16384"
+// CHECK-EXE-SAME: "-z" "common-page-size=0x4000"
+// CHECK-EXE-SAME: "-z" "max-page-size=0x4000"
// CHECK-EXE-SAME: "-z" "dead-reloc-in-nonalloc=.debug_*=0xffffffffffffffff"
// CHECK-EXE-SAME: "-z"
"dead-reloc-in-nonalloc=.debug_ranges=0xfffffffffffffffe"
// CHECK-EXE-SAME: "-z" "dead-reloc-in-nonalloc=.debug_loc=0xfffffffffffffffe"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
