From ce245b6eeceefabbd71da44ddf2dc55563bdc2aa Mon Sep 17 00:00:00 2001
From: David Blaikie <dblaikie@gmail.com>
Date: Thu, 10 Jul 2014 18:46:15 +0000
Subject: [PATCH] Remove use of uniform initialization ({}) introduced in
r212725 since this isn't supported in MSVC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@212754 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Basic/Targets.cpp | 2 +-
lib/Driver/ToolChains.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index c45a9ca035a..c118c9c2474 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3272,7 +3272,7 @@ namespace {
class X86_64TargetInfo : public X86TargetInfo {
public:
X86_64TargetInfo(const llvm::Triple &Triple) : X86TargetInfo(Triple) {
- const bool IsX32{getTriple().getEnvironment() == llvm::Triple::GNUX32};
+ const bool IsX32 = getTriple().getEnvironment() == llvm::Triple::GNUX32;
LongWidth = LongAlign = PointerWidth = PointerAlign = IsX32 ? 32 : 64;
LongDoubleWidth = 128;
LongDoubleAlign = 128;
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 2d8669bd96f..08bd79dc9be 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2017,7 +2017,7 @@ static bool findBiarchMultilibs(const llvm::Triple &TargetTriple,
// Determine default multilib from: 32, 64, x32
// Also handle cases such as 64 on 32, 32 on 64, etc.
enum { UNKNOWN, WANT32, WANT64, WANTX32 } Want = UNKNOWN;
- const bool IsX32 {TargetTriple.getEnvironment() == llvm::Triple::GNUX32};
+ const bool IsX32 = TargetTriple.getEnvironment() == llvm::Triple::GNUX32;
if (TargetTriple.isArch32Bit() && !NonExistent(Alt32))
Want = WANT64;
else if (TargetTriple.isArch64Bit() && IsX32 && !NonExistent(Altx32))
--
GitLab