1.1 --- a/tools/firmware/hvmloader/32bitbios_support.c	Sun Jan 28 16:05:07 2007 +0000
     1.2 +++ b/tools/firmware/hvmloader/32bitbios_support.c	Sun Jan 28 18:45:04 2007 +0000
     1.3 @@ -17,7 +17,12 @@
     1.4   * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
     1.5   * Place - Suite 330, Boston, MA 02111-1307 USA.
     1.6   */
     1.7 +#include <inttypes.h>
     1.8  #include <elf.h>
     1.9 +#ifdef __sun__
    1.10 +#include <sys/machelf.h>
    1.11 +#endif
    1.12 +
    1.13  #include <xen/hvm/e820.h>
    1.14  #include "util.h"
    1.15  #include "config.h"
    1.16 @@ -35,7 +40,7 @@ static int relocate_elf(unsigned char *e
    1.17      int i;
    1.18  
    1.19      if (ehdr->e_type != ET_REL) {
    1.20 -        printf("Not a relocatabel BIOS object file. Has type %d, need %d\n",
    1.21 +        printf("Not a relocatable BIOS object file. Has type %d, need %d\n",
    1.22                 ehdr->e_type, ET_REL);
    1.23          return -1;
    1.24      }

     2.1 --- a/tools/firmware/rombios/32bit/Makefile	Sun Jan 28 16:05:07 2007 +0000
     2.2 +++ b/tools/firmware/rombios/32bit/Makefile	Sun Jan 28 18:45:04 2007 +0000
     2.3 @@ -30,7 +30,7 @@ clean:
     2.4  	done;
     2.5  
     2.6  $(TARGET): subdirs 32bitbios.o util.o
     2.7 -	ld $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o
     2.8 +	$(LD) $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o
     2.9  	@nm 32bitbios_all.o |                                \
    2.10  	  grep -E -q '^ +U ' && {                            \
    2.11  	    echo "There are undefined symbols in the BIOS:"; \

     3.1 --- a/tools/firmware/rombios/32bit/tcgbios/Makefile	Sun Jan 28 16:05:07 2007 +0000
     3.2 +++ b/tools/firmware/rombios/32bit/tcgbios/Makefile	Sun Jan 28 18:45:04 2007 +0000
     3.3 @@ -19,4 +19,4 @@ clean:
     3.4  	rm -rf *.o $(TARGET)
     3.5  
     3.6  $(TARGET): $(OBJECTS)
     3.7 -	ld $(LDFLAGS_DIRECT) -r $^ -o $@
     3.8 +	$(LD) $(LDFLAGS_DIRECT) -r $^ -o $@