Changeset 4c53333 in mainline for uspace/app/binutils

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

Location:

uspace/app/binutils

Files:

• intrusive.sh (modified) (2 diffs)
• toolchain.sh (modified) (1 diff)

uspace/app/binutils/intrusive.sh

@@ -96 +96 @@
 # libposix function name redefinitons in one of the arm-specific files.
 #
+# Patch 9
+# Libiberty does not trust our strncmp that is provided in libposix.
+# That is because when cross-compiling, it cannot check how it behaves
+# and assumes the worst. But then it clashes when linking (due to
+# multiple definitions of ...) and this patch prevents compilation of
+# liberty strncmp.
 
 case "$1" in
@@ -157 +163 @@
                 # Patch libiberty configure script.
                 cat "$2/libiberty/configure.backup" | \
-                # See Patch 1.
-                sed 's/^cross_compiling=no/cross_compiling=yes/g' \
+                # See Patch 1 and 9.
+                sed -e 's/^cross_compiling=no/cross_compiling=yes/g' \
+                        -e 's/ac_cv_func_strncmp_works=no/ac_cv_func_strncmp_works=yes/g' \
                 > "$2/libiberty/configure"
 

uspace/app/binutils/toolchain.sh

@@ -72 +72 @@
                 echo '  ld $LD_ARGS'
                 echo 'else'
-                CFLAGS="`echo " $3" | \
+                CFLAGS="`echo " $3 " | \
                         sed 's/ -O[^ ]*//g' | \
                         sed 's/ -W[^ ]*//g' | \
                         sed 's/ -pipe//g' | \
-                        sed 's/ -g//g' | \
+                        sed 's/ -g[^ ]*//g' | \
                         sed 's/ [ ]*/ /g'`"
                 echo '  CONFTEST="`echo \"$*\" | grep '\' conftest \''`"'