diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-06 19:24:23 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-06 19:24:23 +0000 |
| commit | 275f094b185194ce00edc86f084b27fc6be2cc61 (patch) | |
| tree | 23b882305679e1e26e46b19513733540100b19e7 /libgo/configure | |
| parent | 6685d11ca873e7e78314597a48e934e13946b5af (diff) | |
go/build: Set GOARCH on arm64 systems.
I am reliably informed that the architecture name and letter for the
plan9/inferno compilers for 64-bit ARM systems will be "arm64" and "7"
respectively, so let's get that bit in nice and early.
From Michael Hudson-Doyle.
https://codereview.appspot.com/34830045/
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206374 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/configure')
| -rwxr-xr-x | libgo/configure | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libgo/configure b/libgo/configure index 46bb6066fb34..a5439ebd8487 100755 --- a/libgo/configure +++ b/libgo/configure @@ -647,6 +647,8 @@ LIBGO_IS_MIPS_FALSE LIBGO_IS_MIPS_TRUE LIBGO_IS_M68K_FALSE LIBGO_IS_M68K_TRUE +LIBGO_IS_ARM64_FALSE +LIBGO_IS_ARM64_TRUE LIBGO_IS_ARM_FALSE LIBGO_IS_ARM_TRUE LIBGO_IS_ALPHA_FALSE @@ -11113,7 +11115,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11116 "configure" +#line 11118 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11219,7 +11221,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11222 "configure" +#line 11224 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13592,6 +13594,7 @@ esac is_386=no is_alpha=no is_arm=no +is_arm64=no is_m68k=no mips_abi=unknown is_ppc=no @@ -13605,6 +13608,10 @@ case ${host} in is_alpha=yes GOARCH=alpha ;; + aarch64-*-*) + is_arm64=yes + GOARCH=arm64 + ;; arm*-*-* | strongarm*-*-* | ep9312*-*-* | xscale-*-*) is_arm=yes GOARCH=arm @@ -13756,6 +13763,14 @@ else LIBGO_IS_ARM_FALSE= fi + if test $is_arm64 = yes; then + LIBGO_IS_ARM64_TRUE= + LIBGO_IS_ARM64_FALSE='#' +else + LIBGO_IS_ARM64_TRUE='#' + LIBGO_IS_ARM64_FALSE= +fi + if test $is_m68k = yes; then LIBGO_IS_M68K_TRUE= LIBGO_IS_M68K_FALSE='#' @@ -15538,6 +15553,10 @@ if test -z "${LIBGO_IS_ARM_TRUE}" && test -z "${LIBGO_IS_ARM_FALSE}"; then as_fn_error "conditional \"LIBGO_IS_ARM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${LIBGO_IS_ARM64_TRUE}" && test -z "${LIBGO_IS_ARM64_FALSE}"; then + as_fn_error "conditional \"LIBGO_IS_ARM64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LIBGO_IS_M68K_TRUE}" && test -z "${LIBGO_IS_M68K_FALSE}"; then as_fn_error "conditional \"LIBGO_IS_M68K\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |