diff --git a/gnu-efi-3.0d-pragma.patch b/gnu-efi-3.0d-pragma.patch
index 81edca3..35eb322 100644
--- a/gnu-efi-3.0d-pragma.patch
+++ b/gnu-efi-3.0d-pragma.patch
@@ -1,6 +1,23 @@
 diff -up gnu-efi-3.0d/lib/ia32/math.c.pragma gnu-efi-3.0d/lib/ia32/math.c
---- gnu-efi-3.0d/lib/ia32/math.c.pragma	2008-03-10 14:43:48.000000000 -0400
-+++ gnu-efi-3.0d/lib/ia32/math.c	2008-03-10 14:43:32.000000000 -0400
+--- gnu-efi-3.0d/lib/ia32/math.c.pragma	2007-05-09 14:37:27.000000000 -0400
++++ gnu-efi-3.0d/lib/ia32/math.c	2008-07-16 13:42:50.000000000 -0400
+@@ -23,11 +23,13 @@ Revision History
+ //
+ 
+ #ifdef RUNTIME_CODE
++#ifndef __GNUC__
+ #pragma RUNTIME_CODE(LShiftU64)
+ #pragma RUNTIME_CODE(RShiftU64)
+ #pragma RUNTIME_CODE(MultU64x32)
+ #pragma RUNTIME_CODE(DivU64x32)
+ #endif
++#endif
+ 
+ //
+ //
+diff -up gnu-efi-3.0d/lib/ia64/math.c.pragma gnu-efi-3.0d/lib/ia64/math.c
+--- gnu-efi-3.0d/lib/ia64/math.c.pragma	2008-07-16 13:44:31.000000000 -0400
++++ gnu-efi-3.0d/lib/ia64/math.c	2008-07-16 13:44:34.000000000 -0400
 @@ -23,11 +23,13 @@ Revision History
  //
  
@@ -17,7 +34,7 @@ diff -up gnu-efi-3.0d/lib/ia32/math.c.pragma gnu-efi-3.0d/lib/ia32/math.c
  //
 diff -up gnu-efi-3.0d/lib/print.c.pragma gnu-efi-3.0d/lib/print.c
 --- gnu-efi-3.0d/lib/print.c.pragma	2007-05-11 13:03:05.000000000 -0400
-+++ gnu-efi-3.0d/lib/print.c	2008-03-10 14:42:54.000000000 -0400
++++ gnu-efi-3.0d/lib/print.c	2008-07-16 13:42:50.000000000 -0400
 @@ -23,6 +23,7 @@ Revision History
  //
  
@@ -34,32 +51,9 @@ diff -up gnu-efi-3.0d/lib/print.c.pragma gnu-efi-3.0d/lib/print.c
  #endif
  
  //
