Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 349e510d in mainline


Ignore:
Timestamp:
2012-06-27T20:34:18Z (8 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/proc/thread.c

    r02dcb20 r349e510d  
    277277       
    278278        cpu_t *cpu;
    279         if (thread->wired) {
     279        if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
    280280                ASSERT(thread->cpu != NULL);
    281281                cpu = thread->cpu;
  • tools/toolchain.sh

    r02dcb20 r349e510d  
    319319       
    320320        change_title "binutils: configure (${PLATFORM})"
    321         CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls
     321        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls --disable-werror
    322322        check_error $? "Error configuring binutils."
    323323       
     
    331331       
    332332        change_title "GCC: configure (${PLATFORM})"
    333         "${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
     333        "${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
    334334        check_error $? "Error configuring GCC."
    335335       
Note: See TracChangeset for help on using the changeset viewer.