version 1.2

* Also use the EDK2 intrinsics where possible
pbatard · Nov 14, 2017 · bef4175 · bef4175
1 parent 868503a
commit bef4175
Show file tree

Hide file tree

Showing 47 changed files with 166 additions and 781 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,11 @@
 For detailed information about the changes below, please see the git log or
 visit: https://github.com/pbatard/efifs
 
+v1.2 (2017.11.14)
+* Add EDK2 compilation support
+* Add Visual Studio 2017 ARM64 compilation support
+* Update GRUB and gnu-efi to latest
+
 v1.1 (2016.12.28)
 * Add ARM64 platform support
 * Add F2FS support (EXPERIMENTAL)

diff --git a/CompilerIntrinsicsLib.inf b/CompilerIntrinsicsLib.inf
@@ -0,0 +1,51 @@
+#/*++
+#
+#  Copyright (c) 2017, Pete Batard. All rights reserved.<BR>
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution.  The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#   Abstract:
+#
+#     Intrinsics required to compile EfiFs with MSFT.
+#
+#--*/
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = CompilerIntrinsicsLib
+  FILE_GUID                      = B11194CC-A4AA-4886-8241-101F3DAD8BEF
+  MODULE_TYPE                    = BASE
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = CompilerIntrinsicsLib
+
+#
+#  VALID_ARCHITECTURES           = IA32
+#
+
+[Sources.IA32]
+  # Compiler helper (C RunTime) functions
+  ../StdLib/LibC/CRT/Ia32/llmul.c          | MSFT    # __allmul
+  ../StdLib/LibC/CRT/Ia32/llshl.c          | MSFT    # __allshl
+  ../StdLib/LibC/CRT/Ia32/llshr.c          | MSFT    # __allshr
+  ../StdLib/LibC/CRT/Ia32/ulldiv.c         | MSFT    # __aulldiv
+  ../StdLib/LibC/CRT/Ia32/ullrem.c         | MSFT    # __aullrem
+  ../StdLib/LibC/CRT/Ia32/ullshr.c         | MSFT    # __aullshr
+  ../StdLib/LibC/CRT/Ia32/lldiv.c          | MSFT    # __alldiv
+  ../StdLib/LibC/CRT/Ia32/llrem.c          | MSFT    # __allrem
+  ../StdLib/LibC/CRT/Ia32/lldvrm.c         | MSFT    # __alldvrm
+  ../StdLib/LibC/CRT/Ia32/ulldvrm.c        | MSFT    # __aulldvrm
+
+[Packages]
+  MdePkg/MdePkg.dec
+  ArmPkg/ArmPkg.dec
+
+[LibraryClasses]
+
+[BuildOptions]
+  MSFT:*_*_IA32_CC_FLAGS = /GL-
+  MSFT:*_*_IA32_DLINK_FLAGS = /INCLUDE:_MultS64x64
diff --git a/EfiFsPkg.dec b/EfiFsPkg.dec
@@ -10,7 +10,7 @@
   PACKAGE_NAME                   = EfiFsPkg
   PACKAGE_UNI_FILE               = EfiFsPkg.uni
   PACKAGE_GUID                   = D65E40B8-BC4B-4625-9E5C-17C5726C39C3
-  PACKAGE_VERSION                = 1.1
+  PACKAGE_VERSION                = 1.2
 
 [UserExtensions.TianoCore."ExtraFiles"]
   EfiFsPkgExtra.uni

diff --git a/EfiFsPkg.dsc b/EfiFsPkg.dsc
@@ -8,7 +8,7 @@
 [Defines]
   PLATFORM_NAME                  = EfiFs
   PLATFORM_GUID                  = 700d6096-1578-409e-a6c7-9acdf9f565b3
-  PLATFORM_VERSION               = 1.1
+  PLATFORM_VERSION               = 1.2
   DSC_SPECIFICATION              = 0x00010005
   SUPPORTED_ARCHITECTURES        = IA32|X64|EBC|ARM|AARCH64
   OUTPUT_DIRECTORY               = Build/EfiFs
@@ -42,19 +42,16 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
 
-[LibraryClasses.common.PEIM]
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-!if $(TOOLCHAIN) != "VS2017" || $(ARCH) != "AARCH64" 
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
-!endif
-!if $(TOOLCHAIN) != "VS2017"
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+
+[LibraryClasses.IA32, LibraryClasses.X64]
+  NULL|EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf
+
+[LibraryClasses.IA32]
+!if $(TOOLCHAIN) == "VS2017"
+  NULL|EfiFsPkg/CompilerIntrinsicsLib.inf
 !endif
 
 ###################################################################################################

diff --git a/EfiFsPkg/Affs.inf b/EfiFsPkg/Affs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = affs
   FILE_GUID                  = BD873114-A318-48C4-AEF9-6C9E43A50FFA
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,6 +69,5 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Amiga FFS\""
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
   GCC:*_*_*_CC_FLAGS  =  -Wno-overflow
