Changeset 872:aa953cc960b6

Timestamp:

01/04/09 09:49:28 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Apply BlueZeniX's patch for OpenSolaris? compatibility. Fixes #158.

Files:

• dmd/array.c (modified) (1 diff)
• dmd/inifile.c (modified) (1 diff)
• dmd/lexer.c (modified) (1 diff)
• dmd/mars.c (modified) (3 diffs)
• dmd/mars.h (modified) (1 diff)
• dmd/module.c (modified) (1 diff)
• dmd/mtype.c (modified) (1 diff)
• dmd/root.c (modified) (1 diff)
• runtime/internal/critical.c (modified) (1 diff)
• runtime/internal/eh.d (modified) (1 diff)
• runtime/internal/memory.d (modified) (2 diffs)
• runtime/internal/monitor.c (modified) (1 diff)

dmd/array.c

@@ -14 +14 @@
-#include <assert.h>
-
+#if (defined (__SVR4) && defined (__sun)) 
+#include <alloca.h>
+#endif
+
-#if _MSC_VER || __MINGW32__
-#include <malloc.h>

dmd/inifile.c

@@ -10 +10 @@
-#include    <stdlib.h>
-#include    <ctype.h>
+
+#if (defined (__SVR4) && defined (__sun))
+#include <alloca.h>
+#endif
-
-#include    "root.h"

dmd/lexer.c

@@ -8 +8 @@
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
+
+#define __C99FEATURES__ 1
-
-/* Lexical Analyzer */

dmd/mars.c

@@ -339 +339 @@
-#elif __FreeBSD__
-    global.params.os = OSFreeBSD;
+#elif defined (__SVR4) && defined (__sun)
+    global.params.os = OSSolaris;
-#else
-
+ 
-#endif /* linux */
-
@@ -695 +697 @@
-            else if(strcmp(p + 2, "FreeBSD") == 0)
-                global.params.os = OSFreeBSD;
+            else if(strcmp(p + 2, "Solaris") == 0)
+                global.params.os = OSSolaris;
-            else
-                error("unrecognized target os '%s'", p + 2);
@@ -930 +934 @@
-    break;
-
+    case OSSolaris:
+    VersionCondition::addPredefinedGlobalIdent("solaris");
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    break;
+
-    default:
-    assert(false && "Target OS not supported");

dmd/mars.h

@@ -62 +62 @@
-    OSWindows,
-    OSMacOSX,
-
+
+
-};
-

dmd/module.c

@@ -12 +12 @@
-#include <stdlib.h>
-#include <assert.h>
+
+#if (defined (__SVR4) && defined (__sun))
+#include <alloca.h>
+#endif
-
-#if _MSC_VER || __MINGW32__

dmd/mtype.c

@@ -9 +9 @@
-// See the included readme.txt for details.
-
+#define __C99FEATURES__ 1   // Needed on Solaris for NaN and more
-#define __USE_ISOC99 1      // so signbit() gets defined
+
+#if (defined (__SVR4) && defined (__sun))
+#include <alloca.h>
+#endif
+
-#include <math.h>
-

dmd/root.c

@@ -14 +14 @@
-#include <stdint.h>
-#include <assert.h>
+
+#if (defined (__SVR4) && defined (__sun))
+#include <alloca.h>
+#endif
-
-#if _MSC_VER ||__MINGW32__

runtime/internal/critical.c

@@ -76 +76 @@
-/* ================================= linux ============================ */
-
-
+ || (defined(__SVR4) && defined (__sun))
-
-#include    <stdio.h>

runtime/internal/eh.d

@@ -15 +15 @@
-    version(linux) version=X86_UNWIND;
-    version(darwin) version=X86_UNWIND;
+    version(solaris) version=X86_UNWIND;
-}
-version(X86_64) {
-    version(linux) version=X86_UNWIND;
+    version(solaris) version=X86_UNWIND;
-}
-

runtime/internal/memory.d

@@ -74 +74 @@
- *
- */
+
+version( solaris ) {    
+    version(X86_64) {
+        extern (C) void* _userlimit;
+    }
+}
+
-extern (C) void* rt_stackBottom()
-{
@@ -110 +117 @@
-        // darwin has a fixed stack bottom
-        return cast(void*) 0xc0000000;
+    }
+    else version( solaris )
+    {
+        version(X86_64) {
+            return _userlimit;
+        }
+        else {
+            // <sys/vmparam.h>
+            return cast(void*) 0x8048000;
+        }
-    }
-    else

runtime/internal/monitor.c

@@ -13 +13 @@
-
-#if _WIN32
-
+ || (defined (__SVR4) && defined (__sun))
-#define USE_PTHREADS    1
-#else