Author: Paul Robinson Date: 2022-04-21T08:19:42-07:00 New Revision: f80e369f61ebd33dd9377bb42fcab64d17072b18
URL: https://github.com/llvm/llvm-project/commit/f80e369f61ebd33dd9377bb42fcab64d17072b18 DIFF: https://github.com/llvm/llvm-project/commit/f80e369f61ebd33dd9377bb42fcab64d17072b18.diff LOG: [PS4] Driver: use correct --shared option Added: Modified: clang/lib/Driver/ToolChains/PS4CPU.cpp clang/test/Driver/ps4-ps5-linker-non-win.c clang/test/Driver/ps4-ps5-linker-win.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/PS4CPU.cpp b/clang/lib/Driver/ToolChains/PS4CPU.cpp index 55a8d4dbc24b4..35a83d79abfd1 100644 --- a/clang/lib/Driver/ToolChains/PS4CPU.cpp +++ b/clang/lib/Driver/ToolChains/PS4CPU.cpp @@ -143,7 +143,7 @@ void tools::PScpu::Linker::ConstructJob(Compilation &C, const JobAction &JA, if (Args.hasArg(options::OPT_rdynamic)) CmdArgs.push_back("-export-dynamic"); if (Args.hasArg(options::OPT_shared)) - CmdArgs.push_back("--oformat=so"); + CmdArgs.push_back("--shared"); if (Output.isFilename()) { CmdArgs.push_back("-o"); diff --git a/clang/test/Driver/ps4-ps5-linker-non-win.c b/clang/test/Driver/ps4-ps5-linker-non-win.c index cd7cd8e11ea07..b9686b88a7573 100644 --- a/clang/test/Driver/ps4-ps5-linker-non-win.c +++ b/clang/test/Driver/ps4-ps5-linker-non-win.c @@ -13,14 +13,15 @@ // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -shared 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s +// RUN: | FileCheck --check-prefixes=CHECK-PS4-LINKER,SHARED %s // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-sie-ps5 %s 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS5-LINKER %s // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-sie-ps5 %s -shared 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS5-LINKER %s +// RUN: | FileCheck --check-prefixes=CHECK-PS5-LINKER,SHARED %s // CHECK-PS4-LINKER: /orbis-ld // CHECK-PS5-LINKER: /prospero-lld +// SHARED: "--shared" // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=gold 2>&1 \ // RUN: | FileCheck --check-prefix=ERROR %s diff --git a/clang/test/Driver/ps4-ps5-linker-win.c b/clang/test/Driver/ps4-ps5-linker-win.c index ca4084d4fccff..acff2c0f1f24c 100644 --- a/clang/test/Driver/ps4-ps5-linker-win.c +++ b/clang/test/Driver/ps4-ps5-linker-win.c @@ -10,14 +10,15 @@ // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s +// RUN: | FileCheck --check-prefixes=CHECK-PS4-LINKER,SHARED %s // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-sie-ps5 %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS5-LINKER %s // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-sie-ps5 %s -shared -### 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-PS5-LINKER %s +// RUN: | FileCheck --check-prefixes=CHECK-PS5-LINKER,SHARED %s // CHECK-PS4-LINKER: \\orbis-ld // CHECK-PS5-LINKER: \\prospero-lld +// SHARED: "--shared" // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \ // RUN: | FileCheck --check-prefix=ERROR %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
