diff options
| author | Xinliang David Li <davidxl@google.com> | 2015-11-23 05:41:05 +0000 |
|---|---|---|
| committer | Xinliang David Li <davidxl@google.com> | 2015-11-23 05:41:05 +0000 |
| commit | a2124eebbdeb2149ae0d07154ce8c41784e1c143 (patch) | |
| tree | 395d559c65ac17933c3a4cbcca0ad73e403361a5 | |
| parent | 7010ed6be390f9232d8beef3c55fe438b315a4f0 (diff) | |
| download | bcm5719-llvm-a2124eebbdeb2149ae0d07154ce8c41784e1c143.tar.gz bcm5719-llvm-a2124eebbdeb2149ae0d07154ce8c41784e1c143.zip | |
Revert r253846 (build bot failure))
llvm-svn: 253851
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGen/x86_64-profiling-keep-fp.c | 13 |
3 files changed, 1 insertions, 19 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 89a8d90b7a1..acf2cbcf1c2 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2794,8 +2794,6 @@ static bool shouldUseFramePointer(const ArgList &Args, if (Arg *A = Args.getLastArg(options::OPT_fno_omit_frame_pointer, options::OPT_fomit_frame_pointer)) return A->getOption().matches(options::OPT_fno_omit_frame_pointer); - if (Args.hasArg(options::OPT_pg)) - return true; return shouldUseFramePointerForTarget(Args, Triple); } @@ -2805,8 +2803,6 @@ static bool shouldUseLeafFramePointer(const ArgList &Args, if (Arg *A = Args.getLastArg(options::OPT_mno_omit_leaf_frame_pointer, options::OPT_momit_leaf_frame_pointer)) return A->getOption().matches(options::OPT_mno_omit_leaf_frame_pointer); - if (Args.hasArg(options::OPT_pg)) - return true; if (Triple.isPS4CPU()) return false; diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 26f93895a48..91917cf5100 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -453,8 +453,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, Opts.CXXCtorDtorAliases = Args.hasArg(OPT_mconstructor_aliases); Opts.CodeModel = getCodeModel(Args, Diags); Opts.DebugPass = Args.getLastArgValue(OPT_mdebug_pass); - Opts.DisableFPElim = - (Args.hasArg(OPT_mdisable_fp_elim) || Args.hasArg(OPT_pg)); + Opts.DisableFPElim = Args.hasArg(OPT_mdisable_fp_elim); Opts.DisableFree = Args.hasArg(OPT_disable_free); Opts.DisableTailCalls = Args.hasArg(OPT_mdisable_tail_calls); Opts.FloatABI = Args.getLastArgValue(OPT_mfloat_abi); diff --git a/clang/test/CodeGen/x86_64-profiling-keep-fp.c b/clang/test/CodeGen/x86_64-profiling-keep-fp.c deleted file mode 100644 index e56ac953a6c..00000000000 --- a/clang/test/CodeGen/x86_64-profiling-keep-fp.c +++ /dev/null @@ -1,13 +0,0 @@ -// RUN: %clang_cc1 -triple x86_64-unknown-unknown -O3 -pg -S -o - %s | \ -// RUN: FileCheck %s -// RUN: %clang_cc1 -triple x86_64-unknown-unknown -O3 -momit-leaf-frame-pointer -pg -S -o - %s | \ -// RUN: FileCheck %s - -// Test that the frame pointer is kept when compiling with -// profiling. - -//CHECK: pushq %rbp -int main(void) -{ - return 0; -} |
