4 files changed, 9 insertions, 5 deletions
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
index 0f7ce171..0cd61ce1 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.morph
@@ -5,6 +5,8 @@ install-commands:
   case "$MORPH_ARCH" in
       armv7b|armv7l|armv7lhf)
           ARCH="arm" ;;
+      armv8l64|armv8b64)
+          ARCH="arm64" ;;
       x86_32)
           ARCH="i386" ;;
       x86_64)
diff --git a/strata/build-essential/m4-tarball.morph b/strata/build-essential/m4-tarball.morph
new file mode 100644
index 00000000..eb16726a
--- /dev/null
+++ b/strata/build-essential/m4-tarball.morph
@@ -0,0 +1,5 @@
+name: m4-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-gcc-warnings
diff --git a/strata/build-essential/m4.morph b/strata/build-essential/m4.morph
deleted file mode 100644
index b76afbe4..00000000
--- a/strata/build-essential/m4.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: m4
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
index 50e1aaa5..b296408f 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.morph
@@ -5,6 +5,8 @@ install-commands:
   case "$MORPH_ARCH" in
       armv7b|armv7l|armv7lhf)
           ARCH="arm" ;;
+      armv8l64|armv8b64)
+          ARCH="arm64" ;;
       x86_32)
           ARCH="i386" ;;
       x86_64)