Merge pull request #4764 from WalterBright/D1merge

backend: so D1 works again
dlang · Jun 24, 2015 · 2fdfedb · 2fdfedb
2 parents 7cc840a + 2e8e597
commit 2fdfedb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/backend/cdeflnx.h b/src/backend/cdeflnx.h
@@ -14,7 +14,7 @@
 #define M_UNIX 1
 #define MEMMODELS 1
 #if __GNUC__
-#define __DMC__ 0
+//#define __DMC__ 0
 #define _MSC_VER 0
 #endif
 

diff --git a/src/backend/rtlsym.c b/src/backend/rtlsym.c
@@ -75,6 +75,9 @@ void rtlsym_init()
         tv->Tcount++;
 #endif
 
+        // Only used by dmd1 for RTLSYM_THROWC
+        type *tw = NULL;
+
 #undef SYMBOL_Z
 #define SYMBOL_Z(e, fl, saved, n, flags, ty)                                \
         if (ty) rtlsym[RTLSYM_##e]->Stype = (ty);                           \

diff --git a/src/backend/rtlsym.h b/src/backend/rtlsym.h
@@ -40,6 +40,7 @@
 
 #define RTLSYMS \
 \
+SYMBOL_MARS(THROW,           FLfunc,(mES | mBP),"_d_throw@4", SFLexit, tw) /* D1 only */ \
 SYMBOL_MARS(THROWC,          FLfunc,(mES | mBP),"_d_throwc", SFLexit, t) \
 SYMBOL_MARS(MONITOR_HANDLER, FLfunc,FREGSAVED,"_d_monitor_handler", 0, 0) \
 SYMBOL_MARS(MONITOR_PROLOG,  FLfunc,FREGSAVED,"_d_monitor_prolog",0,t) \