From fb91e5ed2fe72c6ce38abe0ec2ca47cbeac78d8d Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 23 Apr 2020 00:46:45 +0300
Subject: rustc_target: Stop using "string typing" for relocation models

Introduce `enum RelocModel` instead.
---
 src/rustllvm/PassWrapper.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/rustllvm')

diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
index b221c17b422..95c5eb2f183 100644
--- a/src/rustllvm/PassWrapper.cpp
+++ b/src/rustllvm/PassWrapper.cpp
@@ -347,7 +347,6 @@ static PassBuilder::OptimizationLevel fromRust(LLVMRustPassBuilderOptLevel Level
 }
 
 enum class LLVMRustRelocMode {
-  Default,
   Static,
   PIC,
   DynamicNoPic,
@@ -356,10 +355,8 @@ enum class LLVMRustRelocMode {
   ROPIRWPI,
 };
 
-static Optional<Reloc::Model> fromRust(LLVMRustRelocMode RustReloc) {
+static Reloc::Model fromRust(LLVMRustRelocMode RustReloc) {
   switch (RustReloc) {
-  case LLVMRustRelocMode::Default:
-    return None;
   case LLVMRustRelocMode::Static:
     return Reloc::Static;
   case LLVMRustRelocMode::PIC:
-- 
cgit 1.4.1-3-g733a5