From e21d52e57e958c022cc3eaf048b26ac865aa4e0b Mon Sep 17 00:00:00 2001 From: Jessica Paquette Date: Tue, 8 May 2018 20:53:19 +0000 Subject: [PATCH] Change -foutline to -moutline Nitpicky, but the MachineOutliner is a machine-level pass, and so we should reflect that by using "m" instead of "n". Figured we should get this in before people get used to the letter f. :) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@331806 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/Options.td | 4 ++-- lib/Driver/ToolChains/Clang.cpp | 2 +- test/Driver/aarch64-outliner.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index e2d2442b1c..eec6adc3e8 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -1317,8 +1317,6 @@ def fno_exceptions : Flag<["-"], "fno-exceptions">, Group; def fno_gnu_keywords : Flag<["-"], "fno-gnu-keywords">, Group, Flags<[CC1Option]>; def fno_inline_functions : Flag<["-"], "fno-inline-functions">, Group, Flags<[CC1Option]>; def fno_inline : Flag<["-"], "fno-inline">, Group, Flags<[CC1Option]>; -def foutline : Flag<["-"], "foutline">, Group, Flags<[CC1Option]>, - HelpText<"Enable function outlining (AArch64 only)">; def fno_experimental_isel : Flag<["-"], "fno-experimental-isel">, Group, HelpText<"Disables the experimental global instruction selector">; def fno_experimental_new_pass_manager : Flag<["-"], "fno-experimental-new-pass-manager">, @@ -1908,6 +1906,8 @@ def mmacos_version_min_EQ : Joined<["-"], "mmacos-version-min=">, Group, Alias; def mms_bitfields : Flag<["-"], "mms-bitfields">, Group, Flags<[CC1Option]>, HelpText<"Set the default structure layout to be compatible with the Microsoft compiler standard">; +def moutline : Flag<["-"], "moutline">, Group, Flags<[CC1Option]>, + HelpText<"Enable function outlining (AArch64 only)">; def mno_ms_bitfields : Flag<["-"], "mno-ms-bitfields">, Group, HelpText<"Do not set the default structure layout to be compatible with the Microsoft compiler standard">; def mstackrealign : Flag<["-"], "mstackrealign">, Group, Flags<[CC1Option]>, diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp index 6f05fd1fa5..352ffc81d6 100644 --- a/lib/Driver/ToolChains/Clang.cpp +++ b/lib/Driver/ToolChains/Clang.cpp @@ -1485,7 +1485,7 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args, CmdArgs.push_back("-aarch64-enable-global-merge=true"); } - if (Args.getLastArg(options::OPT_foutline)) { + if (Args.getLastArg(options::OPT_moutline)) { CmdArgs.push_back("-mllvm"); CmdArgs.push_back("-enable-machine-outliner"); } diff --git a/test/Driver/aarch64-outliner.c b/test/Driver/aarch64-outliner.c index 2d539dfce6..bd41e8dcae 100644 --- a/test/Driver/aarch64-outliner.c +++ b/test/Driver/aarch64-outliner.c @@ -1,4 +1,4 @@ // REQUIRES: aarch64-registered-target -// RUN: %clang -target aarch64 -foutline -S %s -### 2>&1 | FileCheck %s +// RUN: %clang -target aarch64 -moutline -S %s -### 2>&1 | FileCheck %s // CHECK: "-mllvm" "-enable-machine-outliner" -- 2.40.0