diff --git a/src/external/corefoundation b/src/external/corefoundation index 57f42c275..e3f79d824 160000 --- a/src/external/corefoundation +++ b/src/external/corefoundation @@ -1 +1 @@ -Subproject commit 57f42c2752b68629bda6fbde8fdeb30453fc756f +Subproject commit e3f79d824610d4f9ee9364d5369ac758ccb94507 diff --git a/src/external/foundation b/src/external/foundation index 2bb615310..acc08a57a 160000 --- a/src/external/foundation +++ b/src/external/foundation @@ -1 +1 @@ -Subproject commit 2bb615310ff8e3cdfab03d8f7e4ea7ec6309fe64 +Subproject commit acc08a57a951286df0708df708d4e4e6c11d5958 diff --git a/src/libc/pthreads/pthread_machdep.h b/src/libc/pthreads/pthread_machdep.h index 001a8ae24..3878338a2 100644 --- a/src/libc/pthreads/pthread_machdep.h +++ b/src/libc/pthreads/pthread_machdep.h @@ -244,8 +244,10 @@ __inline__ static void * _pthread_getspecific_direct(unsigned long slot) { void *ret; -#if defined(__i386__) || defined(__x86_64__) +#if defined(__x86_64__) __asm__("mov %%gs:%1, %0" : "=r" (ret) : "m" (*(void **)(slot * sizeof(void *)))); +#elif defined(__i386__) + __asm__("mov %%fs:%1, %0" : "=r" (ret) : "m" (*(void **)(slot * sizeof(void *)))); #elif (defined(__arm__) && (defined(_ARM_ARCH_6) || defined(_ARM_ARCH_5))) void **__pthread_tsd; #if defined(__arm__) && defined(_ARM_ARCH_6) @@ -269,9 +271,9 @@ _pthread_setspecific_direct(unsigned long slot, void * val) { #if defined(__i386__) #if defined(__PIC__) - __asm__("movl %1,%%gs:%0" : "=m" (*(void **)(slot * sizeof(void *))) : "rn" (val)); + __asm__("movl %1,%%fs:%0" : "=m" (*(void **)(slot * sizeof(void *))) : "rn" (val)); #else - __asm__("movl %1,%%gs:%0" : "=m" (*(void **)(slot * sizeof(void *))) : "ri" (val)); + __asm__("movl %1,%%fs:%0" : "=m" (*(void **)(slot * sizeof(void *))) : "ri" (val)); #endif #elif defined(__x86_64__) /* PIC is free and cannot be disabled, even with: gcc -mdynamic-no-pic ... */ diff --git a/src/libdyld/DylibSearch.cpp b/src/libdyld/DylibSearch.cpp index d527f0d49..2182fa60e 100644 --- a/src/libdyld/DylibSearch.cpp +++ b/src/libdyld/DylibSearch.cpp @@ -78,7 +78,7 @@ std::string DylibSearch::resolve(std::string dylib, MachOObject* requester) p = LIB_PATH; p += '/'; p += aliasTarget; - std::cout << p << std::endl; + // std::cout << p << std::endl; } return p;