-diff -up gnu-efi-3.0d/lib/runtime/rtlock.c.pragma gnu-efi-3.0d/lib/runtime/rtlock.c
---- gnu-efi-3.0d/lib/runtime/rtlock.c.pragma	2007-05-11 13:03:05.000000000 -0400
-+++ gnu-efi-3.0d/lib/runtime/rtlock.c	2008-03-10 14:42:54.000000000 -0400
-@@ -21,7 +21,9 @@ Revision History
- 
- 
- 
-+#ifndef __GNUC__
- #pragma RUNTIME_CODE(RtAcquireLock)
-+#endif
- VOID
- RtAcquireLock (
-     IN FLOCK    *Lock
-@@ -58,7 +60,9 @@ Returns:
- }
- 
- 
-+#ifndef __GNUC__
- #pragma RUNTIME_CODE(RtAcquireLock)
-+#endif
- VOID
- RtReleaseLock (
-     IN FLOCK    *Lock
 diff -up gnu-efi-3.0d/lib/runtime/efirtlib.c.pragma gnu-efi-3.0d/lib/runtime/efirtlib.c
 --- gnu-efi-3.0d/lib/runtime/efirtlib.c.pragma	2007-05-09 14:37:27.000000000 -0400
-+++ gnu-efi-3.0d/lib/runtime/efirtlib.c	2008-03-10 14:42:54.000000000 -0400
++++ gnu-efi-3.0d/lib/runtime/efirtlib.c	2008-07-16 13:42:50.000000000 -0400
 @@ -20,7 +20,9 @@ Revision History
  #include "efilib.h"
  #include "efirtlib.h"
@@ -110,9 +104,45 @@ diff -up gnu-efi-3.0d/lib/runtime/efirtlib.c.pragma gnu-efi-3.0d/lib/runtime/efi
  INTN
  RUNTIMEFUNCTION
  RtCompareGuid (
+diff -up gnu-efi-3.0d/lib/runtime/rtdata.c.pragma gnu-efi-3.0d/lib/runtime/rtdata.c
+--- gnu-efi-3.0d/lib/runtime/rtdata.c.pragma	2007-05-09 14:37:27.000000000 -0400
++++ gnu-efi-3.0d/lib/runtime/rtdata.c	2008-07-16 13:42:50.000000000 -0400
+@@ -26,7 +26,9 @@ Revision History
+ // right data section if it is explicitly initialized..
+ //
+ 
++#ifndef __GNUC__
+ #pragma BEGIN_RUNTIME_DATA()
++#endif
+ 
+ //
+ // RT - pointer to the runtime table
+diff -up gnu-efi-3.0d/lib/runtime/rtlock.c.pragma gnu-efi-3.0d/lib/runtime/rtlock.c
+--- gnu-efi-3.0d/lib/runtime/rtlock.c.pragma	2007-05-11 13:03:05.000000000 -0400
++++ gnu-efi-3.0d/lib/runtime/rtlock.c	2008-07-16 13:42:50.000000000 -0400
+@@ -21,7 +21,9 @@ Revision History
+ 
+ 
+ 
++#ifndef __GNUC__
+ #pragma RUNTIME_CODE(RtAcquireLock)
++#endif
+ VOID
+ RtAcquireLock (
+     IN FLOCK    *Lock
+@@ -58,7 +60,9 @@ Returns:
+ }
+ 
+ 
++#ifndef __GNUC__
+ #pragma RUNTIME_CODE(RtAcquireLock)
++#endif
+ VOID
+ RtReleaseLock (
+     IN FLOCK    *Lock
 diff -up gnu-efi-3.0d/lib/runtime/rtstr.c.pragma gnu-efi-3.0d/lib/runtime/rtstr.c
 --- gnu-efi-3.0d/lib/runtime/rtstr.c.pragma	2007-05-09 14:37:27.000000000 -0400
-+++ gnu-efi-3.0d/lib/runtime/rtstr.c	2008-03-10 14:42:54.000000000 -0400
++++ gnu-efi-3.0d/lib/runtime/rtstr.c	2008-07-16 13:42:50.000000000 -0400
 @@ -17,7 +17,9 @@ Revision History
  
  #include "lib.h"
@@ -185,7 +215,7 @@ diff -up gnu-efi-3.0d/lib/runtime/rtstr.c.pragma gnu-efi-3.0d/lib/runtime/rtstr.
  RtDecimaltoBCD (
 diff -up gnu-efi-3.0d/lib/runtime/vm.c.pragma gnu-efi-3.0d/lib/runtime/vm.c
 --- gnu-efi-3.0d/lib/runtime/vm.c.pragma	2007-05-09 14:37:27.000000000 -0400
-+++ gnu-efi-3.0d/lib/runtime/vm.c	2008-03-10 14:42:54.000000000 -0400
++++ gnu-efi-3.0d/lib/runtime/vm.c	2008-07-16 13:42:50.000000000 -0400
 @@ -24,7 +24,9 @@ Revision History
  
  #include "lib.h"
@@ -206,22 +236,9 @@ diff -up gnu-efi-3.0d/lib/runtime/vm.c.pragma gnu-efi-3.0d/lib/runtime/vm.c
  VOID
  RUNTIMEFUNCTION
  RtConvertList (
-diff -up gnu-efi-3.0d/lib/runtime/rtdata.c.pragma gnu-efi-3.0d/lib/runtime/rtdata.c
---- gnu-efi-3.0d/lib/runtime/rtdata.c.pragma	2007-05-09 14:37:27.000000000 -0400
-+++ gnu-efi-3.0d/lib/runtime/rtdata.c	2008-03-10 14:42:54.000000000 -0400
-@@ -26,7 +26,9 @@ Revision History
- // right data section if it is explicitly initialized..
- //
- 
-+#ifndef __GNUC__
- #pragma BEGIN_RUNTIME_DATA()
-+#endif
- 
- //
- // RT - pointer to the runtime table
 diff -up gnu-efi-3.0d/lib/x86_64/math.c.pragma gnu-efi-3.0d/lib/x86_64/math.c
 --- gnu-efi-3.0d/lib/x86_64/math.c.pragma	2007-05-11 13:03:05.000000000 -0400
-+++ gnu-efi-3.0d/lib/x86_64/math.c	2008-03-10 14:43:31.000000000 -0400
++++ gnu-efi-3.0d/lib/x86_64/math.c	2008-07-16 13:42:50.000000000 -0400
 @@ -23,11 +23,13 @@ Revision History
  //