Index: lld/COFF/Config.h =================================================================== --- lld/COFF/Config.h +++ lld/COFF/Config.h @@ -249,9 +249,9 @@ uint32_t minorImageVersion = 0; // If changing the default os/subsys version here, update the default in // the MinGW driver accordingly. - uint32_t majorOSVersion = 6; + uint32_t majorOSVersion = 4; uint32_t minorOSVersion = 0; - uint32_t majorSubsystemVersion = 6; + uint32_t majorSubsystemVersion = 4; uint32_t minorSubsystemVersion = 0; uint32_t timestamp = 0; uint32_t functionPadMin = 0; Index: lld/test/COFF/hello32.test =================================================================== --- lld/test/COFF/hello32.test +++ lld/test/COFF/hello32.test @@ -34,11 +34,11 @@ HEADER-NEXT: ImageBase: 0x400000 HEADER-NEXT: SectionAlignment: 4096 HEADER-NEXT: FileAlignment: 512 -HEADER-NEXT: MajorOperatingSystemVersion: 6 +HEADER-NEXT: MajorOperatingSystemVersion: 4 HEADER-NEXT: MinorOperatingSystemVersion: 0 HEADER-NEXT: MajorImageVersion: 0 HEADER-NEXT: MinorImageVersion: 0 -HEADER-NEXT: MajorSubsystemVersion: 6 +HEADER-NEXT: MajorSubsystemVersion: 4 HEADER-NEXT: MinorSubsystemVersion: 0 HEADER-NEXT: SizeOfImage: 20480 HEADER-NEXT: SizeOfHeaders: 1024 Index: lld/test/COFF/subsystem.test =================================================================== --- lld/test/COFF/subsystem.test +++ lld/test/COFF/subsystem.test @@ -37,7 +37,7 @@ CHECK4: MajorOperatingSystemVersion: 1 CHECK4: MinorOperatingSystemVersion: 2 -CHECK4: MajorSubsystemVersion: 6 +CHECK4: MajorSubsystemVersion: 4 CHECK4: MinorSubsystemVersion: 0 # RUN: lld-link /entry:main /out:%t.exe /osversion:1.2 /subsystem:default,3.4 \ Index: lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm.yaml @@ -16,11 +16,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml @@ -16,11 +16,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/basic-info.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/basic-info.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/basic-info.yaml @@ -16,11 +16,11 @@ ImageBase: 290816 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/disassemble-thumb.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/disassemble-thumb.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/disassemble-thumb.yaml @@ -12,11 +12,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/invalid-export-table.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/invalid-export-table.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/invalid-export-table.yaml @@ -11,11 +11,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/section-types.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/section-types.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/section-types.yaml @@ -12,11 +12,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_NO_SEH, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/sections-names.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/sections-names.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/sections-names.yaml @@ -12,11 +12,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/sections.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/sections.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/sections.yaml @@ -40,11 +40,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/symbol.yaml @@ -14,11 +14,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml =================================================================== --- lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml +++ lldb/test/Shell/ObjectFile/PECOFF/uuid.yaml @@ -10,11 +10,11 @@ ImageBase: 2147483648 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT ] Index: llvm/test/tools/llvm-objcopy/COFF/Inputs/i386-exe.yaml =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/Inputs/i386-exe.yaml +++ llvm/test/tools/llvm-objcopy/COFF/Inputs/i386-exe.yaml @@ -4,11 +4,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_NO_SEH, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml +++ llvm/test/tools/llvm-objcopy/COFF/Inputs/only-keep-sections.yaml @@ -4,11 +4,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-exe.yaml =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-exe.yaml +++ llvm/test/tools/llvm-objcopy/COFF/Inputs/x86_64-exe.yaml @@ -4,11 +4,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-objcopy/COFF/debug-dir-unmapped.test =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/debug-dir-unmapped.test +++ llvm/test/tools/llvm-objcopy/COFF/debug-dir-unmapped.test @@ -14,11 +14,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-objcopy/COFF/debug-entry-no-payload.test =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/debug-entry-no-payload.test +++ llvm/test/tools/llvm-objcopy/COFF/debug-entry-no-payload.test @@ -21,11 +21,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test +++ llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir.test @@ -26,11 +26,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir2.test =================================================================== --- llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir2.test +++ llvm/test/tools/llvm-objcopy/COFF/patch-debug-dir2.test @@ -30,11 +30,11 @@ ImageBase: 5368709120 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-objdump/COFF/Inputs/eh_frame-coff.yaml =================================================================== --- llvm/test/tools/llvm-objdump/COFF/Inputs/eh_frame-coff.yaml +++ llvm/test/tools/llvm-objdump/COFF/Inputs/eh_frame-coff.yaml @@ -4,11 +4,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_NO_SEH, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-readobj/COFF/arm64-packed-symbol-name.yaml =================================================================== --- llvm/test/tools/llvm-readobj/COFF/arm64-packed-symbol-name.yaml +++ llvm/test/tools/llvm-readobj/COFF/arm64-packed-symbol-name.yaml @@ -11,11 +11,11 @@ ImageBase: 5368709120 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-readobj/COFF/debug-directory-unmapped.test =================================================================== --- llvm/test/tools/llvm-readobj/COFF/debug-directory-unmapped.test +++ llvm/test/tools/llvm-readobj/COFF/debug-directory-unmapped.test @@ -37,11 +37,11 @@ ImageBase: 1073741824 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ ] Index: llvm/test/tools/llvm-readobj/COFF/file-headers.test =================================================================== --- llvm/test/tools/llvm-readobj/COFF/file-headers.test +++ llvm/test/tools/llvm-readobj/COFF/file-headers.test @@ -144,11 +144,11 @@ # I386-CUSTOM-HEADER-NEXT: ImageBase: 0x400000 # I386-CUSTOM-HEADER-NEXT: SectionAlignment: 4096 # I386-CUSTOM-HEADER-NEXT: FileAlignment: 512 -# I386-CUSTOM-HEADER-NEXT: MajorOperatingSystemVersion: 6 +# I386-CUSTOM-HEADER-NEXT: MajorOperatingSystemVersion: 4 # I386-CUSTOM-HEADER-NEXT: MinorOperatingSystemVersion: 0 # I386-CUSTOM-HEADER-NEXT: MajorImageVersion: 0 # I386-CUSTOM-HEADER-NEXT: MinorImageVersion: 0 -# I386-CUSTOM-HEADER-NEXT: MajorSubsystemVersion: 6 +# I386-CUSTOM-HEADER-NEXT: MajorSubsystemVersion: 4 # I386-CUSTOM-HEADER-NEXT: MinorSubsystemVersion: 0 # I386-CUSTOM-HEADER-NEXT: SizeOfImage: 4096 # I386-CUSTOM-HEADER-NEXT: SizeOfHeaders: 512 @@ -225,11 +225,11 @@ ImageBase: 4194304 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-readobj/COFF/unwind-arm64-image.yaml =================================================================== --- llvm/test/tools/llvm-readobj/COFF/unwind-arm64-image.yaml +++ llvm/test/tools/llvm-readobj/COFF/unwind-arm64-image.yaml @@ -40,11 +40,11 @@ ImageBase: 5368709120 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/llvm-readobj/COFF/unwind-x86_64-image.yaml =================================================================== --- llvm/test/tools/llvm-readobj/COFF/unwind-x86_64-image.yaml +++ llvm/test/tools/llvm-readobj/COFF/unwind-x86_64-image.yaml @@ -28,11 +28,11 @@ ImageBase: 5368709120 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ] Index: llvm/test/tools/yaml2obj/COFF/basic-arm64.yaml =================================================================== --- llvm/test/tools/yaml2obj/COFF/basic-arm64.yaml +++ llvm/test/tools/yaml2obj/COFF/basic-arm64.yaml @@ -16,11 +16,11 @@ ImageBase: 5368709120 SectionAlignment: 4096 FileAlignment: 512 - MajorOperatingSystemVersion: 6 + MajorOperatingSystemVersion: 4 MinorOperatingSystemVersion: 0 MajorImageVersion: 0 MinorImageVersion: 0 - MajorSubsystemVersion: 6 + MajorSubsystemVersion: 4 MinorSubsystemVersion: 0 Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI DLLCharacteristics: [ IMAGE_DLL_CHARACTERISTICS_HIGH_ENTROPY_VA, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT, IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE ]