maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Force the PS4 clang ABI version to 6. 

The PS4 requires clang ABI version 6 for compatibility reasons. This change forces this and if the user specifies a different version when the PS4 target is specified, the compiler emits a warning that the specified version is being ignored.

Reviewers: probinson

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D46767

llvm-svn: 332160
This commit is contained in:
Douglas Yung 2018-05-12 00:06:59 +00:00
parent 79a7361367
commit dde9de7cf9
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Basic/DiagnosticDriverKinds.td
View File

@ -150,6 +150,9 @@ def warn_drv_unknown_argument_clang_cl : Warning<
def warn_drv_unknown_argument_clang_cl_with_suggestion : Warning<
"unknown argument ignored in clang-cl '%0' (did you mean '%1'?)">,
InGroup<UnknownArgument>;
def warn_drv_ignored_clang_abi_version : Warning<
"target requires clang ABI version %0, ignoring requested version">,
InGroup<UnusedCommandLineArgument>;
def warn_drv_ycyu_no_arg_clang_cl : Warning<
"support for '%0' without a filename not implemented yet; flag ignored">,

10
clang/lib/Frontend/CompilerInvocation.cpp
View File

@ -2751,6 +2751,16 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
<< A->getAsString(Args) << A->getValue();
}
}
// The PS4 requires version 6 of the clang ABI.
if (T.isPS4()) {
// Issue a warning if another version of the ABI was requested.
if (Args.getLastArg(OPT_fclang_abi_compat_EQ) &&
Opts.getClangABICompat() != LangOptions::ClangABI::Ver6) {
Diags.Report(diag::warn_drv_ignored_clang_abi_version)
<< 6;
}
Opts.setClangABICompat(LangOptions::ClangABI::Ver6);
}
}
static bool isStrictlyPreprocessorAction(frontend::ActionKind Action) {

3
clang/test/CodeGenCXX/alignment.cpp
View File

@ -1,5 +1,8 @@
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin10 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NOCOMPAT
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin10 -fclang-abi-compat=6.0 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V6COMPAT
// Check that the PS4 target uses the 6.0 compat settings.
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-scei-ps4 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V6COMPAT
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-scei-ps4 -fclang-abi-compat=latest | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V6COMPAT
extern int int_source();
extern void int_sink(int x);

6
clang/test/Driver/clang-abi-compat.cpp Normal file
View File

@ -0,0 +1,6 @@
// PS4 target requires clang ABI version 6, check that a warning is emitted when a version other than 6 is requested.
// RUN: %clang -S --target=x86_64-scei-ps4 -fclang-abi-compat=4 %s 2>&1 | FileCheck %s -check-prefix=CHECK-WARNING
// RUN: %clang -S --target=x86_64-scei-ps4 -fclang-abi-compat=latest %s 2>&1 | FileCheck %s -check-prefix=CHECK-WARNING
// CHECK-WARNING: warning: target requires clang ABI version 6, ignoring requested version