Index: ELF/Options.td
===================================================================
--- ELF/Options.td
+++ ELF/Options.td
@@ -22,10 +22,10 @@
 
 def build_id_eq: J<"build-id=">, HelpText<"Generate build ID note">;
 
-def compress_debug_sections : J<"compress-debug-sections=">,
+def compress_debug_sections : S<"compress-debug-sections=">,
   HelpText<"Compress DWARF debug sections">;
 
-def defsym: J<"defsym=">, HelpText<"Define a symbol alias">;
+def defsym: S<"defsym">, HelpText<"Define a symbol alias">;
 
 def L: JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">,
   HelpText<"Add a directory to the library search path">;
@@ -104,7 +104,7 @@
 def fatal_warnings: F<"fatal-warnings">,
   HelpText<"Treat warnings as errors">;
 
-def filter: J<"filter=">, HelpText<"Set DT_FILTER field to the specified name">;
+def filter: S<"filter">, HelpText<"Set DT_FILTER field to the specified name">;
 
 def fini: S<"fini">, MetaVarName<"<symbol>">,
   HelpText<"Specify a finalizer function">;
@@ -112,7 +112,7 @@
 def full_shutdown : F<"full-shutdown">,
   HelpText<"Perform a full shutdown instead of calling _exit">;
 
-def format: J<"format=">, MetaVarName<"<input-format>">,
+def format: S<"format">, MetaVarName<"<input-format>">,
   HelpText<"Change the input format of the inputs following this option">;
 
 def gc_sections: F<"gc-sections">,
@@ -128,7 +128,7 @@
 
 def icf: F<"icf=all">, HelpText<"Enable identical code folding">;
 
-def image_base : J<"image-base=">, HelpText<"Set the base address">;
+def image_base : S<"image-base">, HelpText<"Set the base address">;
 
 def init: S<"init">, MetaVarName<"<symbol>">,
   HelpText<"Specify an initializer function">;
@@ -213,7 +213,7 @@
 
 def relocatable: F<"relocatable">, HelpText<"Create relocatable object file">;
 
-def retain_symbols_file: J<"retain-symbols-file=">, MetaVarName<"<file>">,
+def retain_symbols_file: S<"retain-symbols-file">, MetaVarName<"<file>">,
   HelpText<"Retain only the symbols listed in the file">;
 
 def script: S<"script">, HelpText<"Read linker script">;
@@ -223,7 +223,7 @@
 
 def shared: F<"shared">, HelpText<"Build a shared object">;
 
-def soname: J<"soname=">, HelpText<"Set DT_SONAME">;
+def soname: S<"soname">, HelpText<"Set DT_SONAME">;
 
 def sort_section: S<"sort-section">, HelpText<"Specifies sections sorting rule when linkerscript is used">;
 
@@ -237,7 +237,7 @@
 def symbol_ordering_file: S<"symbol-ordering-file">,
   HelpText<"Layout sections in the order specified by symbol file">;
 
-def sysroot: J<"sysroot=">, HelpText<"Set the system root">;
+def sysroot: S<"sysroot">, HelpText<"Set the system root">;
 
 def target1_rel: F<"target1-rel">, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_REL32">;
 
@@ -254,7 +254,7 @@
 def undefined: S<"undefined">,
   HelpText<"Force undefined symbol during linking">;
 
-def unresolved_symbols: J<"unresolved-symbols=">,
+def unresolved_symbols: S<"unresolved-symbols">,
   HelpText<"Determine how to handle unresolved symbols">;
 
 def rsp_quoting: J<"rsp-quoting=">,
@@ -291,11 +291,14 @@
 def alias_Bstatic_dn: F<"dn">, Alias<Bstatic>;
 def alias_Bstatic_non_shared: F<"non_shared">, Alias<Bstatic>;
 def alias_Bstatic_static: F<"static">, Alias<Bstatic>;
-def alias_L__library_path: J<"library-path=">, Alias<L>;
+def alias_L__library_path_eq: J<"library-path=">, Alias<L>;
+def alias_L__library_path: S<"library-path">, Alias<L>;
+def alias_compress_debug_sections_eq : J<"compress-debug-sections=">,
+  Alias<compress_debug_sections>;
 def alias_define_common_d: Flag<["-"], "d">, Alias<define_common>;
 def alias_define_common_dc: F<"dc">, Alias<define_common>;
 def alias_define_common_dp: F<"dp">, Alias<define_common>;
-def alias_defsym: S<"defsym">, Alias<defsym>;
+def alias_defsym_eq: J<"defsym=">, Alias<defsym>;
 def alias_discard_all_x: Flag<["-"], "x">, Alias<discard_all>;
 def alias_discard_locals_X: Flag<["-"], "X">, Alias<discard_locals>;
 def alias_dynamic_list: J<"dynamic-list=">, Alias<dynamic_list>;
