Changeset 5081276 in mainline

Timestamp:

2011-09-07T00:12: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:

888207c9

Parents:

c05642d (diff), 8afa52c (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 binutils changes.

Location:

uspace/app/binutils

Files:

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

uspace/app/binutils/Makefile

@@ -36 +36 @@
 # Information for obtaining specific binutils redistributable package.
 # Might be subject to change in the future.
-REDIST_VERSION = 2.21
+REDIST_VERSION = 2.21.1
 REDIST_NAME = binutils-$(REDIST_VERSION)
 REDIST_FILENAME = $(REDIST_NAME).tar.bz2
 REDIST_SOURCE = ftp://ftp.gnu.org/gnu/binutils/
+REDIST_MIRROR = http://www.helenos.org/binutils/
 
 # Directory for the binutils source tree.
@@ -167 +168 @@
 $(REDIST_FILENAME):
         wget -c $(REDIST_SOURCE)$(REDIST_FILENAME)
+        if [ ! -e $(REDIST_FILENAME) ]; then \
+                wget -c $(REDIST_MIRROR)$(REDIST_FILENAME); \
+        fi
 
 # Extract binutils source tree.

uspace/app/binutils/intrusive.sh

@@ -57 +57 @@
 # Patch 2
 # Enabled cross compilation flag brings along some anomalies which
-# have to reverted. 
+# have to be reverted. 
 #
 # Patch 3

uspace/app/binutils/toolchain.sh

@@ -95 +95 @@
                 echo '                  sed '\'s/ [ ]*/ /g\''`"'
                                         # Add flags:
-                                        # -Wno-shadow
-                                        #               Silents the warning caused by 
-                                        #               harmless bug in ld/ldlang.h and ld/ldlex.c.
-#               echo '          GCC_ARGS="$GCC_ARGS -Wno-shadow"'
+                                        # -example
+                                        #               Flag description.
+#               echo '          GCC_ARGS="$GCC_ARGS -example"'
                 echo '          echo' \'"$2"\' '"$GCC_ARGS"' \'"$CFLAGS"\'
                 echo "          $2" '$GCC_ARGS' "$CFLAGS"