# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Date 1170009904 0
# Node ID bef8a8b1e400c89f68d498c204f2500e5e9dc11b
# Parent 78b7ec4e7b8635c13b7911fb30afe16c38f5b775
Fix firmware compile on Solaris.
Use $(LD) not ld. Include right headers for x86 ELF bits.
Signed-off-by: John Levon <john.levon@xxxxxxx>
---
tools/firmware/hvmloader/32bitbios_support.c | 7 ++++++-
tools/firmware/rombios/32bit/Makefile | 2 +-
tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff -r 78b7ec4e7b86 -r bef8a8b1e400
tools/firmware/hvmloader/32bitbios_support.c
--- a/tools/firmware/hvmloader/32bitbios_support.c Sun Jan 28 16:05:07
2007 +0000
+++ b/tools/firmware/hvmloader/32bitbios_support.c Sun Jan 28 18:45:04
2007 +0000
@@ -17,7 +17,12 @@
* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place - Suite 330, Boston, MA 02111-1307 USA.
*/
+#include <inttypes.h>
#include <elf.h>
+#ifdef __sun__
+#include <sys/machelf.h>
+#endif
+
#include <xen/hvm/e820.h>
#include "util.h"
#include "config.h"
@@ -35,7 +40,7 @@ static int relocate_elf(unsigned char *e
int i;
if (ehdr->e_type != ET_REL) {
- printf("Not a relocatabel BIOS object file. Has type %d, need %d\n",
+ printf("Not a relocatable BIOS object file. Has type %d, need %d\n",
ehdr->e_type, ET_REL);
return -1;
}
diff -r 78b7ec4e7b86 -r bef8a8b1e400 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile Sun Jan 28 16:05:07 2007 +0000
+++ b/tools/firmware/rombios/32bit/Makefile Sun Jan 28 18:45:04 2007 +0000
@@ -30,7 +30,7 @@ clean:
done;
$(TARGET): subdirs 32bitbios.o util.o
- ld $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o
+ $(LD) $(LDFLAGS_DIRECT) -r 32bitbios.o $(MODULES) util.o -o
32bitbios_all.o
@nm 32bitbios_all.o | \
grep -E -q '^ +U ' && { \
echo "There are undefined symbols in the BIOS:"; \
diff -r 78b7ec4e7b86 -r bef8a8b1e400
tools/firmware/rombios/32bit/tcgbios/Makefile
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile Sun Jan 28 16:05:07
2007 +0000
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile Sun Jan 28 18:45:04
2007 +0000
@@ -19,4 +19,4 @@ clean:
rm -rf *.o $(TARGET)
$(TARGET): $(OBJECTS)
- ld $(LDFLAGS_DIRECT) -r $^ -o $@
+ $(LD) $(LDFLAGS_DIRECT) -r $^ -o $@
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home