@@ -308,11 +311,15 @@
 def alias_export_dynamic_symbol: J<"export-dynamic-symbol=">,
   Alias<export_dynamic_symbol>;
 def alias_filter: Separate<["-"], "F">, Alias<filter>;
+def alias_filter_eq: J<"filter=">, Alias<filter>;
 def alias_fini_fini: J<"fini=">, Alias<fini>;
 def alias_format_b: S<"b">, Alias<format>;
+def alias_format_eq: J<"format=">, Alias<format>;
 def alias_hash_style_hash_style: J<"hash-style=">, Alias<hash_style>;
 def alias_init_init: J<"init=">, Alias<init>;
-def alias_l__library: J<"library=">, Alias<l>;
+def alias_image_base_eq: J<"image-base=">, Alias<image_base>;
+def alias_l__library_eq: J<"library=">, Alias<l>;
+def alias_l__library: S<"library">, Alias<l>;
 def alias_Map_eq: J<"Map=">, Alias<Map>;
 def alias_omagic: Flag<["-"], "N">, Alias<omagic>;
 def alias_o_output: Joined<["--"], "output=">, Alias<o>;
@@ -321,17 +328,18 @@
 def alias_print_map_M: Flag<["-"], "M">, Alias<print_map>;
 def alias_relocatable_r: Flag<["-"], "r">, Alias<relocatable>;
 def alias_reproduce_eq: J<"reproduce=">, Alias<reproduce>;
-def alias_retain_symbols_file: S<"retain-symbols-file">, Alias<retain_symbols_file>;
+def alias_retain_symbols_file_eq: J<"retain-symbols-file=">, Alias<retain_symbols_file>;
 def alias_rpath_R: JoinedOrSeparate<["-"], "R">, Alias<rpath>;
 def alias_rpath_rpath: J<"rpath=">, Alias<rpath>;
 def alias_script_T: JoinedOrSeparate<["-"], "T">, Alias<script>;
 def alias_shared_Bshareable: F<"Bshareable">, Alias<shared>;
 def alias_soname_h: JoinedOrSeparate<["-"], "h">, Alias<soname>;
-def alias_soname_soname: S<"soname">, Alias<soname>;
+def alias_soname_eq: J<"soname=">, Alias<soname>;
 def alias_sort_section: J<"sort-section=">, Alias<sort_section>;
 def alias_script: J<"script=">, Alias<script>;
 def alias_strip_all: Flag<["-"], "s">, Alias<strip_all>;
 def alias_strip_debug_S: Flag<["-"], "S">, Alias<strip_debug>;
+def alias_sysroot_eq: J<"sysroot=">, Alias<sysroot>;
 def alias_Tbss: J<"Tbss=">, Alias<Tbss>;
 def alias_Tdata: J<"Tdata=">, Alias<Tdata>;
 def alias_trace: Flag<["-"], "t">, Alias<trace>;
@@ -342,6 +350,7 @@
 def alias_Ttext_segment_eq: J<"Ttext-segment=">, Alias<Ttext>;
 def alias_undefined_eq: J<"undefined=">, Alias<undefined>;
 def alias_undefined_u: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
+def alias_unresolved_symbols_eq: J<"unresolved-symbols=">, Alias<unresolved_symbols>;
 def alias_version_script_eq: J<"version-script=">, Alias<version_script>;
 def alias_version_V: Flag<["-"], "V">, Alias<version>;
 def alias_wrap_wrap: J<"wrap=">, Alias<wrap>;
Index: test/ELF/compress-debug-sections.s
===================================================================
--- test/ELF/compress-debug-sections.s
+++ test/ELF/compress-debug-sections.s
@@ -8,6 +8,7 @@
 # ZLIBCONTENT-NOT: AAAAAAAAA
 
 # RUN: llvm-readobj -s %t1 | FileCheck %s --check-prefix=ZLIBFLAGS
+
 # ZLIBFLAGS:       Section {
 # ZLIBFLAGS:         Index:
 # ZLIBFLAGS:         Name: .debug_str
@@ -21,6 +22,11 @@
 # DEBUGSTR-NEXT:  AAAAAAAAAAAAAAAAAAAAAAAAAAA
 # DEBUGSTR-NEXT:  BBBBBBBBBBBBBBBBBBBBBBBBBBB
 
