Merge branch 'master' into 7995

Conflicts: src/rt/dmain2.d
dlang · May 10, 2012 · 35d26e8 · 35d26e8
2 parents 714e86f + daac568
commit 35d26e8
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 211 deletions.
diff --git a/posix.mak b/posix.mak
@@ -62,7 +62,6 @@ MANIFEST= \
 	src/core/simd.d \
 	src/core/thread.d \
 	src/core/thread.di \
-	src/core/threadasm.S \
 	src/core/time.d \
 	src/core/vararg.d \
 	\
@@ -379,7 +378,7 @@ SRC_D_MODULES = \
 # NOTE: a pre-compiled minit.obj has been provided in dmd for Win32 and
 #       minit.asm is not used by dmd for Linux
 
-OBJS= $(OBJDIR)/errno_c.o $(OBJDIR)/threadasm.o $(OBJDIR)/complex.o
+OBJS= $(OBJDIR)/errno_c.o $(OBJDIR)/complex.o
 
 DOCS=\
 	$(DOCDIR)/object.html \
@@ -542,10 +541,6 @@ $(OBJDIR)/errno_c.o : src/core/stdc/errno.c
 	@mkdir -p $(OBJDIR)
 	$(CC) -c $(CFLAGS) $< -o$@
 
-$(OBJDIR)/threadasm.o : src/core/threadasm.S
-	@mkdir -p $(OBJDIR)
-	$(CC) -Wa,-noexecstack -c $(CFLAGS) $< -o$@
-
 ################### Library generation #########################
 
 $(DRUNTIME): $(OBJS) $(SRCS) win32.mak

diff --git a/src/core/math.d b/src/core/math.d
@@ -25,10 +25,6 @@
  */
 module core.math;
 
-version(LDC) {
-    public import ldc.intrinsics;
-}
-
 public:
 
 /***********************************

diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -17,8 +17,6 @@ module core.runtime;
 
 private
 {
-    extern (C) bool rt_isHalting();
-
     alias bool function() ModuleUnitTester;
     alias bool function(Object) CollectHandler;
     alias Throwable.TraceInfo function( void* ptr ) TraceHandler;
@@ -136,20 +134,6 @@ struct Runtime
     }
 
 
-    /**
-     * Returns true if the runtime is halting.  Under normal circumstances,
-     * this will be set between the time that normal application code has
-     * exited and before module dtors are called.
-     *
-     * Returns:
-     *  true if the runtime is halting.
-     */
-    deprecated static @property bool isHalting()
-    {
-        return rt_isHalting();
-    }
-
-
     /**
      * Returns the arguments supplied when the process was started.
      *

diff --git a/src/core/thread.d b/src/core/thread.d
@@ -1267,9 +1267,6 @@ class Thread
     ///////////////////////////////////////////////////////////////////////////
 
 
-    deprecated alias thread_findByAddr findThread;
-
-
 private:
     //
     // Initializes a thread object which has no associated executable function.
@@ -2049,22 +2046,6 @@ version( Windows )
         thisThread.m_tlsgcdata = rt.tlsgc.init();
         return thisThread;
     }
-
-
-    /// This should be handled automatically by thread_attach.
-    deprecated extern (C) void thread_setNeedLock( bool need ) nothrow
-    {
-        if( need )
-            multiThreadedFlag = true;
-    }
-
-
-    /// Renamed to be more consistent with other extern (C) routines.
-    deprecated alias thread_attachByAddr thread_attach;
-
-
-    /// ditto
-    deprecated alias thread_detachByAddr thread_detach;
 }
 
 

diff --git a/src/core/thread.di b/src/core/thread.di
@@ -405,9 +405,6 @@ class Thread
     ///////////////////////////////////////////////////////////////////////////
 
 
-    deprecated alias thread_findByAddr findThread;
-
-
 private:
     //
     // Standard types
@@ -489,15 +486,6 @@ version( Windows )
 
     /// ditto
     extern (C) Thread thread_attachByAddrB( Thread.ThreadAddr addr, void* bstack );
-
-    /// This should be handled automatically by thread_attach.
-    deprecated extern (C) void thread_setNeedLock( bool need ) nothrow;
-
-    /// Renamed to be more consistent with other extern (C) routines.
-    deprecated alias thread_attachByAddr thread_attach;
-
-    /// ditto
-    deprecated alias thread_detachByAddr thread_detach;
 }
 
 

diff --git a/src/core/threadasm.S b/src/core/threadasm.S
diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -236,13 +236,6 @@ extern (C) void _d_hidden_func()
     onHiddenFuncError(o);
 }
 
-shared bool _d_isHalting = false;
-
-extern (C) bool rt_isHalting()
-{
-    return _d_isHalting;
-}
-
 __gshared string[] _d_args = null;
 
 extern (C) string[] rt_args()
@@ -355,7 +348,6 @@ extern (C) bool rt_term(ExceptionHandler dg = null)
     {
         rt_moduleTlsDtor();
         thread_joinAll();
-        _d_isHalting = true;
         rt_moduleDtor();
         gc_term();
         return result = true;

diff --git a/win32.mak b/win32.mak
@@ -41,7 +41,6 @@ MANIFEST= \
 	src\core\simd.d \
 	src\core\thread.d \
 	src\core\thread.di \
-	src\core\threadasm.S \
 	src\core\time.d \
 	src\core\vararg.d \
 	\