Index: boot/arch/ia64/loader/Makefile
===================================================================
--- boot/arch/ia64/loader/Makefile	(revision 7208b6cc46de53e520a0beb3636047d8e17c072c)
+++ boot/arch/ia64/loader/Makefile	(revision fdb779590942e6ca9d222d9235582c06c4870af2)
@@ -42,4 +42,5 @@
 	OBJCOPY = objcopy
 	OBJDUMP = objdump
+	GEFI_PREXIX = 
 endif
 
@@ -58,4 +59,5 @@
 	OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
 	OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
+	GEFI_PREFIX = $(TOOLCHAIN_DIR)/$(TARGET)-
 endif
 
@@ -106,8 +108,8 @@
 
 hello.efi: image.boot
-	make -C gefi/HelenOS
+	make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
 	cp gefi/HelenOS/hello.efi ../../../../
-	cp gefi/HelenOS/hello.efi /boot/efi/
-	cp gefi/HelenOS/image.bin /boot/efi/
+#	cp gefi/HelenOS/hello.efi /boot/efi/
+	cp gefi/HelenOS/image.bin ../../../../
 
 image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
Index: boot/arch/ia64/loader/gefi/HelenOS/Makefile
===================================================================
--- boot/arch/ia64/loader/gefi/HelenOS/Makefile	(revision 7208b6cc46de53e520a0beb3636047d8e17c072c)
+++ boot/arch/ia64/loader/gefi/HelenOS/Makefile	(revision fdb779590942e6ca9d222d9235582c06c4870af2)
@@ -21,5 +21,5 @@
 #  02111-1307, USA.
 #
-
+prefix=$(PREFIX)
 include ../Make.defaults
 CDIR=$(TOPDIR)/..
@@ -33,5 +33,5 @@
 
 
-all:	hello.efi
+all:	gefi hello.efi
 
 
@@ -44,5 +44,5 @@
 	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
 		   -j .rela -j .reloc --target=$(FORMAT) hello.so hello.efi
-	objdump -d hello.efi > hello.disass
+	$(OBJDUMP) -d hello.efi > hello.disass  
 
 hello.so: hello.o image.o
@@ -53,7 +53,8 @@
 
 image.o: ../../image.boot
-	objcopy -O binary ../../image.boot image.bin
-	objcopy -I binary -O elf64-ia64-little -B ia64 image.bin image.o
+	$(OBJCOPY) -O binary ../../image.boot image.bin
+	$(OBJCOPY) -I binary -O elf64-ia64-little -B ia64 image.bin image.o
 
 
-
+gefi:
+	make -C .. prefix=$(PREFIX)
Index: boot/arch/ia64/loader/gefi/Make.defaults
===================================================================
--- boot/arch/ia64/loader/gefi/Make.defaults	(revision 7208b6cc46de53e520a0beb3636047d8e17c072c)
+++ boot/arch/ia64/loader/gefi/Make.defaults	(revision fdb779590942e6ca9d222d9235582c06c4870af2)
@@ -39,12 +39,12 @@
 GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
 
-ifeq ($(ARCH),ia64)
-  prefix	=
-  CC		= $(prefix)gcc
-  AS		= $(prefix)as
-  LD		= $(prefix)ld
-  AR		= $(prefix)ar
-  RANLIB	= $(prefix)ranlib
-  OBJCOPY	= $(prefix)objcopy
+#  prefix	=
+CC		= $(prefix)gcc
+AS		= $(prefix)as
+LD		= $(prefix)ld
+AR		= $(prefix)ar
+RANLIB	= $(prefix)ranlib
+OBJCOPY	= $(prefix)objcopy
+OBJDUMP	= $(prefix)objdump
 
 
@@ -55,21 +55,2 @@
 CFLAGS += -mfixed-range=f32-f127
 
-else
- ifeq ($(ARCH),ia32)
-#
-# gcc-3.x is required
-#
-  prefix	= 
-  ifneq ($(GCC_VERSION),2)
-    CC = $(prefix)gcc
-  else
-    CC = $(prefix)gcc3 #must have gcc 3.x
-  endif
-  AS		= $(prefix)as
-  LD		= $(prefix)ld
-  AR		= $(prefix)ar
-  RANLIB	= $(prefix)ranlib
-  OBJCOPY	= $(prefix)objcopy
- endif
-endif
-