From: Jimmy Yuen Ho Wong <wyuenho@gmail.com>
Date: Tue, 3 Aug 2021 07:14:38 +0000 (+0100)
Subject: * Fix error while disassembling native code on macOS
X-Git-Tag: emacs-28.0.90~1598
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b44abacc8cfee02de45773424dd7b18d8794a6c3;p=emacs.git

* Fix error while disassembling native code on macOS

* lisp/emacs-lisp/disass.el (disassemble-internal): Make sure the
regexp that searches for a symbol takes into account of llvm-objdump's
output format.
---

diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 6ac76f1c19d..712fa511707 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -95,6 +95,8 @@ redefine OBJECT if it is a symbol."
               (re-search-forward (concat "^.*"
                                          (regexp-quote
                                           (concat "<"
+                                                  (when (eq system-type 'darwin)
+                                                    "_")
                                                   (comp-c-func-name
                                                    (subr-name obj) "F" t)
                                                   ">:"))))