diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-05-18 22:04:57 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-05-18 22:04:57 +0000 |
| commit | 3c70d38d1f5bec30876f7cf93e192d36cccdc3c9 (patch) | |
| tree | 4ae7570cfd7ea5fda8abb7cfc3ab604335226cd6 | |
| parent | 8c34dd82575920209d18f9fb93634886f7edbe26 (diff) | |
| download | bcm5719-llvm-3c70d38d1f5bec30876f7cf93e192d36cccdc3c9.tar.gz bcm5719-llvm-3c70d38d1f5bec30876f7cf93e192d36cccdc3c9.zip | |
Update for llvm change.
llvm-svn: 269989
| -rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 5a1db6c0681..0c95eb573c5 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/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<llvm::Reloc::Model> RM; if (CodeGenOpts.RelocationModel == "static") { RM = llvm::Reloc::Static; } else if (CodeGenOpts.RelocationModel == "pic") { diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index bcc2af8fc00..8a1cb541c1b 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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_: |
