Syslinux - May 2013 - Latest firmware branch failing to compile with gnu-efi-3.0t

Hi guys,
I'm trying to build HEAD on the firmware branch from git and I'm getting
the following errors:

make[3]: Entering directory `/home/voltagex/src/syslinux/efi64/efi'
gcc -I/usr/include/efi -I/usr/include/efi/x86_64 -DEFI_FUNCTION_WRAPPER
-fPIC -fshort-wchar -ffreestanding -Wall
-I/home/voltagex/src/syslinux/com32/include
-I/home/voltagex/src/syslinux/com32/include/sys
-I/home/voltagex/src/syslinux/core/include
-I/home/voltagex/src/syslinux/core/ -m64 -march=x86-64
-I/home/voltagex/src/syslinux/com32/lib/
-I/home/voltagex/src/syslinux/com32/libutil/include -std=gnu99 -DELF_DEBUG
-DSYSLINUX_EFI -I/home/voltagex/src/syslinux/efi64 -W -Wall
-Wstrict-prototypes  -Wno-clobbered  -D__COM32__ -mno-red-zone
-DLDLINUX=\"ldlinux.e64\" -c -o mem.o
/home/voltagex/src/syslinux/efi/mem.c
In file included from /usr/include/efi/efi.h:45:0,
                 from /home/voltagex/src/syslinux/efi/efi.h:22,
                 from /home/voltagex/src/syslinux/efi/mem.c:2:
/usr/include/efi/efiapi.h:663:5: warning: function declaration isn't a
prototype [-Wstrict-prototypes]
     );
     ^
In file included from /home/voltagex/src/syslinux/efi/mem.c:2:0:
/home/voltagex/src/syslinux/efi/efi.h:33:5: error: unknown type name
'EFI_SERVICE_BINDING'
     EFI_SERVICE_BINDING *binding;
     ^
/home/voltagex/src/syslinux/efi/mem.c: In function 'efi_malloc':
/home/voltagex/src/syslinux/efi/mem.c:4:41: warning: unused parameter
'heap' [-Wunused-parameter]
 void *efi_malloc(size_t size, enum heap heap, malloc_tag_t tag)
                                         ^
/home/voltagex/src/syslinux/efi/mem.c:4:60: warning: unused parameter
'tag'
[-Wunused-parameter]
 void *efi_malloc(size_t size, enum heap heap, malloc_tag_t tag)
                                                            ^
/home/voltagex/src/syslinux/efi/mem.c: In function 'efi_realloc':
/home/voltagex/src/syslinux/efi/mem.c:14:2: warning: implicit declaration
of function 'memcpy' [-Wimplicit-function-declaration]
  memcpy(newptr, ptr, size);
  ^
make[3]: *** [mem.o] Error 1
make[3]: Leaving directory `/home/voltagex/src/syslinux/efi64/efi'
make[2]: *** [efi] Error 2
make[2]: Leaving directory `/home/voltagex/src/syslinux/efi64'
make[1]: *** [efi64] Error 2
make[1]: Leaving directory `/home/voltagex/src/syslinux'
make: *** [efi64] Error 2
[voltagex at arch syslinux]$ make efi
make -r -C /home/voltagex/src/syslinux -f
/home/voltagex/src/syslinux/Makefile SRC="/home/voltagex/src/syslinux"
\
        OBJ=/home/voltagex/src/syslinux objdir=/home/voltagex/src/syslinux
efi
make[1]: Entering directory `/home/voltagex/src/syslinux'
make[1]: Nothing to be done for `efi'.
make[1]: Leaving directory `/home/voltagex/src/syslinux'


This is with the 3.0t headers installed and gcc version 4.8.0 20130502
(prerelease) (GCC)

Any ideas?

Thanks,
Adam

The last version that builds for me is:

commit 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48
Merge: bf20364 a107cb3
Author: Matt Fleming <matt.fleming at intel.com>
Date:   Wed Mar 20 17:14:21 2013 +0000

    Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware

On Sat, 18 May, at 09:51:34PM, Adam Baxter wrote:
> Hi guys,
> I'm trying to build HEAD on the firmware branch from git and I'm
getting
> the following errors:
[...]
> In file included from /home/voltagex/src/syslinux/efi/mem.c:2:0:
> /home/voltagex/src/syslinux/efi/efi.h:33:5: error: unknown type name
> 'EFI_SERVICE_BINDING'
>      EFI_SERVICE_BINDING *binding;
>      ^
[...]
 
> This is with the 3.0t headers installed and gcc version 4.8.0 20130502
> (prerelease) (GCC)
> 
> Any ideas?
 
There are patches in the upstream gnu-efi repository that introduce the
EFI_SERVICE_BINDING symbol. Unfortunately, it seems that no gnu-efi
release has been put out yet that includes those changes, so you'll have
to grab them from the git repository at,

    git://git.code.sf.net/p/gnu-efi/code

-- 
Matt Fleming, Intel Open Source Technology Center