Address review comments

Author: hoodmane

lld/test/wasm/rpath.s

@@ -1,5 +1,5 @@
 # RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
-# RUN: wasm-ld -shared -o %t1.wasm %t.o -rpath /a/b/c -rpath /x/y/z
+# RUN: wasm-ld -shared -o %t1.wasm %t.o -rpath /a/b/c -rpath /x/y/z --experimental-pic
 # RUN: obj2yaml %t1.wasm | FileCheck %s
 
 # CHECK:  - Type:            CUSTOM

lld/wasm/Config.h

@@ -70,7 +70,6 @@ struct Config {
   bool pie;
   bool printGcSections;
   bool relocatable;
-  llvm::SmallVector<llvm::StringRef, 0> rpath;
   bool saveTemps;
   bool shared;
   bool shlibSigCheck;
@@ -125,6 +124,7 @@ struct Config {
   std::optional<std::vector<std::string>> features;
   std::optional<std::vector<std::string>> extraFeatures;
   llvm::SmallVector<uint8_t, 0> buildIdVector;
+  llvm::SmallVector<llvm::StringRef, 0> rpath;
 };
 
 // The Ctx object hold all other (non-configuration) global state.

lld/wasm/Options.td

@@ -291,7 +291,6 @@ def: Flag<["-"], "t">, Alias<trace>, HelpText<"Alias for --trace">;
 def: JoinedOrSeparate<["-"], "y">, Alias<trace_symbol>, HelpText<"Alias for --trace-symbol">;
 def: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
 def: Flag<["-"], "V">, Alias<v>, HelpText<"Alias for -v">;
-def: JoinedOrSeparate<["-"], "R">, Alias<rpath>, HelpText<"Alias for --rpath">;
 
 // LTO-related options.
 def lto_O: JJ<"lto-O">, MetaVarName<"<opt-level>">,

lld/wasm/SyntheticSections.cpp

@@ -134,12 +134,12 @@ void DylinkSection::writeBody() {
 
     sub.writeTo(os);
   }
+
   if (!ctx.arg.rpath.empty()) {
     SubSection sub(WASM_DYLINK_RUNTIME_PATH);
     writeUleb128(sub.os, ctx.arg.rpath.size(), "num rpath entries");
-    for (const auto ref : ctx.arg.rpath) {
+    for (const auto ref : ctx.arg.rpath)
       writeStr(sub.os, ref, "rpath entry");
-    }
     sub.writeTo(os);
   }
 }