From 3e40c075b03f36237b3030d71d7cd1556511e3f7 Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Tue, 17 Jan 2017 03:38:45 +0000 Subject: [PATCH] Fix AArch64 global-merge backend option name. -mglobal-merge is translated to the appropriate backend option in the driver. r277322 changed the AArch64 option name in the backend, but the driver was never updated. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292192 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 4 ++-- test/Driver/mglobal-merge.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index b4a83347de..78672b2544 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1363,9 +1363,9 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args, options::OPT_mno_global_merge)) { CmdArgs.push_back("-backend-option"); if (A->getOption().matches(options::OPT_mno_global_merge)) - CmdArgs.push_back("-aarch64-global-merge=false"); + CmdArgs.push_back("-aarch64-enable-global-merge=false"); else - CmdArgs.push_back("-aarch64-global-merge=true"); + CmdArgs.push_back("-aarch64-enable-global-merge=true"); } } diff --git a/test/Driver/mglobal-merge.c b/test/Driver/mglobal-merge.c index ad76736a69..271011e985 100644 --- a/test/Driver/mglobal-merge.c +++ b/test/Driver/mglobal-merge.c @@ -11,7 +11,7 @@ // RUN: FileCheck --check-prefix=CHECK-NONE < %t %s // CHECK-NGM-ARM: "-backend-option" "-arm-global-merge=false" -// CHECK-NGM-AARCH64: "-backend-option" "-aarch64-global-merge=false" +// CHECK-NGM-AARCH64: "-backend-option" "-aarch64-enable-global-merge=false" // RUN: %clang -target armv7-unknown-unknown -### -fsyntax-only %s 2> %t \ // RUN: -mglobal-merge @@ -26,7 +26,7 @@ // RUN: FileCheck --check-prefix=CHECK-NONE < %t %s // CHECK-GM-ARM: "-backend-option" "-arm-global-merge=true" -// CHECK-GM-AARCH64: "-backend-option" "-aarch64-global-merge=true" +// CHECK-GM-AARCH64: "-backend-option" "-aarch64-enable-global-merge=true" // RUN: %clang -target armv7-unknown-unknown -### -fsyntax-only %s 2> %t // RUN: FileCheck --check-prefix=CHECK-NONE < %t %s -- 2.40.0