Changeset cb7c685 in mainline

Timestamp:

2011-05-19T02:30:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

10a530cc

Parents:

53d9ee9

Message:

Improved syntax for file appending in shell scripts.
Minor improvements in comments.

Location:

uspace/app/binutils

Files:

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

uspace/app/binutils/intrusive.sh

@@ -31 +31 @@
 #
 # This shell script is reserved for intrusive patches (hacks) to binutils
-# that are not possible to be done in a clean and isolated way or for
-# which doing so would require too much complexity.
+# that cannot be done in a clean and isolated way or for which doing so 
+# would require too much complexity.
 #
 
@@ -38 +38 @@
         "do")
                 # Binutils plugin support is dependent on libdl.so library.
-                # By default, the plugin support is switched of for all
+                # By default, the plugin support is switched off for all
                 # configure scripts of binutils. The only exception is configure
                 # script of ld 2.21 (and possibly above), where plugin support

uspace/app/binutils/patch.awk

@@ -32 +32 @@
 # This script is reserved for transformation of native
 # uspace/Makefile.common so it would be compatible with ported
-# application and its operation could be intercepted.
+# application and its operations could be intercepted.
 #
 

uspace/app/binutils/toolchain.sh

@@ -57 +57 @@
 case "$1" in
         "gcc")
-                echo '#! /bin/bash' > 'gcc'
-                echo 'AS_LINK="`echo $* | grep '\'as-new\''`"' >> 'gcc'
-                echo 'LD_LINK="`echo $* | grep '\'ld-new\''`"' >> 'gcc'
-                echo 'LINK="`echo -n "$AS_LINK""$LD_LINK"`"' >> 'gcc'
-                echo 'if [ -n "$LINK" ]; then' >> 'gcc'
-                echo '  LD_ARGS="`echo $* | \' >> 'gcc'
-                echo '          sed '\'s/-O[^ ]*//g\'' | \' >> 'gcc'
-                echo '          sed '\'s/-W[^ ]*//g\'' | \' >> 'gcc'
-                echo '          sed '\'s/-g//g\'' | \' >> 'gcc'
-                echo '          sed '\'s/-l[^ ]*//g\'' | \' >> 'gcc'
-                echo '          sed '\'s/ [ ]*/ /g\''`"' >> 'gcc'
-                echo '  ld "$LD_ARGS"' >> 'gcc'
-                echo 'else' >> 'gcc'
+                (
+                echo '#! /bin/bash'
+                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 '          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' | \
@@ -76 +77 @@
                         sed 's/-g//g' | \
                         sed 's/ [ ]*/ /g'`"
-                echo "  $2" "$CFLAGS" '$@' >> 'gcc'
-                echo 'fi' >> 'gcc'
+                echo "  $2" "$CFLAGS" '$@'
+                echo 'fi'
+                ) > 'gcc'
                 chmod a+x 'gcc'
                 ;;
         "as")
-                echo '#! /bin/bash' > 'as'
-                echo "$2" '$@' >> 'as'
+                (
+                echo '#! /bin/bash'
+                echo "$2" '$@'
+                ) > 'as'
                 chmod a+x 'as'
                 ;;
         "ar")
-                echo '#! /bin/bash' > 'ar'
-                echo "$2" '$@' >> 'ar'
+                (
+                echo '#! /bin/bash'
+                echo "$2" '$@'
+                ) > 'ar'
                 chmod a+x 'ar'
                 ;;
         "ranlib")
-                echo '#! /bin/bash' > 'ranlib'
-                echo "ar -s" '$@' >> 'ranlib'
+                (
+                echo '#! /bin/bash'
+                echo "ar -s" '$@'
+                ) > 'ranlib'
                 chmod a+x 'ranlib'
                 ;;
         "ld")
-                echo '#! /bin/bash' > 'ld'
-                echo "$2 -n $3 -T $4" '$@' "$5" >> 'ld'
+                (
+                echo '#! /bin/bash'
+                echo "$2 -n $3 -T $4" '$@' "$5"
+                ) > 'ld'
                 chmod a+x 'ld'
                 ;;
         "objdump")
-                echo '#! /bin/bash' > 'objdump'
-                echo "$2" '$@' >> 'objdump'
+                (
+                echo '#! /bin/bash'
+                echo "$2" '$@'
+                ) > 'objdump'
                 chmod a+x 'objdump'
                 ;;
         "objcopy")
-                echo '#! /bin/bash' > 'objcopy'
-                echo "$2" '$@' >> 'objcopy'
+                (
+                echo '#! /bin/bash'
+                echo "$2" '$@'
+                ) > 'objcopy'
                 chmod a+x 'objcopy'
                 ;;
         "strip")
-                echo '#! /bin/bash' > 'strip'
-                echo "$2" '$@' >> 'strip'
+                (
+                echo '#! /bin/bash'
+                echo "$2" '$@'
+                ) > 'strip'
                 chmod a+x 'strip'
                 ;;