Index: include/coff/ChangeLog
===================================================================
--- include/coff/ChangeLog	(revision 5724)
+++ include/coff/ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* pe.h (IMAGE_SUBSYSTEM_EFI_ROM): Renamed to ...
+	(IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER): This.
+
 2009-04-01  Richard Sandiford  <r.sandiford@uk.ibm.com>
 
 	* xcoff.h (xcoff_link_hash_table): Move to bfd/xcofflink.c.
Index: include/coff/pe.h
===================================================================
--- include/coff/pe.h	(revision 5724)
+++ include/coff/pe.h	(working copy)
@@ -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.  */
Index: binutils/doc/binutils.texi
===================================================================
--- binutils/doc/binutils.texi	(revision 5731)
+++ binutils/doc/binutils.texi	(working copy)
@@ -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.]
Index: binutils/objcopy.c
===================================================================
--- binutils/objcopy.c	(revision 5726)
+++ binutils/objcopy.c	(working copy)
@@ -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;
Index: binutils/ChangeLog
===================================================================
--- binutils/ChangeLog	(revision 5731)
+++ binutils/ChangeLog	(working copy)
@@ -1,5 +1,10 @@
 2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* objcopy.c (set_pe_subsystem): Replace efi-rom with sal-rtd.
+	* doc/binutils.texi: Likewise.
+
+2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
 	PR binutils/10074
 	* objcopy.c: Include coff/i386.h and coff/pe.h.
 	(pe_file_alignment): New.
Index: bfd/ChangeLog
===================================================================
--- bfd/ChangeLog	(revision 5731)
+++ bfd/ChangeLog	(working copy)
@@ -1,5 +1,10 @@
 2009-04-17  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* 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  <hongjiu.lu@intel.com>
+
 	PR binutils/10074
 	* coffcode.h (bfd_pei_p): New.
 
Index: bfd/peXXigen.c
===================================================================
--- bfd/peXXigen.c	(revision 5727)
+++ bfd/peXXigen.c	(working copy)
@@ -2198,6 +2198,7 @@ _bfd_XX_print_private_bfd_data_common (b
     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 (b
     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;