Changeset 1314e3b in mainline

Timestamp:

2007-11-12T13:24:46Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcfd586

Parents:

7c5bcc0

Message:

Work around the way symtab.data section is constructed.
This fixes building of ia64.

Files:

• kernel/Makefile (modified) (4 diffs)
• kernel/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/ia64/Makefile.inc (modified) (1 diff)
• uspace/lib/libc/arch/ia64/Makefile.inc (modified) (1 diff)

kernel/Makefile

@@ -67 +67 @@
 endif
 
-## Setup kernel configuration
-#
-
 -include arch/$(ARCH)/Makefile.inc
 -include genarch/Makefile.inc
 
+## The at-sign
+#
+# THE $(ATSIGN) variable holds the ASCII character representing the at-sign
+# ('@') used in various $(AS) constructs (e.g. @progbits). On architectures that
+# don't use '@' for starting a comment, $(ATSIGN) is merely '@'. However, on
+# those that do use it for starting a comment (e.g. arm32), $(ATSIGN) must be
+# defined as the percentile-sign ('%') in the architecture-dependent
+# Makefile.inc.
+#
+ATSIGN ?= @
+
+## Cross-platform assembly to start a symtab.data section
+#
+SYMTAB_SECTION=".section symtab.data, \"a\", $(ATSIGN)progbits;"
+
+## Setup kernel configuration
+#
 ifeq ($(CONFIG_DEBUG),y)
         DEFS += -DCONFIG_DEBUG
@@ -347 +361 @@
 
 generic/src/debug/real_map.bin: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
-        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab Makefile generic/src/debug/empty_map.o
+        echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o generic/src/debug/empty_map.o
         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/empty_map.o  -o $@ -Map kernel.map.pre
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
@@ -353 +367 @@
         # Do it once again, this time to get correct even the symbols
         # on architectures, that have bss after symtab
-        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab generic/src/debug/real_map.bin generic/src/debug/sizeok_map.o
+        echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o generic/src/debug/sizeok_map.o
         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
@@ -359 +373 @@
 
 generic/src/debug/real_map.o: generic/src/debug/real_map.bin
-        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab $< $@
+        echo $(SYMTAB_SECTION)" .incbin \"$<\"" | $(AS) $(AFLAGS) -o $@ 
 
 kernel.raw: depend arch/$(ARCH)/_link.ld $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/real_map.o

kernel/arch/arm32/Makefile.inc

@@ -41 +41 @@
         DMACHINE = MACHINE_GXEMUL_TESTARM
 endif
+
+ATSIGN = %
 
 GCC_CFLAGS += -fno-zero-initialized-in-bss

kernel/arch/ia64/Makefile.inc

@@ -30 +30 @@
 #
 
-BFD_NAME = elf64-ia64-little
+BFD_NAME = elf64-little
 BFD_ARCH = ia64-elf64
 TARGET = ia64-pc-linux-gnu

uspace/lib/libc/arch/ia64/Makefile.inc

@@ -40 +40 @@
                 arch/$(ARCH)/src/tls.c
 
-BFD_NAME = elf64-little
+BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64