m4: support aarch64-linux-musl configs
Use the compiler architecture defines instead of overriding them.
Bug: 236052820
Test: cross compiles
Test: soong/regen.sh
Test: soong/regen.sh --musl
Change-Id: I656da15f7650664eac1acea3ba12d8d3c3c91220
diff --git a/soong/linux_glibc/config.h b/soong/linux_glibc/config.h
index 69dab55..801edec 100644
--- a/soong/linux_glibc/config.h
+++ b/soong/linux_glibc/config.h
@@ -9,7 +9,7 @@
/* #undef __x86_64_x32__ */
#endif
#ifndef __x86_64__
-#define __x86_64__ 1
+/* compiler-set */
#endif
#ifndef __alpha__
/* #undef __alpha__ */
diff --git a/soong/linux_musl/config.h b/soong/linux_musl/config.h
index 01cdf3e..1ffa920 100644
--- a/soong/linux_musl/config.h
+++ b/soong/linux_musl/config.h
@@ -9,7 +9,7 @@
/* #undef __x86_64_x32__ */
#endif
#ifndef __x86_64__
-#define __x86_64__ 1
+/* compiler-set */
#endif
#ifndef __alpha__
/* #undef __alpha__ */
diff --git a/soong/regen.sh b/soong/regen.sh
index 77089d7..d15072e 100755
--- a/soong/regen.sh
+++ b/soong/regen.sh
@@ -94,9 +94,7 @@
END
${ANDROID_BUILD_TOP}/prebuilts/build-tools/$UNAME-x86/bin/bpfmt -w ../Android.bp
-if [ $DIR = "darwin" ]; then
- sed -ibak 's%#define __x86_64__ 1%/* compiler-set */%' lib/config.h
-fi
+sed -ibak 's%#define __x86_64__ 1%/* compiler-set */%' lib/config.h
cd lib
find . -name '*.h' | xargs -IX cp X ../../X
