ARM: Update R_ARM_TARGET1 command line option names (remove prefix 'arm-')

[lenykholodov]

Summary

Command line options --arm-target1-rel and --arm-target1-abs have been renamed to be compatible with GNU linkers.

[atanasyan]

LGTM

lib/Driver/GnuLdDriver.cpp

549 ↗

(On Diff #23795)

This does not relate to this patch but the else if statement violates the "else after a return" rule:
http://llvm.org/docs/CodingStandards.html#don-t-use-else-after-a-return

552 ↗

(On Diff #23795)

We can handle both else if statements below in a uniform way:

else {
  for (const auto *arg : parsedArgs->filtered(OPT_grp_arm_targetopts)) {
    diag << "warning: ignoring unsupported ARM/ELF specific argument: "
         << arg->getSpelling() << "\n";
  }
}

[ruiu]

LGTM

[lenykholodov]

lib/Driver/GnuLdDriver.cpp

552 ↗

(On Diff #23795)

Thank you for this hint. I didn't know about such possibility.

lld/trunk/lib/Driver/GnuLdDriver.cpp

bool GnuLdDriver::parse(int argc, const char *argv[],
 
   if (auto *arg = parsedArgs->getLastArg(OPT_fini))
     ctx->setFiniFunction(arg->getValue());
 
   if (auto *arg = parsedArgs->getLastArg(OPT_output_filetype))
     ctx->setOutputFileType(arg->getValue());
 
   // Process ELF/ARM specific options
-  bool hasArmTarget1Rel = parsedArgs->hasArg(OPT_arm_target1_rel);
-  bool hasArmTarget1Abs = parsedArgs->hasArg(OPT_arm_target1_abs);
+  bool hasArmTarget1Rel = parsedArgs->hasArg(OPT_target1_rel);
+  bool hasArmTarget1Abs = parsedArgs->hasArg(OPT_target1_abs);
   if (triple.getArch() == llvm::Triple::arm) {
     if (hasArmTarget1Rel && hasArmTarget1Abs) {
-      diag << "error: options --arm-target1-rel and --arm-target1-abs"
+      diag << "error: options --target1-rel and --target1-abs"
               " can't be used together.\n";
       return false;
     } else if (hasArmTarget1Rel || hasArmTarget1Abs) {
       ctx->setArmTarget1Rel(hasArmTarget1Rel && !hasArmTarget1Abs);
     }
-  } else if (hasArmTarget1Rel) {
-    diag << "warning: ignoring unsupported ARM/ELF specific argument: "
-         << "--arm-target1-rel\n";
-  } else if (hasArmTarget1Abs) {
+  } else {
+    for (const auto *arg : parsedArgs->filtered(OPT_grp_arm_targetopts)) {
       diag << "warning: ignoring unsupported ARM/ELF specific argument: "
-         << "--arm-target1-abs\n";
+           << arg->getSpelling() << "\n";
+    }
   }
 
   // Process MIPS specific options.
   if (triple.getArch() == llvm::Triple::mips ||
       triple.getArch() == llvm::Triple::mipsel ||
       triple.getArch() == llvm::Triple::mips64 ||
       triple.getArch() == llvm::Triple::mips64el)
     ctx->setMipsPcRelEhRel(parsedArgs->hasArg(OPT_pcrel_eh_reloc));

lld/trunk/lib/Driver/GnuLdOptions.td

 def alias_output_filetype: Joined<["--"], "output-filetype=">,
       Alias<output_filetype>;
 
 //===----------------------------------------------------------------------===//
 /// Target Specific Options
 //===----------------------------------------------------------------------===//
 def grp_targetopts : OptionGroup<"opts">,
      HelpText<"ARCH SPECIFIC OPTIONS">;
-def arm_target1_rel : Flag<["--"], "arm-target1-rel">,
-     Group<grp_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_REL32">;
-def arm_target1_abs : Flag<["--"], "arm-target1-abs">,
-     Group<grp_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_ABS32">;
+
+//===----------------------------------------------------------------------===//
+/// ARM Target Specific Options
+//===----------------------------------------------------------------------===//
+def grp_arm_targetopts : OptionGroup<"ARM SPECIFIC OPTIONS">,
+     Group<grp_targetopts>;
+def target1_rel : Flag<["--"], "target1-rel">,
+     Group<grp_arm_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_REL32">;
+def target1_abs : Flag<["--"], "target1-abs">,
+     Group<grp_arm_targetopts>, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_ABS32">;
 
 //===----------------------------------------------------------------------===//
 /// MIPS Target Specific Options
 //===----------------------------------------------------------------------===//
 def grp_mips_targetopts : OptionGroup<"MIPS SPECIFIC OPTIONS">,
      Group<grp_targetopts>;
 def pcrel_eh_reloc : Flag<["-", "--"], "pcrel-eh-reloc">,
      Group<grp_mips_targetopts>,

lld/trunk/test/elf/ARM/rel-arm-target1.test

 # Check handling of R_ARM_TARGET1 relocation.
 #
 # 1. R_ARM_TARGET1 is equal to R_ARM_ABS32
 # RUN: yaml2obj -format=elf -docnum 1 %s > %t-abs32.o
 # RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
-# RUN: --noinhibit-exec --arm-target1-abs %t-abs32.o -o %t-abs32
+# RUN: --noinhibit-exec --target1-abs %t-abs32.o -o %t-abs32
 # RUN: llvm-objdump -s -t %t-abs32 | FileCheck -check-prefix=CHECK-ABS32 %s
 #
 # CHECK-ABS32: Contents of section .data:
 # CHECK-ABS32-NEXT: 401000 84004000
 # CHECK-ABS32: SYMBOL TABLE:
 # CHECK-ABS32: 00400074 g     F .text  {{[0-9a-f]+}} main
 # CHECK-ABS32: 00401000 g       .data  00000004 data
 #
 # 2. R_ARM_TARGET1 is equal to R_ARM_REL32
 # Check handling of R_ARM_REL32 relocation.
 # RUN: yaml2obj -format=elf %s -docnum 2 > %t-rel32.o
 # RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
-# RUN: --noinhibit-exec --arm-target1-rel %t-rel32.o -o %t-rel32
+# RUN: --noinhibit-exec --target1-rel %t-rel32.o -o %t-rel32
 # RUN: llvm-objdump -s -t %t-rel32 | FileCheck -check-prefix=CHECK-REL32 %s
 #
 # CHECK-REL32: Contents of section .text:
 # CHECK-REL32-NEXT: 400074 {{[0-9a-f]+}} 880fff00
 # CHECK-REL32: SYMBOL TABLE:
 # CHECK-REL32: 00400074 g     F .text {{[0-9a-f]+}} main
 # CHECK-REL32: 00401000 g       .bss  {{[0-9a-f]+}} _myref
 

lld/trunk/test/elf/options/target-specific-args.test

 # Test of target specific options
-# RUN: lld -flavor gnu -target x86_64 --arm-target1-rel \
+# RUN: lld -flavor gnu -target x86_64 --target1-rel \
 # RUN: %p/../Inputs/foo.o.x86-64 --noinhibit-exec -o %t 2>&1 | FileCheck %s
 
-# CHECK: warning: ignoring unsupported ARM/ELF specific argument: --arm-target1-rel
+# CHECK: warning: ignoring unsupported ARM/ELF specific argument: --target1-rel