Changeset f3a605be in mainline

Timestamp:

2011-06-20T02:36:25Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5c5117c

Parents:

d900699

Message:

Binutils configure scripts now correctly detect dependencies provided by libposix.

Location:

uspace/app/binutils

Files:

• Makefile (modified) (4 diffs)
• toolchain.sh (modified) (2 diffs)

uspace/app/binutils/Makefile

@@ -88 +88 @@
 BINUTILS_CONFIGURED = $(REDIST_DIR)/Makefile
 
+# Generated source file for libposix function stubs without posix_ prefix.
+CONFOBJ_SOURCE = ./confobj.c
+
+# Dummy object file for libposix function stubs without posix_ prefix..
+# Required by binutils configure script tests that links against symbols
+# without including headers (which means that symbols are not prefixed).
+CONFOBJ_OBJECT = $(subst $(space),\ ,$(shell pwd))/confobj.o
+
 # Map the HelenOS target to binutils target.
 ifeq ($(PLATFORM),amd64)
@@ -133 +141 @@
 ifeq ($(COMPILER),$(findstring $(COMPILER),$(SUPPORTED_COMPILERS)))
 all: $(COMMON_MAKEFILE_PATCHED) all_ $(TOOLCHAIN) $(BINUTILS_PATCHED) \
-                $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
+                $(CONFOBJ_OBJECT) $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
         make -C $(REDIST_DIR) $(MAKE_TARGETS)
         cp -f $(REDIST_DIR)/gas/as-new ./as
@@ -156 +164 @@
         touch $@
 
+# Generate stubs for libposix functions without posix_ prefix.
+$(CONFOBJ_SOURCE):
+        echo '/* GENERATED FILE. DO NOT MODIFY. */' > $@; \
+        grep -r -o -h -I -E 'posix_[^ \(]*\(' $(LIBPOSIX_PREFIX) | \
+        sort -u | \
+        sed 's/posix_\([^ (]*\)(/char \1() { return 0; }/g' >> $@
+
+# Compile dummy object for configure script tests.
+$(CONFOBJ_OBJECT): $(CONFOBJ_SOURCE) $(TOOLCHAIN)
+        ./gcc -c -o $@ $<
+
 # Generate false toolchain scripts.
 $(TOOLCHAIN): $(TOOLCHAIN_SCRIPT)
-        ./$< gcc $(CC) '$(CFLAGS)'
+        ./$< gcc $(CC) \
+                '$(CFLAGS)' '$(LINKER_SCRIPT)' '$(LIBS) $(BASE_LIBS) $(CONFOBJ_OBJECT)'
         ./$< as $(AS)
         ./$< ar $(AR)
         ./$< ranlib
-        ./$< ld $(LD) '$(LFLAGS)' '$(LINKER_SCRIPT)' '$(LIBS) $(BASE_LIBS)'
+        ./$< ld $(LD) \
+                '$(LFLAGS)' '$(LINKER_SCRIPT)' '$(LIBS) $(BASE_LIBS)'
         ./$< objdump $(OBJDUMP)
         ./$< objcopy $(OBJCOPY)
@@ -185 +206 @@
 clean: $(BINUTILS_PATCH) clean_
         rm -f as ld
+        rm -f $(CONFOBJ_SOURCE) $(CONFOBJ_OBJECT)
         if [ -e $(REDIST_DIR)/Makefile ]; then \
                 make -C $(REDIST_DIR) distclean; \

uspace/app/binutils/toolchain.sh

@@ -52 +52 @@
 # special approach because binutils use it for both compilation and
 # linkage. In case the linking usage is detected, the call is redirected
-# to the linker.
+# to the linker. There is also special case for configure script tests
+# that require compiler link step.
 #
 
@@ -77 +78 @@
                         sed 's/-g//g' | \
                         sed 's/ [ ]*/ /g'`"
-                echo '  echo' \'"$2"\' \'"$CFLAGS"\' '"$@"'
-                echo "  $2" "$CFLAGS" '$@'
+                echo '  CONFTEST="`echo $* | grep '\' conftest \''`"'
+                echo '  if [ -n "$CONFTEST" ]; then'
+                echo '          LFLAGS="-Xlinker -z -Xlinker muldefs"'
+                echo '          echo' \'"$2 $CFLAGS -T $4"\' '"$LFLAGS"' '"$@"' \'"$5"\'
+                echo "          $2 $CFLAGS -T $4" '$LFLAGS' '$@' "$5"
+                echo '  else'
+                echo '          echo' \'"$2 $CFLAGS"\' '"$@"'
+                echo "          $2 $CFLAGS" '$@'
+                echo '  fi'
                 echo 'fi'
                 ) > 'gcc'