Changeset 3e22494f in mainline

Timestamp:

2011-06-24T02:15:07Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

4d4988e

Parents:

41e2118

Message:

Added runtime flag filtration into gcc wrapper.

File:

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

uspace/app/binutils/toolchain.sh

@@ -60 +60 @@
                 (
                 echo '#! /bin/bash'
-                echo 'AS_LINK="`echo $* | grep '\'as-new\''`"'
-                echo 'LD_LINK="`echo $* | grep '\'ld-new\''`"'
+                echo 'AS_LINK="`echo \"$*\" | grep '\'as-new\''`"'
+                echo 'LD_LINK="`echo \"$*\" | grep '\'ld-new\''`"'
                 echo 'LINK="`echo -n "$AS_LINK""$LD_LINK"`"'
                 echo 'if [ -n "$LINK" ]; then'
-                echo '  LD_ARGS="`echo $* | \'
+                echo '  LD_ARGS="`echo \"$*\" | \'
                 echo '          sed '\'s/-O[^ ]*//g\'' | \'
                 echo '          sed '\'s/-W[^ ]*//g\'' | \'
@@ -70 +70 @@
                 echo '          sed '\'s/-l[^ ]*//g\'' | \'
                 echo '          sed '\'s/ [ ]*/ /g\''`"'
-                echo '  ld "$LD_ARGS"'
+                echo '  ld $LD_ARGS'
                 echo 'else'
                 CFLAGS="`echo "$3" | \
@@ -78 +78 @@
                         sed 's/-g//g' | \
                         sed 's/ [ ]*/ /g'`"
-                echo '  CONFTEST="`echo $* | grep '\' conftest \''`"'
+                echo '  CONFTEST="`echo \"$*\" | grep '\' conftest \''`"'
                 echo '  if [ -n "$CONFTEST" ]; then'
                 echo '          LFLAGS="-Xlinker -z -Xlinker muldefs"'
@@ -84 +84 @@
                 echo "          $2" '$@' "$CFLAGS -T $4" '$LFLAGS' "$5"
                 echo '  else'
-                echo '          echo' \'"$2"\' '"$@"' \'"$CFLAGS"\'
-                echo "          $2" '$@' "$CFLAGS"
+                                        # Remove flags:
+                                        # -Wc++-compat
+                                        #               Required just for gold linker.
+                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"'
+                echo '          echo' \'"$2"\' '"$GCC_ARGS"' \'"$CFLAGS"\'
+                echo "          $2" '$GCC_ARGS' "$CFLAGS"
                 echo '  fi'
                 echo 'fi'