+## Test alias.
+# RUN: ld.lld %t.o -o %t2 --compress-debug-sections zlib
+# RUN: llvm-objdump -s %t2 | FileCheck %s --check-prefix=ZLIBCONTENT
+# RUN: llvm-readobj -s %t2 | FileCheck %s --check-prefix=ZLIBFLAGS
+
 # RUN: not ld.lld %t.o -o %t1 --compress-debug-sections=zlib-gabi 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERR %s
 # ERR: unknown --compress-debug-sections value: zlib-gabi
Index: test/ELF/duplicated-synthetic-sym.s
===================================================================
--- test/ELF/duplicated-synthetic-sym.s
+++ test/ELF/duplicated-synthetic-sym.s
@@ -1,6 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: cd %S
 // RUN: not ld.lld %t.o --format=binary duplicated-synthetic-sym.s -o %t.elf 2>&1 | FileCheck %s
+// RUN: not ld.lld %t.o --format binary duplicated-synthetic-sym.s -o %t.elf 2>&1 | FileCheck %s
 
 // CHECK: duplicate symbol: _binary_duplicated_synthetic_sym_s_start
 // CHECK: defined at (internal):(.data+0x0)
Index: test/ELF/filter.s
===================================================================
--- test/ELF/filter.s
+++ test/ELF/filter.s
@@ -2,10 +2,14 @@
 # RUN: ld.lld %t.o -shared -F foo.so -F boo.so -o %t1
 # RUN: llvm-readobj --dynamic-table %t1 | FileCheck %s
 
-# Test alias.
+# Test alias #1.
 # RUN: ld.lld %t.o -shared --filter=foo.so --filter=boo.so -o %t2
 # RUN: llvm-readobj --dynamic-table %t2 | FileCheck %s
 
+# Test alias #2.
+# RUN: ld.lld %t.o -shared --filter foo.so --filter boo.so -o %t3
+# RUN: llvm-readobj --dynamic-table %t3 | FileCheck %s
+
 # CHECK:      DynamicSection [
 # CHECK-NEXT: Tag                Type          Name/Value
 # CHECK-NEXT: 0x000000007FFFFFFF FILTER        Filter library: [foo.so]
Index: test/ELF/image-base.s
===================================================================
--- test/ELF/image-base.s
+++ test/ELF/image-base.s
@@ -6,6 +6,9 @@
 # RUN: ld.lld -image-base=0x1000 -z max-page-size=0x2000 %t -o %t1 2>&1 | FileCheck --check-prefix=WARN %s
 # WARN: warning: -image-base: address isn't multiple of page size: 0x1000
 
+# Check alias.
+# RUN: ld.lld -image-base 0x1000000 %t -o %t1
+# RUN: llvm-readobj -program-headers %t1 | FileCheck %s
 
 .global _start
 _start:
Index: test/ELF/libsearch.s
===================================================================
--- test/ELF/libsearch.s
+++ test/ELF/libsearch.s
@@ -60,6 +60,7 @@
 
 // Check long forms as well
 // RUN: ld.lld -o %t3 %t.o --library-path=%t.dir --library=ls
+// RUN: ld.lld -o %t3 %t.o --library-path %t.dir --library ls
 
 // Should not search for dynamic libraries if -Bstatic is specified
 // RUN: ld.lld -o %t3 %t.o -L%t.dir -Bstatic -lls
Index: test/ELF/sysroot.s
===================================================================
--- test/ELF/sysroot.s
+++ test/ELF/sysroot.s
@@ -28,6 +28,8 @@
 // Should substitute SysRoot if specified
 // RUN: ld.lld -o %t/r %t/m.o --sysroot=%t -L=lib -l:libls.a
 // RUN: ld.lld -o %t/r %t/m.o --sysroot=%t -L=/lib -l:libls.a
+// Check alias.
+// RUN: ld.lld -o %t/r %t/m.o --sysroot %t -L=lib -l:libls.a
 
 // Should not substitute SysRoot if the directory name does not start with '='
 // RUN: not ld.lld -o %t/r %r/m.o --sysroot=%t -Llib -l:libls.a
Index: test/ELF/unresolved-symbols.s
===================================================================
--- test/ELF/unresolved-symbols.s
+++ test/ELF/unresolved-symbols.s
@@ -13,6 +13,9 @@
 # RUN: not ld.lld %t1.o %t2.o -o %t --unresolved-symbols=xxx 2>&1 | \
 # RUN:   FileCheck -check-prefix=ERR1 %s
 # ERR1: unknown --unresolved-symbols value: xxx
+## Check alias.
+# RUN: not ld.lld %t1.o %t2.o -o %t --unresolved-symbols xxx 2>&1 | \
+# RUN:   FileCheck -check-prefix=ERR1 %s
 
 ## Ignore all should not produce error for symbols from object except
 ## case when --no-undefined specified.