Index: clang/tools/driver/cc1as_main.cpp
===================================================================
--- clang/tools/driver/cc1as_main.cpp
+++ clang/tools/driver/cc1as_main.cpp
@@ -403,6 +403,12 @@
     PIC = false;
   } else if (Opts.RelocationModel == "pic") {
     PIC = true;
+  } else if (Opts.RelocationModel == "ropi-rwpi") {
+    PIC = true;
+  } else if (Opts.RelocationModel == "ropi") {
+    PIC = false;
+  } else if (Opts.RelocationModel == "rwpi") {
+    PIC = false;
   } else {
     assert(Opts.RelocationModel == "dynamic-no-pic" &&
            "Invalid PIC model!");