Backed out 2 changesets (bug 1410148) for bustage failures on python\mozbuild\mozbuild\test\configure\lint.py r=backout a=backout on a CLOSED TREE

Backed out changeset f77f58a060ad (bug 1410148)
Backed out changeset 593515920c7e (bug 1410148)

build/build-clang/clang-3.9-linux64.json

@@ -18,7 +18,6 @@
       "llvm-debug-frame.patch",
       "r277806.patch",
       "r285657.patch",
-      "r289565-for-3.9.patch",
-      "r313872.patch"
+      "r313872-for-3.9.patch"
     ]
 }

build/build-clang/r313872-for-3.9.patch

@@ -0,0 +1,17 @@
+--- a/llvm/tools/dsymutil/DwarfLinker.cpp
++++ b/llvm/tools/dsymutil/DwarfLinker.cpp
+@@ -1489,8 +1489,12 @@
+   uint64_t RefOffset = *RefValue.getAsReference(&Unit);
+ 
+   if ((RefCU = getUnitForOffset(Units, RefOffset)))
+-    if (const auto *RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset))
+-      return RefDie;
++    if (const auto *RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset)) {
++      // In a file with broken references, an attribute might point to a NULL
++      // DIE.
++      if(!RefDie->isNULL())
++        return RefDie;
++    }
+ 
+   Linker.reportWarning("could not find referenced DIE", &Unit, &DIE);
+   return nullptr;

build/build-clang/r313872.patch

@@ -2,7 +2,8 @@ Index: tools/dsymutil/DwarfLinker.cpp
 ===================================================================
 --- a/llvm/tools/dsymutil/DwarfLinker.cpp	(revision 313871)
 +++ b/llvm/tools/dsymutil/DwarfLinker.cpp	(revision 313872)
-@@ -1496,7 +1496,11 @@
+@@ -1495,8 +1495,12 @@
+   uint64_t RefOffset = *RefValue.getAsReference();
  
    if ((RefCU = getUnitForOffset(Units, RefOffset)))
 -    if (const auto RefDie = RefCU->getOrigUnit().getDIEForOffset(RefOffset))

build/moz.configure/toolchain.configure

@@ -1371,7 +1371,11 @@ def rust_compiler_flags(opt_level_option, debug_rust, debug_symbols,
         debug_assertions = False
 
     if debug_symbols:
-        debug_info = '2'
+        if host.kernel == 'Linux' and target.kernel == 'Darwin':
+            # hack to work around dsymutil failing on cross-OSX builds (bug 1410148)
+            debug_info = '0'
+        else:
+            debug_info = '2'
 
     opts = []