From d9118602518511148f81961bbdd632439db10a19 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 17 Apr 2009 15:03:48 +0000 Subject: [PATCH] bfd/ 2009-04-17 H.J. Lu * peXXigen.c (_bfd_XX_print_private_bfd_data_common): Replace IMAGE_SUBSYSTEM_EFI_ROM with IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER. binutils/ 2009-04-17 H.J. Lu * objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd. * doc/binutils.texi: Likewise. include/coff/ 2009-04-17 H.J. Lu * pe.h (IMAGE_SUBSYSTEM_EFI_ROM): Renamed to ... (IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER): This. --- bfd/ChangeLog | 5 +++++ bfd/peXXigen.c | 7 ++++--- binutils/ChangeLog | 5 +++++ binutils/doc/binutils.texi | 2 +- binutils/objcopy.c | 2 +- include/coff/ChangeLog | 5 +++++ include/coff/pe.h | 2 +- 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8f85d19..765bb96 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2009-04-17 H.J. Lu + * peXXigen.c (_bfd_XX_print_private_bfd_data_common): Replace + IMAGE_SUBSYSTEM_EFI_ROM with IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER. + +2009-04-17 H.J. Lu + PR binutils/10074 * coffcode.h (bfd_pei_p): New. diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index b3b39de..db6af64 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -2198,6 +2198,7 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: subsystem_name = "Wince CUI"; break; + // These are from UEFI Platform Initialization Specification 1.1. case IMAGE_SUBSYSTEM_EFI_APPLICATION: subsystem_name = "EFI application"; break; @@ -2207,10 +2208,10 @@ _bfd_XX_print_private_bfd_data_common (bfd * abfd, void * vfile) case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: subsystem_name = "EFI runtime driver"; break; - // These are from revision 8.0 of the MS PE/COFF spec - case IMAGE_SUBSYSTEM_EFI_ROM: - subsystem_name = "EFI ROM"; + case IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER: + subsystem_name = "SAL runtime driver"; break; + // This is from revision 8.0 of the MS PE/COFF spec case IMAGE_SUBSYSTEM_XBOX: subsystem_name = "XBOX"; break; diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 5032687..1a8c62d 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,10 @@ 2009-04-17 H.J. Lu + * objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd. + * doc/binutils.texi: Likewise. + +2009-04-17 H.J. Lu + PR binutils/10074 * objcopy.c: Include coff/i386.h and coff/pe.h. (pe_file_alignment): New. diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index fe30d6a..cdec81f 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -1564,7 +1564,7 @@ to be used as stack for this program. Specifies the subsystem under which your program will execute. The legal values for @var{which} are @code{native}, @code{windows}, @code{console}, @code{posix}, @code{efi-app}, @code{efi-bsd}, -@code{efi-rtd}, @code{efi-rom}, and @code{xbox}. You may optionally set +@code{efi-rtd}, @code{sal-rtd}, and @code{xbox}. You may optionally set the subsystem version also. Numeric values are also accepted for @var{which}. [This option is specific to PE targets.] diff --git a/binutils/objcopy.c b/binutils/objcopy.c index b7c84d8..3fe8741 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -3040,7 +3040,7 @@ set_pe_subsystem (const char *s) { "efi-app", 1, IMAGE_SUBSYSTEM_EFI_APPLICATION }, { "efi-bsd", 1, IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER }, { "efi-rtd", 1, IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER }, - { "efi-rom", 1, IMAGE_SUBSYSTEM_EFI_ROM }, + { "sal-rtd", 1, IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER }, { "xbox", 0, IMAGE_SUBSYSTEM_XBOX } }; short value; diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog index acfc3dc..e274a79 100644 --- a/include/coff/ChangeLog +++ b/include/coff/ChangeLog @@ -1,3 +1,8 @@ +2009-04-17 H.J. Lu + + * pe.h (IMAGE_SUBSYSTEM_EFI_ROM): Renamed to ... + (IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER): This. + 2009-04-01 Richard Sandiford * xcoff.h (xcoff_link_hash_table): Move to bfd/xcofflink.c. diff --git a/include/coff/pe.h b/include/coff/pe.h index a7fdd76..c7e7bd2 100644 --- a/include/coff/pe.h +++ b/include/coff/pe.h @@ -161,7 +161,7 @@ #define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 #define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 #define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 -#define IMAGE_SUBSYSTEM_EFI_ROM 13 +#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13 #define IMAGE_SUBSYSTEM_XBOX 14 /* Magic values that are true for all dos/nt implementations. */ -- 2.7.4