Changeset fa024ce in mainline for boot/arch/ia64

Timestamp:

2009-02-12T20:12:08Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98a4e76

Parents:

fcd7053

Message:

simplify configuration

Location:

boot/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• loader/Makefile (modified) (4 diffs)
• loader/gefi/Make.defaults (modified) (1 diff)
• loader/gefi/Makefile (modified) (2 diffs)
• loader/main.c (modified) (4 diffs)

boot/arch/ia64/Makefile.inc

@@ -27 +27 @@
 #
 
-#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
-

boot/arch/ia64/loader/Makefile

@@ -28 +28 @@
 
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 
 ## Toolchain configuration
@@ -48 +48 @@
         OBJCOPY = objcopy
         OBJDUMP = objdump
-        GEFI_PREXIX = 
+        GEFI_PREFIX =
 endif
 
@@ -69 +69 @@
 
 #-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
-
-ifdef REVISION
-        CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-
-ifdef TIMESTAMP
-        CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+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
 
 SOURCES = \
@@ -131 +123 @@
         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/arch/ia64/loader/gefi/Make.defaults

@@ -28 +28 @@
 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

boot/arch/ia64/loader/gefi/Makefile

@@ -26 +26 @@
 SUBDIRS = lib gnuefi inc
 
-all:    check_gcc $(SUBDIRS)
+all: $(SUBDIRS)
 
 $(SUBDIRS):
@@ -40 +40 @@
 .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

boot/arch/ia64/loader/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar 
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
@@ -34 +34 @@
 #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)
@@ -54 +55 @@
 
 #ifdef REVISION
-        char *revision = ", revision " REVISION;
+        char *revision = ", revision " STRING(REVISION);
 #else
         char *revision = "";
@@ -60 +61 @@
 
 #ifdef TIMESTAMP
-        char *timestamp = "\nBuilt on " TIMESTAMP;
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
         char *timestamp = "";