aboutsummaryrefslogtreecommitdiff
path: root/src/tools/mac/upload_system_symbols
diff options
context:
space:
mode:
authorJoshua Peraza <jperaza@chromium.org>2018-11-26 09:53:17 -0800
committerJoshua Peraza <jperaza@chromium.org>2018-11-26 18:29:35 +0000
commite42f2456b7004c767dce27d62b57b4a2ee529316 (patch)
tree564c545b9f4b3aa50fd628543a94935b1d84bb2b /src/tools/mac/upload_system_symbols
parentfix dump_syms xcode project (diff)
downloadbreakpad-e42f2456b7004c767dce27d62b57b4a2ee529316.tar.xz
Add mac dump_syms support for arm64e
Change-Id: I6a25b47d4fc5e42ff9fa30107b563dcf1d51c0d1 Reviewed-on: https://chromium-review.googlesource.com/c/1351352 Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src/tools/mac/upload_system_symbols')
-rw-r--r--src/tools/mac/upload_system_symbols/arch_constants.h5
-rw-r--r--src/tools/mac/upload_system_symbols/arch_reader.go3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/mac/upload_system_symbols/arch_constants.h b/src/tools/mac/upload_system_symbols/arch_constants.h
index 07b1bc40..e12e53e2 100644
--- a/src/tools/mac/upload_system_symbols/arch_constants.h
+++ b/src/tools/mac/upload_system_symbols/arch_constants.h
@@ -43,10 +43,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define CPU_SUBTYPE_ARM64_ALL 0
#endif
+#ifndef CPU_SUBTYPE_ARM64_E
+#define CPU_SUBTYPE_ARM64_E 2
+#endif
+
const cpu_type_t kCPU_TYPE_ARM = CPU_TYPE_ARM;
const cpu_type_t kCPU_TYPE_ARM64 = CPU_TYPE_ARM64;
const cpu_subtype_t kCPU_SUBTYPE_ARM64_ALL = CPU_SUBTYPE_ARM64_ALL;
+const cpu_subtype_t kCPU_SUBTYPE_ARM64_E = CPU_SUBTYPE_ARM64_E;
const cpu_subtype_t kCPU_SUBTYPE_ARM_V7S = CPU_SUBTYPE_ARM_V7S;
const char* GetNXArchInfoName(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype) {
diff --git a/src/tools/mac/upload_system_symbols/arch_reader.go b/src/tools/mac/upload_system_symbols/arch_reader.go
index 0e286dad..ed98fa60 100644
--- a/src/tools/mac/upload_system_symbols/arch_reader.go
+++ b/src/tools/mac/upload_system_symbols/arch_reader.go
@@ -47,6 +47,9 @@ func getArchStringFromHeader(header macho.FileHeader) string {
if header.Cpu == C.kCPU_TYPE_ARM64 && header.SubCpu == C.kCPU_SUBTYPE_ARM64_ALL {
return "arm64"
}
+ if header.Cpu == C.kCPU_TYPE_ARM64 && header.SubCpu == C.kCPU_SUBTYPE_ARM64_E {
+ return "arm64e"
+ }
if header.Cpu == C.kCPU_TYPE_ARM && header.SubCpu == C.kCPU_SUBTYPE_ARM_V7S {
return "armv7s"
}