summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Hommey <mh@glandium.org>2020-08-20 23:32:38 +0000
committerMike Hommey <mh@glandium.org>2020-08-20 23:32:38 +0000
commit484bff6ad67f0b67fe7310a79964be0ece9d3592 (patch)
tree4a6e05dbef0faab17576c3e1a1067a9dc37d8395
parent234d699fb2fe570e787cfe72198bb255f9b36cde (diff)
downloadnspr-hg-484bff6ad67f0b67fe7310a79964be0ece9d3592.tar.gz
Bug 1658671 - Add configure support for aarch64 darwin. r=kaie
Differential Revision: https://phabricator.services.mozilla.com/D86795
-rwxr-xr-xconfigure12
-rw-r--r--configure.in12
2 files changed, 22 insertions, 2 deletions
diff --git a/configure b/configure
index 393bbb97..b89064b2 100755
--- a/configure
+++ b/configure
@@ -6458,12 +6458,22 @@ fi
CPU_ARCH=i386
fi
;;
+ aarch64)
+ CPU_ARCH=aarch64
+ ;;
*)
CPU_ARCH=ppc
;;
esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then
- CC="$CC -arch $CPU_ARCH"
+ case "$CPU_ARCH" in
+ aarch64)
+ CC="$CC -arch arm64"
+ ;;
+ *)
+ CC="$CC -arch $CPU_ARCH"
+ ;;
+ esac
fi
ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default"
if test "x$ac_cv_header_crt_externs_h" = xyes; then :
diff --git a/configure.in b/configure.in
index 20b3a599..d3d80479 100644
--- a/configure.in
+++ b/configure.in
@@ -1327,12 +1327,22 @@ case "$target" in
CPU_ARCH=i386
fi
;;
+ aarch64)
+ CPU_ARCH=aarch64
+ ;;
*)
CPU_ARCH=ppc
;;
esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then
- CC="$CC -arch $CPU_ARCH"
+ case "$CPU_ARCH" in
+ aarch64)
+ CC="$CC -arch arm64"
+ ;;
+ *)
+ CC="$CC -arch $CPU_ARCH"
+ ;;
+ esac
fi
AC_CHECK_HEADER(crt_externs.h, AC_DEFINE(HAVE_CRT_EXTERNS_H))
DSO_CFLAGS=-fPIC