WebSVN – HelenOS – Path Comparison – / – /trunk/boot/arch/ia64/ Rev 3882 and /trunk/boot/arch/ia64/ Rev 3883

Ignore whitespace Rev 3882 → Rev 3883

 /trunk/boot/arch/ia64/Makefile.inc
 ,22 → 26,17
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#ifeq ($(MACHINE),ski)
 build: $(BASE)/image.boot
-$(BASE)/image.boot: depend arch/$(ARCH)/loader/image.boot
-    cp arch/$(ARCH)/loader/image.boot $(BASE)/image.boot
+$(BASE)/image.boot: depend arch/$(BARCH)/loader/image.boot
+    cp arch/$(BARCH)/loader/image.boot $(BASE)/image.boot
 depend:
-    -rm arch/$(ARCH)/loader/image.boot
+    -rm arch/$(BARCH)/loader/image.boot
-arch/$(ARCH)/loader/image.boot:
-    make -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+    make -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 clean: generic_clean
-    make -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+    make -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
     -rm -f $(BASE)/image.boot
-#endif

 /trunk/boot/arch/ia64/loader/main.c
 ,6 → 1,6
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 ,11 → 33,12
 #include "_components.h"
 #include <align.h>
 #include <balloc.h>
+#include <macros.h>
 extern bootinfo_t binfo;
 component_t components[COMPONENTS];
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 void write(const char *str, const int len)
 {
 ,13 → 54,13
 #define DEFAULT_SYS_FREQ        100000000 /* 100MHz */
 #ifdef REVISION
-    char *revision = ", revision " REVISION;
+    char *revision = ", revision " STRING(REVISION);
 #else
     char *revision = "";
 #endif
 #ifdef TIMESTAMP
-    char *timestamp = "\nBuilt on " TIMESTAMP;
+    char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
     char *timestamp = "";
 #endif

 /trunk/boot/arch/ia64/loader/gefi/Make.defaults
 ,30 → 27,19
 #
 INSTALLROOT=/usr/local
-TOPDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+TOPDIR    := $(shell pwd)
-ARCH       = $(shell uname -m | sed s,i[3456789]86,ia32,)
-INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
+ARCH       = ia64
+INCDIR     = -I. -I$(CDIR)/inc -I$(CDIR)/inc/$(ARCH) -I$(CDIR)/inc/protocol
 CPPFLAGS   = -DCONFIG_$(ARCH)
-CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-LDFLAGS    = -nostdlib
-INSTALL    = install
+CFLAGS     = -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -frename-registers -mfixed-range=f32-f127
+LDFLAGS    = -nostdlib
+INSTALL    = install
-GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
-#  prefix   =
-CC      = $(prefix)gcc
-AS      = $(prefix)as
-LD      = $(prefix)ld
-AR      = $(prefix)ar
-RANLIB  = $(prefix)ranlib
-OBJCOPY = $(prefix)objcopy
-OBJDUMP = $(prefix)objdump
-ifneq ($(GCC_VERSION),2)
-        CFLAGS += -frename-registers
-endif
-CFLAGS += -mfixed-range=f32-f127
+CC         = $(prefix)gcc
+AS         = $(prefix)as
+LD         = $(prefix)ld
+AR         = $(prefix)ar
+RANLIB     = $(prefix)ranlib
+OBJCOPY    = $(prefix)objcopy
+OBJDUMP    = $(prefix)objdump

 /trunk/boot/arch/ia64/loader/gefi/Makefile
 ,7 → 25,7
 SUBDIRS = lib gnuefi inc
-all:    check_gcc $(SUBDIRS)
+all: $(SUBDIRS)
 $(SUBDIRS):
     $(MAKE) -C $@
 ,13 → 39,4
 .PHONY: $(SUBDIRS) clean depend
-#
-# on both platforms you must use gcc 3.0 or higher
-#
-check_gcc:
-ifeq ($(GCC_VERSION),2)
-    @echo "you need to use a version of gcc >= 3.0, you are using `$(CC) --version`"
-    @exit 1
-endif
 include Make.rules

 /trunk/boot/arch/ia64/loader/Makefile
 ,7 → 27,7
 #
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 ## Toolchain configuration
 #
 ,7 → 47,7
     LD = ld
     OBJCOPY = objcopy
     OBJDUMP = objdump
-    GEFI_PREXIX =
+    GEFI_PREFIX =
 endif
 ifeq ($(COMPILER),icc_native)
 ,16 → 68,8
 endif
 #-mno-pic means do not use gp + imm22 to address data
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -I../../../../kernel/generic/include -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -pipe
-ifdef REVISION
-    CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-ifdef TIMESTAMP
-    CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
 SOURCES = \
     main.c \
     ../../../generic/printf.c \
 ,7 → 122,6
 hello.efi: image.boot
     make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
     cp gefi/HelenOS/hello.efi ../../../../
-#   cp gefi/HelenOS/hello.efi /boot/efi/
     cp gefi/HelenOS/image.bin ../../../../
 image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS)