Changeset b006bfb8 in mainline

Timestamp:

2007-09-17T17:29:49Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c0cdcaf

Parents:

a0edf5f

Message:

Modify parts of the build system and libc to support building applications on
paths with differing distances from lib/libc (e.g. uspace/srv/ns and
uspace/srv/fs/fat).

Location:

uspace/lib/libc

Files:

• Makefile (modified) (2 diffs)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/ia64/_link.ld.in (modified) (1 diff)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/ppc64/_link.ld.in (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (1 diff)

uspace/lib/libc/Makefile

@@ -30 +30 @@
 #
 
-LIBC_PREFIX = .
+LIBC_PREFIX = $(shell pwd)
 SOFTINT_PREFIX = ../softint
 CONSOLE_PREFIX = ../../srv/console
@@ -104 +104 @@
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 
 %.o: %.S

uspace/lib/libc/arch/amd64/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

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

@@ -33 +33 @@
 TOOLCHAIN_DIR = /usr/local/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft 
-LFLAGS += -N ../../lib/softint/libsoftint.a
+LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS += 
 

uspace/lib/libc/arch/arm32/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/libc/arch/ia32/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

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

@@ -33 +33 @@
 TOOLCHAIN_DIR = /usr/local/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
-LFLAGS += -N ../../lib/softint/libsoftint.a
+LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS += 
 

uspace/lib/libc/arch/ia64/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/libc/arch/mips32/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/libc/arch/ppc32/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/libc/arch/ppc64/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/libc/arch/sparc64/_link.ld.in

@@ -1 @@
-STARTUP(../../lib/libc/arch/ARCH/src/entry.o)
+STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
 ENTRY(__entry)