diff --git a/CloverEFI/CpuDxe/Cpu.inf b/CloverEFI/CpuDxe/Cpu.inf
index 7bba235a2..b0b650c0e 100644
--- a/CloverEFI/CpuDxe/Cpu.inf
+++ b/CloverEFI/CpuDxe/Cpu.inf
@@ -65,6 +65,6 @@
 
 [BuildOptions]
 XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
   MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
 
diff --git a/CloverEFI/OsxDxeIpl/DxeIpl.inf b/CloverEFI/OsxDxeIpl/DxeIpl.inf
index 1e53f760c..22f2e6dd7 100644
--- a/CloverEFI/OsxDxeIpl/DxeIpl.inf
+++ b/CloverEFI/OsxDxeIpl/DxeIpl.inf
@@ -74,5 +74,5 @@
 #  GCC:*_*_IA32_CC_FLAGS                  = $(BUILD_OPTIONS) -march=i386 -mtune=i386 -m32 -Os $(INC)
 #  GCC:*_*_IA32_AS_FLAGS                  = $(BUILD_OPTIONS) -march=i386 -mtune=i386 --32 $(INC)
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -O0 -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -O0 -fno-lto -DMDEPKG_NDEBUG
   MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
diff --git a/Library/DuetTimerLib/DuetTimerLib.inf b/Library/DuetTimerLib/DuetTimerLib.inf
index 1168656e7..013acf670 100644
--- a/Library/DuetTimerLib/DuetTimerLib.inf
+++ b/Library/DuetTimerLib/DuetTimerLib.inf
@@ -54,5 +54,5 @@
   
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
   MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
diff --git a/Library/GenericBdsLib/GenericBdsLib.inf b/Library/GenericBdsLib/GenericBdsLib.inf
index 81e560f88..a2b35ab6c 100644
--- a/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/Library/GenericBdsLib/GenericBdsLib.inf
@@ -131,6 +131,6 @@
 
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
   MSFT:*_*_*_CC_FLAGS = /D MDEPKG_NDEBUG
   
diff --git a/Library/IntrinsicLib/IntrinsicLib.inf b/Library/IntrinsicLib/IntrinsicLib.inf
index b814e8852..9b546609a 100644
--- a/Library/IntrinsicLib/IntrinsicLib.inf
+++ b/Library/IntrinsicLib/IntrinsicLib.inf
@@ -71,4 +71,4 @@
   INTEL:*_*_*_CC_FLAGS                    =  /Oi-
 
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -fno-builtin -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -fno-builtin -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -fno-builtin -DMDEPKG_NDEBUG
diff --git a/Library/MemLogLibDefault/MemLogLibDefault.inf b/Library/MemLogLibDefault/MemLogLibDefault.inf
index 221eb1419..87768ade7 100644
--- a/Library/MemLogLibDefault/MemLogLibDefault.inf
+++ b/Library/MemLogLibDefault/MemLogLibDefault.inf
@@ -35,4 +35,4 @@
 
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
diff --git a/Library/OsxBdsPlatformLib/PlatformBds.inf b/Library/OsxBdsPlatformLib/PlatformBds.inf
index cd279fd0c..00f693b3e 100644
--- a/Library/OsxBdsPlatformLib/PlatformBds.inf
+++ b/Library/OsxBdsPlatformLib/PlatformBds.inf
@@ -83,7 +83,7 @@
 [BuildOptions]
 # TIMEOUTFP=0 -- silent boot
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DTIMEOUTFP=0 -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -O0 -DTIMEOUTFP=0 -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -O0 -fno-lto -DTIMEOUTFP=0 -DMDEPKG_NDEBUG
   MSFT:*_*_*_CC_FLAGS = -Os -DTIMEOUTFP=3 /D MDEPKG_NDEBUG
   
 
diff --git a/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf b/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
index fb41683c0..95c00cfd6 100644
--- a/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+++ b/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
@@ -67,4 +67,4 @@
 
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
diff --git a/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf b/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
index 44f51803b..ffe75be90 100644
--- a/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+++ b/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
@@ -66,4 +66,4 @@
 
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG
diff --git a/Library/VideoBiosPatchLib/VideoBiosPatchLib.inf b/Library/VideoBiosPatchLib/VideoBiosPatchLib.inf
index e7a15e0be..91e63030c 100644
--- a/Library/VideoBiosPatchLib/VideoBiosPatchLib.inf
+++ b/Library/VideoBiosPatchLib/VideoBiosPatchLib.inf
@@ -49,4 +49,4 @@
 
 [BuildOptions]
   XCODE:*_*_*_CC_FLAGS = -Os -fno-lto -UUSING_LTO -DMDEPKG_NDEBUG
-  GCC:*_*_*_CC_FLAGS = -Os -DMDEPKG_NDEBUG
+  GCC:*_*_*_CC_FLAGS = -Os -fno-lto -DMDEPKG_NDEBUG