Changeset 9060bd1 in mainline for arch

Timestamp:

2005-09-10T11:20:47Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24241cf

Parents:

f3a6c8e5

Message:

IA-32 can be now cross-compiled by ./build.ia32 cross.
Unify IA-32 Makefile.inc and Makefile.inc.cross.

Update doc/requirements.

Small changes elsewere.

Location:

arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• Makefile.inc.cross (deleted)
• _link.ld.in (modified) (2 diffs)
• include/boot/boot.h (modified) (1 diff)

arch/ia32/Makefile.inc

@@ -1 @@
-CC=gcc
-AS=as
-LD=ld
-OBJDUMP=objdump
-OBJCOPY=objcopy
+ifeq (${CROSS_COMPILER},yes)
+        IA-32_TARGET=i686-pc-linux-gnu
+
+        IA-32_CC_DIR=/usr/local/i686/bin
+        IA-32_BINUTILS_DIR=/usr/local/i686/bin
+
+        CC=$(IA-32_CC_DIR)/$(IA-32_TARGET)-gcc
+        AS=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-as
+        LD=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-ld
+        OBJCOPY=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objcopy
+        OBJDUMP=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objdump
+else
+        CC=gcc
+        AS=as
+        LD=ld
+        OBJCOPY=objcopy
+        OBJDUMP=objdump
+endif
+
 BFD_NAME=elf32-i386
 BFD_ARCH=i386
-
 
 DEFS:=-DARCH=$(ARCH) -DFPU_LAZY
@@ -18 +31 @@
 endif
 
-CFLAGS=$(DEFS) -nostdlib -fno-builtin -fomit-frame-pointer -O3
-LFLAGS=-M -no-check-sections
+CPPFLAGS=$(DEFS) -nostdinc -I../include
+CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
+LFLAGS=-M
 
 ../arch/$(ARCH)/_link.ld: ../arch/$(ARCH)/_link.ld.in
-        $(CC) $(CFLAGS) -C -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
 
 arch_sources= \

arch/ia32/_link.ld.in

@@ -30 +30 @@
         .mapped (PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET)+SIZEOF(.unmapped)): AT (BOOTSTRAP_OFFSET+SIZEOF(.unmapped)) { 
                 ktext_start = .;
-                *(BOOT_DATA)
+                *(BOOT_DATA);
                 *(.text);
                 ktext_end = .;
@@ -41 +41 @@
                 LONG(PA2KA(BOOT_OFFSET+BOOTSTRAP_OFFSET));
                 hardcoded_ktext_size = .;
-                LONG(ktext_end - ktext_start + (unmapped_ktext_end - unmapped_ktext_start));
+                LONG((ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start));
                 hardcoded_kdata_size = .;
-                LONG(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
+                LONG((kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start));
                 hardcoded_unmapped_ktext_size = .;
                 LONG(unmapped_ktext_end - unmapped_ktext_start);

arch/ia32/include/boot/boot.h

@@ -31 +31 @@
 
 #define BOOTSTRAP_OFFSET                0x8000
-#define BOOT_OFFSET                             0x100000
+#define BOOT_OFFSET                     0x100000
 
 #define MULTIBOOT_HEADER_MAGIC  0x1BADB002