Changeset 349e510d in mainline

Timestamp:

2012-06-27T20:34:18Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

ae49252

Parents:

02dcb20 (diff), baf8fbb (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

Files:

• kernel/generic/src/proc/thread.c (modified) (1 diff)
• tools/toolchain.sh (modified) (2 diffs)

kernel/generic/src/proc/thread.c

@@ -277 +277 @@
         
         cpu_t *cpu;
-        if (thread->wired) {
+        if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
                 ASSERT(thread->cpu != NULL);
                 cpu = thread->cpu;

tools/toolchain.sh

@@ -319 +319 @@
         
         change_title "binutils: configure (${PLATFORM})"
-        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls
+        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls --disable-werror
         check_error $? "Error configuring binutils."
         
@@ -331 +331 @@
         
         change_title "GCC: configure (${PLATFORM})"
-        "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto
+        "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto --disable-werror
         check_error $? "Error configuring GCC."