Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 2726 → Rev 2821

/trunk/boot/arch/ia64/loader/gefi/Make.defaults
38,8 → 38,7
 
GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
 
ifeq ($(ARCH),ia64)
prefix =
# prefix =
CC = $(prefix)gcc
AS = $(prefix)as
LD = $(prefix)ld
46,6 → 45,7
AR = $(prefix)ar
RANLIB = $(prefix)ranlib
OBJCOPY = $(prefix)objcopy
OBJDUMP = $(prefix)objdump
 
 
ifneq ($(GCC_VERSION),2)
54,22 → 54,3
 
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
 
/trunk/boot/arch/ia64/loader/gefi/HelenOS/Makefile
20,7 → 20,7
# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#
 
prefix=$(PREFIX)
include ../Make.defaults
CDIR=$(TOPDIR)/..
LINUX_HEADERS = /usr/src/sys/build
32,7 → 32,7
FORMAT = efi-app-$(ARCH)
 
 
all: hello.efi
all: gefi hello.efi
 
 
clean:
43,7 → 43,7
hello.efi: hello.so
$(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
$(LD) $(LDFLAGS) -Map hello.map hello.o -o hello.so $(LOADLIBES)
52,8 → 52,9
$(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c hello.c -o hello.o
 
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)
/trunk/boot/arch/ia64/loader/Makefile
41,6 → 41,7
LD = ld
OBJCOPY = objcopy
OBJDUMP = objdump
GEFI_PREXIX =
endif
 
ifeq ($(COMPILER),icc_native)
57,6 → 58,7
LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
GEFI_PREFIX = $(TOOLCHAIN_DIR)/$(TARGET)-
endif
 
#-mno-pic means do not use gp + imm22 to address data
105,10 → 107,10
 
 
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)
$(LD) -Map boot.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@