From: Rafael Espindola Date: Wed, 18 May 2016 22:04:57 +0000 (+0000) Subject: Update for llvm change. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa5a9b14f436096139a730bec608d84922cb0d9d;p=clang Update for llvm change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@269989 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index 5a1db6c068..0c95eb573c 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -528,7 +528,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) { llvm::join(TargetOpts.Features.begin(), TargetOpts.Features.end(), ","); // Keep this synced with the equivalent code in tools/driver/cc1as_main.cpp. - llvm::Reloc::Model RM = llvm::Reloc::Default; + llvm::Optional RM; if (CodeGenOpts.RelocationModel == "static") { RM = llvm::Reloc::Static; } else if (CodeGenOpts.RelocationModel == "pic") { diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index bcc2af8fc0..8a1cb541c1 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -3609,8 +3609,6 @@ ParsePICArgs(const ToolChain &ToolChain, const llvm::Triple &Triple, static const char *RelocationModelName(llvm::Reloc::Model Model) { switch (Model) { - case llvm::Reloc::Default: - return nullptr; case llvm::Reloc::Static: return "static"; case llvm::Reloc::PIC_: