Merge pull request #5384 from WalterBright/rmNEWSTATICDTOR

remove NEWSTATICDTOR
dlang · Jan 31, 2016 · 22ee44c · 22ee44c
2 parents 84f6aaf + 2d4b699
commit 22ee44c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/src/backend/cdef.h b/src/backend/cdef.h
@@ -325,8 +325,6 @@ typedef long double longdouble;
 //      2: new style
 #define NTEXCEPTIONS            2
 
-#define NEWSTATICDTOR           1       // support new style static destructors
-
 // For Shared Code Base
 #if _WINDLL
 #define dbg_printf dll_printf

diff --git a/src/backend/cgobj.c b/src/backend/cgobj.c
@@ -1594,7 +1594,6 @@ void Obj::segment_group(targ_size_t codesize,targ_size_t datasize,
 #endif
 }
 
-//#if NEWSTATICDTOR
 
 /**************************************
  * Symbol is the function that calls the static constructors.
@@ -1676,7 +1675,6 @@ void Obj::staticdtor(Symbol *s)
     assert(0);
 }
 
-//#else
 
 /***************************************
  * Stuff pointer to function in its own segment.
@@ -1737,7 +1735,6 @@ void Obj::funcptr(Symbol *s)
     obj.lnameidx += 3;                  // for next time
 }
 
-//#endif
 
 /***************************************
  * Stuff pointer to function in its own segment.

diff --git a/src/backend/elfobj.c b/src/backend/elfobj.c
@@ -1529,8 +1529,6 @@ void Obj::compiler()
 }
 
 
-//#if NEWSTATICDTOR
-
 /**************************************
  * Symbol is the function that calls the static constructors.
  * Put a pointer to it into a special segment that the startup code
@@ -1575,8 +1573,6 @@ void Obj::staticdtor(Symbol *s)
     SegData[seg]->SDoffset += sz;
 }
 
-//#else
-
 /***************************************
  * Stuff pointer to function in its own segment.
  * Used for static ctor and dtor lists.
@@ -1587,7 +1583,6 @@ void Obj::funcptr(Symbol *s)
     //dbg_printf("Obj::funcptr(%s) \n",s->Sident);
 }
 
-//#endif
 
 /***************************************
  * Stuff the following data in a separate segment:

diff --git a/src/backend/machobj.c b/src/backend/machobj.c
@@ -1515,7 +1515,6 @@ void Obj::compiler()
     //dbg_printf("Obj::compiler\n");
 }
 
-//#if NEWSTATICDTOR
 
 /**************************************
  * Symbol is the function that calls the static constructors.
@@ -1576,7 +1575,6 @@ void Obj::staticdtor(Symbol *s)
 #endif
 }
 
-//#else
 
 /***************************************
  * Stuff pointer to function in its own segment.
@@ -1588,7 +1586,6 @@ void Obj::funcptr(Symbol *s)
     //dbg_printf("Obj::funcptr(%s) \n",s->Sident);
 }
 
-//#endif
 
 /***************************************
  * Stuff the following data (instance of struct FuncTable) in a separate segment:

diff --git a/src/backend/mscoffobj.c b/src/backend/mscoffobj.c
@@ -1246,8 +1246,6 @@ void MsCoffObj::compiler()
     //dbg_printf("MsCoffObj::compiler\n");
 }
 
-//#if NEWSTATICDTOR
-
 /**************************************
  * Symbol is the function that calls the static constructors.
  * Put a pointer to it into a special segment that the startup code
@@ -1307,7 +1305,6 @@ void MsCoffObj::staticdtor(Symbol *s)
 #endif
 }
 
-//#else
 
 /***************************************
  * Stuff pointer to function in its own segment.
@@ -1319,7 +1316,6 @@ void MsCoffObj::funcptr(Symbol *s)
     //dbg_printf("MsCoffObj::funcptr(%s) \n",s->Sident);
 }
 
-//#endif
 
 /***************************************
  * Stuff the following data (instance of struct FuncTable) in a separate segment:

diff --git a/src/backend/out.c b/src/backend/out.c
@@ -977,11 +977,7 @@ STATIC void writefunc2(symbol *sfunc)
 
 #if SCPP
     /* If function is _STIxxxx, add in the auto destructors             */
-#if NEWSTATICDTOR
     if (cpp_stidtors && memcmp("__SI",sfunc->Sident,4) == 0)
-#else
-    if (cpp_stidtors && memcmp("_STI",sfunc->Sident,4) == 0)
-#endif
     {   list_t el;
 
         assert(startblock->Bnext == NULL);