Skip to content

Commit 7ebf464

Browse files
committed
ld: Avoid magic numbers for subsystems in pe.em and pep.em
1 parent 844be75 commit 7ebf464

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ld/emultempl/pe.em

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fragment <<EOF
131131
| IMAGE_DLL_CHARACTERISTICS_NX_COMPAT)
132132

133133
#if defined(TARGET_IS_i386pe) || ! defined(DLL_SUPPORT)
134-
#define PE_DEF_SUBSYSTEM 3
134+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_CUI
135135
#else
136136
#undef NT_EXE_IMAGE_BASE
137137
#undef PE_DEF_SECTION_ALIGNMENT
@@ -140,13 +140,13 @@ fragment <<EOF
140140

141141
#if defined(TARGET_IS_armpe)
142142
#define PE_DEF_SECTION_ALIGNMENT 0x00001000
143-
#define PE_DEF_SUBSYSTEM 2
143+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_GUI
144144
#elif defined(TARGET_IS_arm_wince_pe)
145145
#define PE_DEF_SECTION_ALIGNMENT 0x00001000
146-
#define PE_DEF_SUBSYSTEM 9
146+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_CE_GUI
147147
#else
148148
#define PE_DEF_SECTION_ALIGNMENT 0x00000400
149-
#define PE_DEF_SUBSYSTEM 2
149+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_GUI
150150
#endif
151151
#define PE_DEF_FILE_ALIGNMENT 0x00000200
152152
#endif

ld/emultempl/pep.em

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fragment <<EOF
131131
| IMAGE_DLL_CHARACTERISTICS_NX_COMPAT)
132132

133133
#if defined(TARGET_IS_i386pep) || defined(COFF_WITH_peAArch64) || ! defined(DLL_SUPPORT)
134-
#define PE_DEF_SUBSYSTEM 3
134+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_CUI
135135
#undef NT_EXE_IMAGE_BASE
136136
#define NT_EXE_IMAGE_BASE \
137137
((bfd_vma) (${move_default_addr_high} ? 0x100400000LL \
@@ -166,7 +166,7 @@ fragment <<EOF
166166
((bfd_vma) (${move_default_addr_high} ? 0x0ffff0000LL \
167167
: 0x0ffc0000LL))
168168
#undef PE_DEF_SECTION_ALIGNMENT
169-
#define PE_DEF_SUBSYSTEM 2
169+
#define PE_DEF_SUBSYSTEM IMAGE_SUBSYSTEM_WINDOWS_GUI
170170
#undef PE_DEF_FILE_ALIGNMENT
171171
#define PE_DEF_FILE_ALIGNMENT 0x00000200
172172
#define PE_DEF_SECTION_ALIGNMENT 0x00000400

0 commit comments

Comments
 (0)