Changeset 637:29dc68c949b0

Timestamp:

10/01/08 21:25:46 (2 months ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Applied the FreeBSD patch from Ralith, closes ticket #95 , slightly changed but basically the same. Thanx Ralith :)

Files:

• dmd/constfold.c (modified) (2 diffs)
• dmd/mars.c (modified) (2 diffs)
• dmd/mars.h (modified) (1 diff)
• gen/linker.cpp (modified) (1 diff)
• gen/tollvm.cpp (modified) (1 diff)
• runtime/internal/critical.c (modified) (1 diff)
• tests/runtest (modified) (1 diff)

dmd/constfold.c

@@ -488 +488 @@
-#elif defined(IN_GCC)
-        c = complex_t(e1->toReal() % r2, e1->toImaginary() % r2);
+#elif defined(__FreeBSD__) && __FreeBSD_version < 800000
+        // freebsd is kinda messed up. the STABLE branch doesn't support C99's fmodl !?!
+        c = complex_t(fmod(e1->toReal(), r2), fmod(e1->toImaginary(), r2));
-#else
-        c = complex_t(fmodl(e1->toReal(), r2), fmodl(e1->toImaginary(), r2));
@@ -499 +502 @@
-#elif defined(IN_GCC)
-        c = complex_t(e1->toReal() % i2, e1->toImaginary() % i2);
+#elif defined(__FreeBSD__) && __FreeBSD_version < 800000
+        // freebsd is kinda messed up. the STABLE branch doesn't support C99's fmodl !?!
+        c = complex_t(fmod(e1->toReal(), i2), fmod(e1->toImaginary(), i2));
-#else
-        c = complex_t(fmodl(e1->toReal(), i2), fmodl(e1->toImaginary(), i2));

dmd/mars.c

@@ -331 +331 @@
-#elif __APPLE__
-    global.params.os = OSMacOSX;
+#elif __FreeBSD__
+    global.params.os = OSFreeBSD;
-#else
-
+ Unsupported OS
-#endif /* linux */
-
@@ -844 +846 @@
-    break;
-
+    case OSFreeBSD:
+    VersionCondition::addPredefinedGlobalIdent("freebsd");
+    VersionCondition::addPredefinedGlobalIdent("Posix");
+    break;
+
-    default:
-    assert(false && "Target OS not supported");

dmd/mars.h

@@ -53 +53 @@
-    OSLinux,
-    OSWindows,
-
+
+
-};
-

gen/linker.cpp

@@ -152 +152 @@
-
-    // default libs
-
-
+
+
+
+
+
-        args.push_back("-lpthread");
-        args.push_back("-ldl");
-        args.push_back("-lm");
-}
-
-{
+    break;
+
+case OSWindows:
-        // FIXME: I'd assume kernel32 etc
+        break;
-    }
-

gen/tollvm.cpp

@@ -705 +705 @@
-    }
-
+    // FreeBSD
+    else if (global.params.os == OSFreeBSD) {
+        // Just a pointer
+        return LLStructType::get(DtoSize_t(), 0);
+    }
+
-    // pthread_fastlock
-    std::vector<const LLType*> types2;

runtime/internal/critical.c

@@ -76 +76 @@
-/* ================================= linux ============================ */
-
-
+ || __FreeBSD__
-
-#include    <stdio.h>

tests/runtest

@@ -1 @@
-ba
+
-
-# check for command line arguments