Changeset 3b5c119 in mainline for uspace/app

Timestamp:

2012-04-08T08:07:21Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1196df6

Parents:

ce6de59 (diff), f3378ba (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 with mainline

Location:

uspace/app

Files:

• binutils/Makefile (modified) (1 diff)
• sbi/src/run_texpr.c (modified) (3 diffs)
• tester/fault/fault2.c (modified) (1 diff)

uspace/app/binutils/Makefile

@@ -112 +112 @@
 endif
 ifeq ($(PLATFORM),arm32)
-TARGET = arm-linux-gnu
+TARGET = arm-linux-gnueabi
 endif
 ifeq ($(PLATFORM),ia32)

uspace/app/sbi/src/run_texpr.c

@@ -98 +98 @@
 {
         stree_symbol_t *sym;
-        tdata_item_t *targ_i;
-        tdata_item_t *titem;
+        tdata_item_t *targ_i = NULL;
+        tdata_item_t *titem = NULL;;
         tdata_object_t *tobject;
         tdata_deleg_t *tdeleg;
@@ -139 +139 @@
                 return;
         }
-
-        /* Make compiler happy. */
-        titem = NULL;
 
         switch (sym->sc) {
@@ -222 +219 @@
     stree_tindex_t *tindex, tdata_item_t **res)
 {
-        tdata_item_t *base_ti;
+        tdata_item_t *base_ti = NULL;
         tdata_item_t *titem;
         tdata_array_t *tarray;

uspace/app/tester/fault/fault2.c

@@ -35 +35 @@
 const char *test_fault2(void)
 {
-        volatile long long var;
-        volatile int var1;
-        
-        var1 = *((aliasing_int *) (((char *) (&var)) + 1));
+        volatile long long var = 0;
+        volatile int var1 = *((aliasing_int *) (((char *) (&var)) + 1));
         printf("Read %d\n", var1);