Author: friss Date: Mon Jan 16 21:38:45 2017 New Revision: 292192 URL: http://llvm.org/viewvc/llvm-project?rev=292192&view=rev Log: 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. Modified: cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/mglobal-merge.c Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=292192&r1=292191&r2=292192&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Mon Jan 16 21:38:45 2017 @@ -1363,9 +1363,9 @@ void Clang::AddAArch64TargetArgs(const A 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"); } } Modified: cfe/trunk/test/Driver/mglobal-merge.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mglobal-merge.c?rev=292192&r1=292191&r2=292192&view=diff ============================================================================== --- cfe/trunk/test/Driver/mglobal-merge.c (original) +++ cfe/trunk/test/Driver/mglobal-merge.c Mon Jan 16 21:38:45 2017 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits