fixup! [llvm-objcopy] Error with relevant message when adding invalid notes

Author: serge-sans-paille

llvm/docs/CommandGuide/llvm-objcopy.rst

@@ -512,11 +512,14 @@ them.
  specified format. See `SUPPORTED FORMATS`_ for a list of valid ``<format>``
  values.
 
-.. option:: --verify-note-sections, --no-verify-note-sections
+.. option:: --verify-note-sections
 
- When adding note sections, verify if the section format is valid. Defaults to
- ``--verify-note-sections``
+ When adding note sections, verify if the section format is valid. This flag is
+ turned on by default for ELF files.
 
+.. option:: --no-verify-note-sections
+
+ When adding note sections, do not verify if the section format is valid.
 
 .. option:: --weaken-symbol <symbol>, -W
 

llvm/test/tools/llvm-objcopy/ELF/add-invalid-note.test

@@ -1,28 +1,28 @@
 ## Verify that --add-section warns on invalid note sections.
 
-# Add [namesz, descsz, type, name, desc] for a build id.
+## Add [namesz, descsz, type, name, desc] for a build id.
 
-## Notes should be padded on 8 bits
+## Notes should be padded on 8 bytes.
 # RUN: echo -e -n "\x04\x00\x00\x00" >  %t-miss-padding-note.bin
 # RUN: echo -e -n "\x07\x00\x00\x00" >> %t-miss-padding-note.bin
 # RUN: echo -e -n "\x03\x00\x00\x00" >> %t-miss-padding-note.bin
 # RUN: echo -e -n "GNU\x00"          >> %t-miss-padding-note.bin
 # RUN: echo -e -n "\x0c\x0d\x0e"     >> %t-miss-padding-note.bin
 
-## The namesz field bit is incorrect
+## The namesz field bit is incorrect.
 # RUN: echo -e -n "\x08\x00\x00\x00" >  %t-invalid-size-note.bin
 # RUN: echo -e -n "\x07\x00\x00\x00" >> %t-invalid-size-note.bin
 # RUN: echo -e -n "\x03\x00\x00\x00" >> %t-invalid-size-note.bin
 # RUN: echo -e -n "GNU\x00"          >> %t-invalid-size-note.bin
 # RUN: echo -e -n "\x0c\x0d\x0e\x00" >> %t-invalid-size-note.bin
 
-## Missing type field
+## Missing type field.
 # RUN: echo -e -n "\x08\x00\x00\x00" >  %t-short-note.bin
 # RUN: echo -e -n "\x07\x00\x00\x00" >> %t-short-note.bin
 
 # RUN: yaml2obj %s -o %t.o
 
-## test each invalid note
+## Test each invalid note.
 # RUN: not llvm-objcopy --add-section=.note.miss.padding=%t-miss-padding-note.bin %t.o %t-with-note.o 2>&1 | FileCheck --check-prefix=CHECK-MISS-PADDING %s
 # CHECK-MISS-PADDING: .note.miss.padding data size must be a multiple of 4 bytes
 

llvm/tools/llvm-objcopy/ObjcopyOptions.cpp

@@ -950,10 +950,8 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
                              : DiscardType::Locals;
   }
 
-  const bool ShouldVerifyNoteSectionsByDefault = true;
   ELFConfig.VerifyNoteSections = InputArgs.hasFlag(
-      OBJCOPY_verify_note_sections, OBJCOPY_no_verify_note_sections,
-      ShouldVerifyNoteSectionsByDefault);
+      OBJCOPY_verify_note_sections, OBJCOPY_no_verify_note_sections, true);
 
   Config.OnlyKeepDebug = InputArgs.hasArg(OBJCOPY_only_keep_debug);
   ELFConfig.KeepFileSymbols = InputArgs.hasArg(OBJCOPY_keep_file_symbols);

llvm/tools/llvm-objcopy/ObjcopyOpts.td

@@ -5,7 +5,6 @@ multiclass B<string name, string help1, string help2> {
   def no_ # NAME: Flag<["--"], "no-" # name>, HelpText<help2>;
 }
 
-
 defm binary_architecture
     : Eq<"binary-architecture", "Ignored for compatibility">;
 def B : JoinedOrSeparate<["-"], "B">,