Merge pull request #93 from alexrp/master

Don't abuse X86 and X86_64 to make bitness-based decisions; use D_LP64 instead.
dlang · Dec 1, 2011 · 70f5abd · ibuclaw · Dec 2, 2011 · 70f5abd
2 parents 29f33bf + 5712165
commit 70f5abd
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/src/core/stdc/inttypes.d b/src/core/stdc/inttypes.d
@@ -192,7 +192,7 @@ enum _cstr SCNxFAST16       = "x";
 enum _cstr SCNxFAST32       = "lx";
 enum _cstr SCNxFAST64       = "llx";
 
-version( X86_64 )
+version( D_LP64 )
 {
     enum _cstr PRIdMAX      = PRId64;
     enum _cstr PRIiMAX      = PRIi64;

diff --git a/src/core/stdc/stdint.d b/src/core/stdc/stdint.d
@@ -60,7 +60,7 @@ alias uint      uint_fast16_t;
 alias uint      uint_fast32_t;
 alias ulong     uint_fast64_t;
 
-version( X86_64 )
+version( D_LP64 )
 {
     alias long  intptr_t;
     alias ulong uintptr_t;

diff --git a/src/core/sys/posix/sys/types.d b/src/core/sys/posix/sys/types.d
@@ -169,28 +169,28 @@ pthread_t
 
 version( linux )
 {
-    version(X86)
+    version(D_LP64)
     {
-        enum __SIZEOF_PTHREAD_ATTR_T = 36;
-        enum __SIZEOF_PTHREAD_MUTEX_T = 24;
+        enum __SIZEOF_PTHREAD_ATTR_T = 56;
+        enum __SIZEOF_PTHREAD_MUTEX_T = 40;
         enum __SIZEOF_PTHREAD_MUTEXATTR_T = 4;
         enum __SIZEOF_PTHREAD_COND_T = 48;
         enum __SIZEOF_PTHREAD_CONDATTR_T = 4;
-        enum __SIZEOF_PTHREAD_RWLOCK_T = 32;
+        enum __SIZEOF_PTHREAD_RWLOCK_T = 56;
         enum __SIZEOF_PTHREAD_RWLOCKATTR_T = 8;
-        enum __SIZEOF_PTHREAD_BARRIER_T = 20;
+        enum __SIZEOF_PTHREAD_BARRIER_T = 32;
         enum __SIZEOF_PTHREAD_BARRIERATTR_T = 4;
     }
-    else version(X86_64)
+    else
     {
-        enum __SIZEOF_PTHREAD_ATTR_T = 56;
-        enum __SIZEOF_PTHREAD_MUTEX_T = 40;
+        enum __SIZEOF_PTHREAD_ATTR_T = 36;
+        enum __SIZEOF_PTHREAD_MUTEX_T = 24;
         enum __SIZEOF_PTHREAD_MUTEXATTR_T = 4;
         enum __SIZEOF_PTHREAD_COND_T = 48;
         enum __SIZEOF_PTHREAD_CONDATTR_T = 4;
-        enum __SIZEOF_PTHREAD_RWLOCK_T = 56;
+        enum __SIZEOF_PTHREAD_RWLOCK_T = 32;
         enum __SIZEOF_PTHREAD_RWLOCKATTR_T = 8;
-        enum __SIZEOF_PTHREAD_BARRIER_T = 32;
+        enum __SIZEOF_PTHREAD_BARRIER_T = 20;
         enum __SIZEOF_PTHREAD_BARRIERATTR_T = 4;
     }
 
@@ -254,7 +254,7 @@ version( linux )
 }
 else version( OSX )
 {
-    version( X86_64 )
+    version( D_LP64 )
     {
         enum __PTHREAD_SIZE__               = 1168;
         enum __PTHREAD_ATTR_SIZE__          = 56;
@@ -266,7 +266,7 @@ else version( OSX )
         enum __PTHREAD_RWLOCK_SIZE__        = 192;
         enum __PTHREAD_RWLOCKATTR_SIZE__    = 16;
     }
-    else version( X86 )
+    else
     {
         enum __PTHREAD_SIZE__               = 596;
         enum __PTHREAD_ATTR_SIZE__          = 36;

diff --git a/src/object_.d b/src/object_.d
@@ -42,7 +42,7 @@ private
 //alias typeof(int.sizeof)                    size_t;
 //alias typeof(cast(void*)0 - cast(void*)0)   ptrdiff_t;
 
-version(X86_64)
+version(D_LP64)
 {
     alias ulong size_t;
     alias long  ptrdiff_t;

diff --git a/src/rt/aaA.d b/src/rt/aaA.d
@@ -104,7 +104,7 @@ struct AA
 
 size_t aligntsize(size_t tsize)
 {
-    version (X86_64)
+    version (D_LP64)
         // Size of key needed to align value on 16 bytes
         return (tsize + 15) & ~(15);
     else

diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -213,12 +213,12 @@ extern (C)
 extern (C) void _d_hidden_func()
 {
     Object o;
-    version(X86)
+    version(D_InlineAsm_X86)
         asm
         {
             mov o, EAX;
         }
-    else version(X86_64)
+    else version(D_InlineAsm_X86_64)
         asm
         {
             mov o, RDI;

diff --git a/src/rt/memset.d b/src/rt/memset.d
@@ -33,7 +33,7 @@ short *_memset16(short *p, short value, size_t count)
 
 int *_memset32(int *p, int value, size_t count)
 {
-version (X86)
+version (D_InlineAsm_X86)
 {
     asm
     {