From: Apple Date: Wed, 19 Sep 2012 18:25:32 +0000 (+0000) Subject: Libc-825.25.tar.gz X-Git-Tag: mac-os-x-1082^0 X-Git-Url: https://git.saurik.com/apple/libc.git/commitdiff_plain/065eae9f38780a3602538caa52399f41f061a88e Libc-825.25.tar.gz --- diff --git a/i386/string/bcopy_sse2.s b/i386/string/bcopy_sse2.s index 4987c5e..4e001b7 100644 --- a/i386/string/bcopy_sse2.s +++ b/i386/string/bcopy_sse2.s @@ -151,7 +151,6 @@ LDestAligned: negl %edx // now generate offset to 1st byte to be copied testl $15,%esi // is source aligned too? jnz LUnalignedLoop // no - cmpl $(kFastUCode),%eax // long enough for the fastpath in microcode? jb LAlignedLoop // no, use SSE cld // we'll move forward diff --git a/i386/string/bzero_sse2.s b/i386/string/bzero_sse2.s index 6d03019..2b3bdb8 100644 --- a/i386/string/bzero_sse2.s +++ b/i386/string/bzero_sse2.s @@ -37,7 +37,6 @@ * since gcc sometimes silently maps bzero() into memset(). As a result, * we always load the original ptr into %eax before returning. */ - #define kShort 80 // too short to bother with SSE (must be >=80) #define kVeryLong (1024*1024) diff --git a/util/mkpath_np.c b/util/mkpath_np.c index 453219a..e0101c1 100644 --- a/util/mkpath_np.c +++ b/util/mkpath_np.c @@ -63,9 +63,14 @@ _mkpath_np(const char *path, mode_t omode, const char ** firstdir) case ENOENT: break; case EEXIST: - if (stat(path, &sbuf) == 0 && - !S_ISDIR(sbuf.st_mode)) { - retval = ENOTDIR; + if (stat(path, &sbuf) == 0) { + if (S_ISDIR(sbuf.st_mode)) { + retval = EEXIST; + } else { + retval = ENOTDIR; + } + } else { + retval = EIO; } goto mkpath_exit; case EISDIR: /* */ diff --git a/x86_64/string/bzero_sse2.s b/x86_64/string/bzero_sse2.s index 3d7d596..fe94d28 100644 --- a/x86_64/string/bzero_sse2.s +++ b/x86_64/string/bzero_sse2.s @@ -37,7 +37,6 @@ * since gcc sometimes silently maps bzero() into memset(). As a result, * we always load the original ptr into %eax before returning. */ - #define kShort 80 // too short to bother with SSE (must be >=80) #define kVeryLong (1024*1024) diff --git a/xcodescripts/libc.xcconfig b/xcodescripts/libc.xcconfig index ac40d92..ba089eb 100644 --- a/xcodescripts/libc.xcconfig +++ b/xcodescripts/libc.xcconfig @@ -24,6 +24,7 @@ LD_DYLIB_INSTALL_NAME = /usr/lib/system/$(EXECUTABLE_NAME) BUILD_VARIANTS = normal debug +// clang is desired over llvm-gcc for OSAtomics. However, it isn't capable of building armv6 correctly on Sundance GCC_VERSION = com.apple.compilers.llvm.clang.1_0 GCC_VERSION[arch=armv6] = com.apple.compilers.llvmgcc42 @@ -58,6 +59,7 @@ ARCH_FAMILY_x86_64 = x86_64 ARCH_FAMILY_i386 = i386 ARCH_FAMILY_armv6 = arm ARCH_FAMILY_armv7 = arm +ARCH_FAMILY_armv7s = arm ARCH_FAMILY_armv7f = arm ARCH_FAMILY_armv7k = arm @@ -69,6 +71,7 @@ FreeBSD_EXCLUDED_SOURCE_GDTOA = gdtoa/FreeBSD/machdep* gdtoa-strtopx.c FreeBSD_INCLUDED_SOURCE_FILE_NAMES_x86_64 = gdtoa-strtopx.c machdep_ldisx.c FreeBSD_INCLUDED_SOURCE_FILE_NAMES_i386 = $(FreeBSD_INCLUDED_SOURCE_FILE_NAMES_x86_64) FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7 = machdep_ldisd.c +FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7s = $(FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7) FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7k = $(FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7) FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7f = $(FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7) FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv6 = $(FreeBSD_INCLUDED_SOURCE_FILE_NAMES_armv7) @@ -90,6 +93,7 @@ BASE_EXCLUDED_SOURCE_FILE_NAMES = $(BASE_EXCLUDED_SOURCE_FILE_NAMES_$(CURRENT_AR BASE_EXCLUDED_SOURCE_FILE_NAMES_x86_64 = MKGetTimeBaseInfo.c bcmp.c context-stubs.c kvm.c memcmp.c memset.c memset_pattern.c nlist.c strcpy.c strlcat.c strlcpy.c strlen.c strncmp.c strncpy.c BASE_EXCLUDED_SOURCE_FILE_NAMES_i386 = bcmp.c context-stubs.c memcmp.c memset.c memset_pattern.c strcpy.c strlcat.c strlcpy.c strlen.c strncmp.c strncpy.c BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7 = bcmp.c memcmp.c memset.c memset_pattern.c strchr.c strlen.c strncmp.c strnlen.c strstr.c +BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7s = $(BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7) BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7k = $(BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7) BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7f = $(BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7) BASE_EXCLUDED_SOURCE_FILE_NAMES_armv6 = $(BASE_EXCLUDED_SOURCE_FILE_NAMES_armv7) diff --git a/xcodescripts/variants.xcconfig b/xcodescripts/variants.xcconfig index fd3480f..a83a6de 100644 --- a/xcodescripts/variants.xcconfig +++ b/xcodescripts/variants.xcconfig @@ -92,6 +92,7 @@ VARIANT_DYLD_INCLUDE_i386 = i386/gen/icacheinval.s i386/gen/cpu_number.s i386/pt VARIANT_DYLD_INCLUDE_armv7 = arm/gen/icacheinval.s arm/pthreads/pthread_getspecific.s arm/pthreads/pthread_self.s arm/pthreads/pthread_set_self.s arm/string/bcopy_Generic.s arm/string/bzero_Generic.s arm/string/ffs.s arm/string/strcmp.s arm/string/strlen.s arm/string/strnlen.s strncpy.c arm/sys/OSAtomic.c arm/sys/OSAtomicUP.c arm/sys/OSAtomic_resolvers.c arm/sys/Spinlocks.c arm/sys/SpinlocksUP.c arm/sys/SpinlocksWFE.c arm/sys/arm_commpage_gettimeofday.c arm/sys/mach_absolute_time.s +VARIANT_DYLD_INCLUDE_armv7s = $(VARIANT_DYLD_INCLUDE_armv7) VARIANT_DYLD_INCLUDE_armv7k = $(VARIANT_DYLD_INCLUDE_armv7) VARIANT_DYLD_INCLUDE_armv7f = $(VARIANT_DYLD_INCLUDE_armv7)