Changeset 723560f in mainline

Timestamp:

2011-06-24T23:07:22Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

3f4c897d

Parents:

d185132

Message:

Minor improvements in false toolchain.

File:

• uspace/app/binutils/toolchain.sh (modified) (2 diffs)

uspace/app/binutils/toolchain.sh

@@ -64 +64 @@
                 echo 'LINK="`echo -n "$AS_LINK""$LD_LINK"`"'
                 echo 'if [ -n "$LINK" ]; then'
-                echo '  LD_ARGS="`echo \"$*\" | \'
-                echo '          sed '\'s/-O[^ ]*//g\'' | \'
-                echo '          sed '\'s/-W[^ ]*//g\'' | \'
-                echo '          sed '\'s/-g//g\'' | \'
-                echo '          sed '\'s/-l[^ ]*//g\'' | \'
+                echo '  LD_ARGS="`echo \" $*\" | \'
+                echo '          sed '\'s/ -O[^ ]*//g\'' | \'
+                echo '          sed '\'s/ -W[^ ]*//g\'' | \'
+                echo '          sed '\'s/ -g//g\'' | \'
+                echo '          sed '\'s/ -l[^ ]*//g\'' | \'
                 echo '          sed '\'s/ [ ]*/ /g\''`"'
                 echo '  ld $LD_ARGS'
                 echo 'else'
-                CFLAGS="`echo "$3" | \
-                        sed 's/-O[^ ]*//g' | \
-                        sed 's/-W[^ ]*//g' | \
-                        sed 's/-pipe//g' | \
-                        sed 's/-g//g' | \
+                CFLAGS="`echo " $3" | \
+                        sed 's/ -O[^ ]*//g' | \
+                        sed 's/ -W[^ ]*//g' | \
+                        sed 's/ -pipe//g' | \
+                        sed 's/ -g//g' | \
                         sed 's/ [ ]*/ /g'`"
                 echo '  CONFTEST="`echo \"$*\" | grep '\' conftest \''`"'
@@ -87 +87 @@
                                         # -Wc++-compat
                                         #               Required just for gold linker.
-                echo '          GCC_ARGS="`echo \"$*\" | \'
-                echo '                  sed '\'s/-Wc++-compat//g\'' | \'
+                echo '          GCC_ARGS="`echo \" $*\" | \'
+                echo '                  sed '\'s/ -Wc++-compat//g\'' | \'
                 echo '                  sed '\'s/ [ ]*/ /g\''`"'
                                         # Add flags:
                                         # -Wno-type-limits
                                         #               HelenOS pid_t is unsigned
-                                        #               while on most systems it is signed.
-                echo '          GCC_ARGS="$GCC_ARGS -Wno-type-limits"'
+                                        #               while on most systems it is signed.
+                                        # -Wno-shadow
+                                        #               Silents the warning caused by 
+                                        #               harmless bug in ld/ldlang.h and ld/ldlex.c.
+                echo '          GCC_ARGS="$GCC_ARGS -Wno-type-limits -Wno-shadow"'
                 echo '          echo' \'"$2"\' '"$GCC_ARGS"' \'"$CFLAGS"\'
                 echo "          $2" '$GCC_ARGS' "$CFLAGS"