Revert "Disable szclass 12 for i686 systems. (#19647)"

This reverts commit 5f5c6bb.
JuliaLang · Jun 2, 2017 · 6fb40af · 6fb40af
1 parent 9728bc7
commit 6fb40af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -136,12 +136,9 @@ void *jl_gc_perm_alloc(size_t sz, int zero, unsigned align, unsigned offset);
 static const int jl_gc_sizeclasses[JL_GC_N_POOLS] = {
 #ifdef _P64
     8,
-#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
+#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
     // ARM and PowerPC have max alignment of 8,
     // make sure allocation of size 8 has that alignment.
-    // for x86 alignment is important for atomic ops and
-    // the corresponding platform ABI. Once we can use
-    // libatomic on Windows this is no longer necessary.
     4, 8,
 #else
     4, 8, 12,
@@ -177,7 +174,7 @@ STATIC_INLINE int jl_gc_alignment(size_t sz)
 #ifdef _P64
     (void)sz;
     return 16;
-#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
+#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
     return sz <= 4 ? 8 : 16;
 #else
     // szclass 8
@@ -198,7 +195,7 @@ STATIC_INLINE int JL_CONST_FUNC jl_gc_szclass(size_t sz)
     if (sz <=    8)
         return 0;
     const int N = 0;
-#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
+#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
     if (sz <=    8)
         return (sz + 3) / 4 - 1;
     const int N = 1;

diff --git a/src/julia_threads.h b/src/julia_threads.h
@@ -62,7 +62,7 @@ typedef struct {
     // variables for allocating objects from pools
 #ifdef _P64
 #  define JL_GC_N_POOLS 41
-#elif defined(_CPU_ARM_) || defined(_CPU_PPC_) || defined(_CPU_X86_)
+#elif defined(_CPU_ARM_) || defined(_CPU_PPC_)
 #  define JL_GC_N_POOLS 42
 #else
 #  define JL_GC_N_POOLS 43