diff --git a/EfiFsPkg/Afs.inf b/EfiFsPkg/Afs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = afs
   FILE_GUID                  = DEFE2F9E-38C4-4278-AB7D-3BCC7B3C9292
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"AFS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Bfs.inf b/EfiFsPkg/Bfs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = bfs
   FILE_GUID                  = 7686EACB-461E-417F-BB6B-0C5DBA8B4087
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"BFS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Btrfs.inf b/EfiFsPkg/Btrfs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = btrfs
   FILE_GUID                  = E4FD4F23-5515-434C-9F19-59CA8B122825
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -74,5 +74,4 @@
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"Btrfs\"
   *_*_*_CC_FLAGS       = -DEXTRAMODULE=gzio
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Cbfs.inf b/EfiFsPkg/Cbfs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = cbfs
   FILE_GUID                  = DEEC0FF0-64AE-4B2D-A9D1-87057258854C
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -71,5 +71,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"CBFS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Cpio.inf b/EfiFsPkg/Cpio.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = cpio
   FILE_GUID                  = FE902772-06CD-40E4-B35B-0E760C5E9C1A
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -70,5 +70,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (LE)\""
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/CpioBe.inf b/EfiFsPkg/CpioBe.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = cpio_be
   FILE_GUID                  = A3853AE0-E77D-405E-8A75-16333DE1632C
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -70,5 +70,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"cpio (BE)\""
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/ExFat.inf b/EfiFsPkg/ExFat.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = exfat
   FILE_GUID                  = 2920E524-AD21-499E-9F4A-466BFDC3BFFB
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Ext2.inf b/EfiFsPkg/Ext2.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = ext2
   FILE_GUID                  = 7DDA7772-B8F5-4859-9DBA-0D6F2DBA4AF1
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ext2/3/4\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/F2fs.inf b/EfiFsPkg/F2fs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = f2fs
   FILE_GUID                  = 3D1F4906-3509-4DD4-8850-70033DE336E4
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"F2FS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Fat.inf b/EfiFsPkg/Fat.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = fat
   FILE_GUID                  = B9E0C839-BF75-4889-82FF-214BED41BA47
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ExFAT\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Hfs.inf b/EfiFsPkg/Hfs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = hfs
   FILE_GUID                  = BB57B5D8-F6DE-481C-9B08-C779B0F33E25
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/HfsPlus.inf b/EfiFsPkg/HfsPlus.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = hfsplus
   FILE_GUID                  = EE593365-0635-44FC-AF28-DB98B63FDBC6
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -73,5 +73,4 @@
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"HFS+\"
   # HFS+ has a compressed driver
   *_*_*_CC_FLAGS       = -DCOMPRESSED_DRIVERNAME=$(BASE_NAME)comp -DEXTRAMODULE=gzio
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Iso9660.inf b/EfiFsPkg/Iso9660.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = iso9660
   FILE_GUID                  = EFBE987A-A33B-4EE4-B2B5-35DEDC28A5E9
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"ISO9660\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Jfs.inf b/EfiFsPkg/Jfs.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = jfs
   FILE_GUID                  = E87CF4E3-318E-4B5F-98B9-A6B47414506D
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -69,5 +69,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR=\"JFS\"
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
diff --git a/EfiFsPkg/Minix.inf b/EfiFsPkg/Minix.inf
@@ -8,7 +8,7 @@
   BASE_NAME                  = minix
   FILE_GUID                  = 16CE8469-1586-4CE0-B90C-88D049A2967B
   MODULE_TYPE                = UEFI_DRIVER
-  VERSION_STRING             = 1.1
+  VERSION_STRING             = 1.2
   EDK_RELEASE_VERSION        = 0x00020000
   EFI_SPECIFICATION_VERSION  = 0x00020000
   ENTRY_POINT                = FSDriverInstall
@@ -70,5 +70,4 @@
   *_*_IA32_CC_FLAGS    = -DFORMAT=efi-app-ia32
   *_*_X64_CC_FLAGS     = -DFORMAT=efi-app-x64
   *_*_*_CC_FLAGS       = -Os -DCPU_$(ARCH) -DGRUB_FILE=__FILE__ -DDRIVERNAME=$(BASE_NAME) -DDRIVERNAME_STR="\"Minix (LE)\""
-  # On MSFT compilers, we must force-disable the default /GL option in order to replace the memset() intrinsic
-  MSFT:*_*_*_CC_FLAGS  = /GL- /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706
+  MSFT:*_*_*_CC_FLAGS  = /wd4028 /wd4068 /wd4133 /wd4146 /wd4201 /wd4204 /wd4244 /wd4245 /wd4267 /wd4311 /wd4312 /wd4334 /wd4706