diff -up gnu-efi-3.0d/lib/smbios.c.x86_64 gnu-efi-3.0d/lib/smbios.c
--- gnu-efi-3.0d/lib/smbios.c.x86_64	2007-05-09 14:37:27.000000000 -0400
+++ gnu-efi-3.0d/lib/smbios.c	2007-12-19 15:04:27.000000000 -0500
@@ -34,8 +34,8 @@ LibGetSmbiosSystemGuidAndSerialNumber (
         return EFI_NOT_FOUND;
     }
 
-    Smbios.Hdr = (SMBIOS_HEADER *)SmbiosTable->TableAddress;
-    SmbiosEnd.Raw = (UINT8 *)(SmbiosTable->TableAddress + SmbiosTable->TableLength);
+    Smbios.Hdr = (SMBIOS_HEADER *)(unsigned long)SmbiosTable->TableAddress;
+    SmbiosEnd.Raw = (UINT8 *)(unsigned long)(SmbiosTable->TableAddress + SmbiosTable->TableLength);
     for (Index = 0; Index < SmbiosTable->TableLength ; Index++) {
         if (Smbios.Hdr->Type == 1) {
             if (Smbios.Hdr->Length < 0x19) {
diff -up gnu-efi-3.0d/lib/x86_64/callwrap.c.x86_64 gnu-efi-3.0d/lib/x86_64/callwrap.c
--- gnu-efi-3.0d/lib/x86_64/callwrap.c.x86_64	2007-12-19 15:04:44.000000000 -0500
+++ gnu-efi-3.0d/lib/x86_64/callwrap.c	2007-12-19 15:04:58.000000000 -0500
@@ -328,8 +328,6 @@ EFI_STATUS uefi_call_wrapper(void *fp, u
 	va_list ap;
 	int i;
 	unsigned long args[EFI_ARG_NUM_MAX];
-	unsigned int arg_size,stack_adjust_size;
-	EFI_STATUS status;
 
 	if (va_num > EFI_ARG_NUM_MAX || va_num < 0) {
 		return EFI_LOAD_ERROR;