Merge pull request #6789 from zachthemystic/cherrypick-PR6721-issue17…

…289-to-stable move fix Issue 17289 - With Xcode 8.3 linker... to stable
dlang · May 23, 2017 · b2a7822 · b2a7822
2 parents 6c72a7b + 9adb8d6
commit b2a7822
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/ddmd/backend/machobj.c b/src/ddmd/backend/machobj.c
@@ -1814,6 +1814,7 @@ int Obj::comdat(Symbol *s)
         segname = "__DATA";
         align = 4;              // 16 byte alignment
         s->Sseg = MachObj::getsegment(sectname, segname, align, S_COALESCED);
+        Obj::data_start(s, 1 << align, s->Sseg);
     }
                                 // find or create new segment
     if (s->Salignment > (1 << align))

diff --git a/src/ddmd/declaration.d b/src/ddmd/declaration.d
@@ -1131,7 +1131,7 @@ extern (C++) class VarDeclaration : Declaration
             if (needctfe)
                 sc = sc.startCTFE();
 
-            //printf("inferring type for %s with init %s\n", toChars(), init.toChars());
+            //printf("inferring type for %s with init %s\n", toChars(), _init.toChars());
             _init = _init.inferType(sc);
             type = _init.toExpression().type;
             if (needctfe)
@@ -2467,6 +2467,7 @@ extern (C++) class TypeInfoDeclaration : VarDeclaration
         storage_class = STCstatic | STCgshared;
         protection = Prot(PROTpublic);
         linkage = LINKc;
+        alignment = Target.ptrsize;
     }
 
     static TypeInfoDeclaration create(Type tinfo)