From: kraxel@suse.de
To: xen-devel@lists.xensource.com
Subject: [patch] Fix 32bit xen-tools build.
Date: Thu, 05 Oct 2006 10:48:22 +0200 [thread overview]
Message-ID: <20061005084820.367253000@suse.de> (raw)
[-- Attachment #1: cross-build-fix.diff --]
[-- Type: text/plain, Size: 2105 bytes --]
This fixes building 32bit xen-tools on a amd64 machine, i.e.
"XEN_TARGET_ARCH=x86_32 make".
For ioemu I've taken the lazy path and just disabled them for
cross-builds, I'll leave that to fix to someone who knows the
qemu makefiles better than I do ;)
Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
---
config/x86_32.mk | 6 ++++--
tools/Makefile | 2 +-
tools/misc/mbootpack/Makefile | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
Index: build-32-unstable-11624/config/x86_32.mk
===================================================================
--- build-32-unstable-11624.orig/config/x86_32.mk
+++ build-32-unstable-11624/config/x86_32.mk
@@ -5,5 +5,7 @@ CONFIG_XCUTILS := y
CONFIG_IOEMU := y
CONFIG_MBOOTPACK := y
-CFLAGS += -m32 -march=i686
-LIBDIR := lib
+CFLAGS += -m32 -march=i686
+LDFLAGS += -m32
+ASFLAGS += -m32
+LIBDIR := lib
Index: build-32-unstable-11624/tools/misc/mbootpack/Makefile
===================================================================
--- build-32-unstable-11624.orig/tools/misc/mbootpack/Makefile
+++ build-32-unstable-11624/tools/misc/mbootpack/Makefile
@@ -35,7 +35,7 @@ DEPFLAGS = -Wp,-MD,.$(@F).d
DEPS = .*.d
mbootpack: $(OBJS)
- $(HOSTCC) -o $@ $(filter-out %.a, $^)
+ $(HOSTCC) $(CFLAGS) -o $@ $(filter-out %.a, $^)
.PHONY: clean
clean:
@@ -50,7 +50,7 @@ setup: setup.S
$(LD) -m elf_i386 -Ttext 0x0 -s --oformat binary setup.o -o $@
bin2c: bin2c.o
- $(HOSTCC) -o $@ $^
+ $(HOSTCC) $(CFLAGS) -o $@ $^
bzimage_header.c: bootsect setup bin2c
./bin2c -n 8 -b1 -a bzimage_bootsect bootsect > bzimage_header.c
Index: build-32-unstable-11624/tools/Makefile
===================================================================
--- build-32-unstable-11624.orig/tools/Makefile
+++ build-32-unstable-11624/tools/Makefile
@@ -60,7 +60,7 @@ check_clean:
$(MAKE) -C check clean
.PHONY: ioemu ioemuinstall ioemuclean
-ifdef CONFIG_IOEMU
+ifeq ($(XEN_COMPILE_ARCH)$(CONFIG_IOEMU),$(XEN_TARGET_ARCH)y)
export IOEMU_DIR ?= ioemu
ioemu ioemuinstall:
[ -f $(IOEMU_DIR)/config-host.mak ] || \
--
next reply other threads:[~2006-10-05 8:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-05 8:48 kraxel [this message]
2006-10-05 8:55 ` [patch] Fix 32bit xen-tools build Keir Fraser
2006-10-05 9:22 ` Gerd Hoffmann
2006-10-05 10:40 ` Gerd Hoffmann
2006-10-05 11:45 ` John Levon
-- strict thread matches above, loose matches on Subject: below --
2006-10-20 8:36 kraxel
2006-10-20 12:25 ` John Levon
2006-10-21 7:43 ` Keir Fraser
2006-10-23 7:35 ` Gerd Hoffmann
2006-10-23 8:51 ` Keir Fraser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061005084820.367253000@suse.de \
--to=kraxel@suse.de \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.