Merge commit '39772da5fd01' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/include/llvm/Object/XCOFFObjectFile.h

@@ -116,7 +116,7 @@ struct XCOFFAuxiliaryHeader32 : XCOFFAuxiliaryHeader<XCOFFAuxiliaryHeader32> {
   support::ubig16_t SecNumOfTBSS;
 };
 
-struct XCOFFAuxiliaryHeader64 : XCOFFAuxiliaryHeader<XCOFFAuxiliaryHeader32> {
+struct XCOFFAuxiliaryHeader64 : XCOFFAuxiliaryHeader<XCOFFAuxiliaryHeader64> {
   support::ubig16_t AuxMagic;
   support::ubig16_t Version;
   support::ubig32_t ReservedForDebugger;

llvm/test/tools/llvm-readobj/XCOFF/Inputs/xcoff-32-xlc-exec renamed to llvm/test/tools/llvm-readobj/XCOFF/Inputs/xlc32-exec

@@ -104,7 +104,7 @@ Sections:
 # CASE2-NEXT:   Text page size: 0x0
 # CASE2-NEXT:   Data page size: 0x0
 # CASE2-NEXT:   Stack page size: 0x0
-# CASE2-NEXT:   Flag: 0x0
+# CASE2-NEXT:   Flag: 0x80
 # CASE2-NEXT:   Alignment of thread-local storage: 0x0
 # CASE2-NEXT:   Size of .text section: 0x8
 # CASE2-NEXT:   Size of .data section: 0x8
@@ -185,7 +185,7 @@ AuxiliaryHeader:
 # CASE4-NEXT:   Text page size: 0x0
 # CASE4-NEXT:   Data page size: 0x0
 # CASE4-NEXT:   Stack page size: 0x0
-# CASE4-NEXT:   Flag: 0x0
+# CASE4-NEXT:   Flag: 0x80
 # CASE4-NEXT:   Alignment of thread-local storage: 0x0
 # CASE4-NEXT:   Size of .text section: 0x0
 # CASE4-NEXT:   Size of .data section: 0x0

llvm/test/tools/llvm-readobj/XCOFF/Inputs/xcoff-32-xlc-obj-malform.o renamed to llvm/test/tools/llvm-readobj/XCOFF/Inputs/xlc32-obj-malform.o

@@ -67,7 +67,7 @@
 # CHECK64-NEXT:   Data page size: 0x1
 # CHECK64-NEXT:   Stack page size: 0x1
 # CHECK64-NEXT:   Flag: 0x0
-# CHECK64-NEXT:   Alignment of thread-local storage: 0x0
+# CHECK64-NEXT:   Alignment of thread-local storage: 0x1
 # CHECK64-NEXT:   Size of .text section: 0x8
 # CHECK64-NEXT:   Size of .data section: 0x9
 # CHECK64-NEXT:   Size of .bss section: 0x10

llvm/test/tools/llvm-readobj/XCOFF/Inputs/xcoff-32-xlc-obj.o renamed to llvm/test/tools/llvm-readobj/XCOFF/Inputs/xlc32-obj.o

@@ -46,6 +46,8 @@ Symbols:
 # CHECK-NEXT:   OptionalHeaderSize: 0x0
 # CHECK-NEXT:   Flags: 0x0
 # CHECK-NEXT: }
+# CHECK-NEXT: AuxiliaryHeader {
+# CHECK-NEXT: }
 # CHECK-NEXT: Sections [
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1

llvm/test/tools/llvm-readobj/XCOFF/Inputs/xcoff-64-xlc-exec renamed to llvm/test/tools/llvm-readobj/XCOFF/Inputs/xlc64-exec

@@ -42,6 +42,8 @@ Symbols:
 # CHECK64-NEXT:   OptionalHeaderSize: 0x0
 # CHECK64-NEXT:   Flags: 0x0
 # CHECK64-NEXT: }
+# CHECK64-NEXT: AuxiliaryHeader {
+# CHECK64-NEXT: }
 # CHECK64-NEXT: Sections [
 # CHECK64-NEXT:   Section {
 # CHECK64-NEXT:     Index: 1

llvm/test/tools/llvm-readobj/XCOFF/xcoff-auxiliary-header.test

@@ -60,6 +60,8 @@ Symbols:
 # CHECK-NEXT:   OptionalHeaderSize: 0x0
 # CHECK-NEXT:   Flags: 0x0
 # CHECK-NEXT: }
+# CHECK-NEXT: AuxiliaryHeader {
+# CHECK-NEXT: }
 # CHECK-NEXT: Sections [
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1

llvm/test/tools/yaml2obj/XCOFF/aux-hdr-defaults.yaml

@@ -86,7 +86,7 @@ def coff_tls_directory : FF<"coff-tls-directory", "Display TLS directory">, Grou
 
 // XCOFF specific options.
 def grp_xcoff : OptionGroup<"kind">, HelpText<"OPTIONS (XCOFF specific)">;
-def auxiliary_header : FF<"auxiliary-header" , "display the auxiliary header">, Group<grp_xcoff>;
+def auxiliary_header : FF<"auxiliary-header" , "Display the auxiliary header">, Group<grp_xcoff>;
 
 def help : FF<"help", "Display this help">;
 def version : FF<"version", "Display the version">;