Libc-825.25.tar.gz

diff --git a/i386/string/bcopy_sse2.s b/i386/string/bcopy_sse2.s
index 4987c5e468a7c49d3d523520b5bcead6c193ecb5..4e001b7ef8f53a16b5cce2e62ab5142af1ff2595 100644 (file)
--- 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 6d03019250fcb958356fa9dee24578ffe006702b..2b3bdb8032899b4b947bdda4f6ed36162ee9e4a5 100644 (file)
--- 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 453219a79be5d4f262bee8b999845d4f8603baf4..e0101c18ad42b1a75d1cf239edbbc13825e4a5ec 100644 (file)
--- 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: /* <rdar://problem/10288022> */

diff --git a/x86_64/string/bzero_sse2.s b/x86_64/string/bzero_sse2.s
index 3d7d596c915d8a1753131bc213cae1abc8bb8a07..fe94d282753f1cb1c85d27d8613d82d70f49aa2c 100644 (file)
--- 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 ac40d926e59c1b9abead88798ae6524402f5c815..ba089eb1012b1c0122b15bdc8866f458f9cea61f 100644 (file)
--- 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 fd3480f85b0ad09aeb643c1ca5b6e89ae76a60e1..a83a6de4f0aacfeea52fcc562c4fc60f58911fde 100644 (file)
--- 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)