Merge pull request #67 from braddr/freebsd64

Initial freebsd/64 patches
dlang · May 14, 2011 · 7d29ebf · 7d29ebf
2 parents 95229fe + 3160a52
commit 7d29ebf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/backend/os.c b/src/backend/os.c
@@ -867,19 +867,19 @@ int os_critsecsize64()
 }
 #endif
 
-#if linux
+#if linux || __FreeBSD__
 int os_critsecsize32()
 {
-    return 24;  // sizeof(pthread_mutex_t)
+    return sizeof(pthread_mutex_t);
 }
 
 int os_critsecsize64()
 {
-    return 40;
+    return sizeof(pthread_mutex_t);
 }
 #endif
 
-#if __APPLE__ || __FreeBSD__ || __sun&&__SVR4
+#if __APPLE__ || __sun&&__SVR4
 int os_critsecsize32()
 {
     return sizeof(pthread_mutex_t);

diff --git a/test/Makefile b/test/Makefile
@@ -98,6 +98,10 @@ DISABLED_TESTS += builtin
 
 DISABLED_TESTS += dhry
 # runnable/dhry.d(488): Error: undefined identifier dtime
+
+# 64 bit test failures
+DISABLED_TESTS += test17
+DISABLED_SH_TESTS += test39
 endif
 
 runnable_tests=$(wildcard runnable/*.d) $(wildcard runnable/*.html) $(wildcard runnable/*.sh)
@@ -114,6 +118,9 @@ all: run_tests
 $(addsuffix .d.out,$(addprefix $(RESULTS_DIR)/runnable/,$(DISABLED_TESTS))): $(RESULTS_DIR)/.created
 	$(QUIET) echo " ... $@ - disabled"
 
+$(addsuffix .sh.out,$(addprefix $(RESULTS_DIR)/runnable/,$(DISABLED_SH_TESTS))): $(RESULTS_DIR)/.created
+	$(QUIET) echo " ... $@ - disabled"
+
 $(RESULTS_DIR)/runnable/%.d.out: runnable/%.d $(RESULTS_DIR)/.created $(RESULTS_DIR)/d_do_test $(DMD)
 	$(QUIET) ./$(RESULTS_DIR)/d_do_test $(<D) $* d
 

diff --git a/test/d_do_test.d b/test/d_do_test.d
@@ -100,18 +100,7 @@ void gatherTestParameters(ref TestArgs testArgs, string input_dir, string input_
         testArgs.requiredArgs ~= " ";
     }
 
-    // TODO: should the win32 anti -fPIC code be moved out and made unilateral, would eliminate
-    // different ARGS settings in the Makefile
-    if (findTestParameter(file, "PERMUTE_ARGS", testArgs.permuteArgs))
-    {
-        if (envData.os == "win32")
-        {
-            auto index = std.string.indexOf(testArgs.permuteArgs, "-fPIC");
-            if (index != -1)
-                testArgs.permuteArgs = testArgs.permuteArgs[0 .. index] ~ testArgs.permuteArgs[index+5 .. $];
-        }
-    }
-    else
+    if (! findTestParameter(file, "PERMUTE_ARGS", testArgs.permuteArgs))
     {
         if (testArgs.mode != TestMode.FAIL_COMPILE)
             testArgs.permuteArgs = envData.all_args;
@@ -120,6 +109,15 @@ void gatherTestParameters(ref TestArgs testArgs, string input_dir, string input_
         if(!findTestParameter(file, "unittest", unittestJunk))
             testArgs.permuteArgs = replace(testArgs.permuteArgs, "-unittest", "");
     }
+
+    // win32 doesn't support pic, nor does freebsd/64 currently
+    if (envData.os == "win32" || envData.os == "freebsd")
+    {
+        auto index = std.string.indexOf(testArgs.permuteArgs, "-fPIC");
+        if (index != -1)
+            testArgs.permuteArgs = testArgs.permuteArgs[0 .. index] ~ testArgs.permuteArgs[index+5 .. $];
+    }
+
     // clean up extra spaces
     testArgs.permuteArgs = replace(testArgs.permuteArgs, "  ", " ");