Bug 1487603 - Update llvm-dsymutil to 7rc2. r=dmajor,firefox-build-system-reviewers

Last time it was updated is bug 1436208, and the crashes we patched it
for back then has been fixed upstream a few months later.

For some reason, they renamed the executable from llvm-dsymutil to
dsymutil.

Differential Revision: https://phabricator.services.mozilla.com/D4741

--HG--
extra : moz-landing-system : lando

build/macosx/cross-mozconfig.common

@@ -32,7 +32,7 @@ export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
 export BINDGEN_CFLAGS="$FLAGS"
 export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-
 export DSYMUTIL=$topsrcdir/build/macosx/llvm-dsymutil
-mk_add_options "export REAL_DSYMUTIL=$topsrcdir/llvm-dsymutil/bin/llvm-dsymutil"
+mk_add_options "export REAL_DSYMUTIL=$topsrcdir/llvm-dsymutil/bin/dsymutil"
 export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
 export DMG_TOOL=$topsrcdir/dmg/dmg
 export HFS_TOOL=$topsrcdir/dmg/hfsplus

taskcluster/scripts/misc/build-llvm-dsymutil.sh

@@ -14,39 +14,7 @@ cd $HOME_DIR/src
 git clone -n https://github.com/llvm-mirror/llvm
 
 cd llvm
-git checkout 4727bc748a48e46824eae55a81ae890cd25c3a34
-
-patch -p1 <<'EOF'
-diff --git a/lib/DebugInfo/DWARF/DWARFDie.cpp b/lib/DebugInfo/DWARF/DWARFDie.cpp
-index 17559d2..b08a8d9 100644
---- a/lib/DebugInfo/DWARF/DWARFDie.cpp
-+++ b/lib/DebugInfo/DWARF/DWARFDie.cpp
-@@ -304,20 +304,24 @@ DWARFDie::find(ArrayRef<dwarf::Attribute> Attrs) const {
- 
- Optional<DWARFFormValue>
- DWARFDie::findRecursively(ArrayRef<dwarf::Attribute> Attrs) const {
-   if (!isValid())
-     return None;
-   if (auto Value = find(Attrs))
-     return Value;
-   if (auto Die = getAttributeValueAsReferencedDie(DW_AT_abstract_origin)) {
-+    if (Die.getOffset() == getOffset())
-+      return None;
-     if (auto Value = Die.findRecursively(Attrs))
-       return Value;
-   }
-   if (auto Die = getAttributeValueAsReferencedDie(DW_AT_specification)) {
-+    if (Die.getOffset() == getOffset())
-+      return None;
-     if (auto Value = Die.findRecursively(Attrs))
-       return Value;
-   }
-   return None;
- }
- 
- DWARFDie
- DWARFDie::getAttributeValueAsReferencedDie(dwarf::Attribute Attr) const {
-EOF
+git checkout 9df0977d9409b093156ebbd8e1ac99bc32b9eb39
 
 mkdir build
 cd build
@@ -60,9 +28,9 @@ cmake \
 
 export LD_LIBRARY_PATH=$HOME_DIR/src/gcc/lib64
 
-ninja llvm-dsymutil llvm-symbolizer
+ninja dsymutil llvm-symbolizer
 
-tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/llvm-dsymutil bin/llvm-symbolizer
+tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/dsymutil bin/llvm-symbolizer
 
 mkdir -p $UPLOAD_DIR
 cp llvm-dsymutil.tar.xz $UPLOAD_DIR