Changeset cdc8a391 in mainline for uspace/app

Timestamp:

2013-07-12T14:08:06Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

322ac35c

Parents:

98abd40 (diff), b66ffb1 (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

Files:

• binutils/toolchain.sh (modified) (1 diff)
• mkmfs/mkmfs.c (modified) (1 diff)

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 \''`"'

uspace/app/mkmfs/mkmfs.c

@@ -649 +649 @@
                 mark_bmap(ibmap_buf, i, FREE);
 
-        for (i = sb->first_data_zone + 1; i < sb->n_zones; ++i)
+        for (i = 2; i < sb->n_zones; ++i)
                 mark_bmap(zbmap_buf, i, FREE);