Changeset 502

Timestamp:

01/11/11 05:54:11 (14 years ago)

Author:

braddr

Message:

Fix rt/dmain2 to properly declare one missing symbol (probably visible due to bug 314 while building the whole library but not when building the unittest.
Start building druntime with -O on 64 bit, everything passes now

Files:

• trunk/posix.mak (modified) (2 diffs)
• trunk/src/rt/dmain2.d (modified) (1 diff)

trunk/posix.mak

@@ -1 +1 @@
-
-DMD=dmd
-
-DOCDIR=doc
-IMPDIR=import
-
-MODEL=32
-
-ifeq ($(MODEL),64)
-DFLAGS=-m$(MODEL) -release -inline -nofloat -w -d -Isrc -Iimport
-UDFLAGS=-m$(MODEL) -release -nofloat -w -d -Isrc -Iimport
-
-CFLAGS=-m$(MODEL)
-else
-DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport 
-UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport 
-
-CFLAGS=-m$(MODEL) -O
-endif
-
-OBJDIR=obj
-DRUNTIME_BASE=druntime
-DRUNTIME=lib/lib$(DRUNTIME_BASE).a
-
-DOCFMT=
-
-target : import $(DRUNTIME) doc
-
-_MISSING_FROM_MANIFEST = \
@@ -395 +388 @@
-
-################### Library generation #########################
-
-$(DRUNTIME): $(OBJS) $(SRCS) win32.mak
-    $(DMD) -lib -of$(DRUNTIME) -Xfdruntime.json $(DFLAGS) $(SRCS) $(OBJS)
-
-unittest : $(addprefix $(OBJDIR)/,$(SRC_D_MODULES)) $(DRUNTIME) $(OBJDIR)/emptymain.d
-    @echo done
-
-ifeq ($(MODEL),64)
-
-
+
-else
-
-
+
-endif
-
-$(addprefix $(OBJDIR)/,$(DISABLED_TESTS)) :
-    @echo $@ - disabled
-
-$(OBJDIR)/% : src/%.d $(DRUNTIME) $(OBJDIR)/emptymain.d
-    @echo Testing $@
-    @$(DMD) $(UDFLAGS) -unittest -of$@ $(OBJDIR)/emptymain.d $< -L-Llib -debuglib=$(DRUNTIME_BASE) -defaultlib=$(DRUNTIME_BASE)
-# make the file very old so it builds and runs again if it fails
-    @touch -t 197001230123 $@

trunk/src/rt/dmain2.d

@@ -50 +50 @@
-        
-        if (t !is null)
-        {
-            if (cast(byte*) t is t.classinfo.init.ptr)
-                return;
-            if (t !is _d_unhandled)
-                t.next = _d_unhandled;
-        }
-        _d_unhandled = t;
-    }
-
+
+
+
-    extern (C) void _d_createTrace(Object *o)
-    {
-        auto t = cast(Throwable) o;
-
-        if (t !is null && t.info is null &&
-            cast(byte*) t !is t.classinfo.init.ptr)
-        {
-            t.info = _d_traceContext();
-        }
-    }