From 5c6cc59214a8a8790c31821ae379e356e9cc0cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Mon, 25 Jan 2021 11:48:55 +0100
Subject: [PATCH] tools: Update asm-differ and add support for -mw (make,
 watch)

---
 tools/asm-differ       |  2 +-
 tools/diff_settings.py | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tools/asm-differ b/tools/asm-differ
index fbe51735..7cd33c4e 160000
--- a/tools/asm-differ
+++ b/tools/asm-differ
@@ -1 +1 @@
-Subproject commit fbe5173585823533dbea544aba1cc6e562531ed6
+Subproject commit 7cd33c4e7f5adadf5892261ad8a522efec51cac8
diff --git a/tools/diff_settings.py b/tools/diff_settings.py
index 09748192..654f8df3 100644
--- a/tools/diff_settings.py
+++ b/tools/diff_settings.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+from pathlib import Path
+
 
 def apply(config, args):
     config['arch'] = 'aarch64'
@@ -6,3 +7,16 @@ def apply(config, args):
     config['myimg'] = 'build/uking'
     config['source_directories'] = ['src']
     config['objdump_executable'] = 'tools/aarch64-none-elf-objdump'
+
+    for dir in ('build', 'build/nx64-release'):
+        if (Path(dir) / 'build.ninja').is_file():
+            config['make_command'] = ['ninja', '-C', dir]
+
+
+def map_build_target(make_target: str):
+    if make_target == "build/uking":
+        return "uking"
+
+    # TODO: When support for directly diffing object files is added, this needs to strip
+    # the build/ prefix from the object file targets.
+    return make_target