Use GOARCH value of sparc64 rather than sparcv9.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168740 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 18 insertions, 18 deletions

diff --git a/libgo/configure b/libgo/configure
index ff404f2a026..9b8aeaa56e6 100644
--- a/libgo/configure
+++ b/libgo/configure
@@ -615,8 +615,8 @@ SPLIT_STACK
 GOARCH
 LIBGO_IS_X86_64_FALSE
 LIBGO_IS_X86_64_TRUE
-LIBGO_IS_SPARCV9_FALSE
-LIBGO_IS_SPARCV9_TRUE
+LIBGO_IS_SPARC64_FALSE
+LIBGO_IS_SPARC64_TRUE
 LIBGO_IS_SPARC_FALSE
 LIBGO_IS_SPARC_TRUE
 LIBGO_IS_ARM_FALSE
@@ -13253,7 +13253,7 @@ fi
 is_386=no
 is_arm=no
 is_sparc=no
-is_sparcv9=no
+is_sparc64=no
 is_x86_64=no
 GOARCH=unknown
 case ${host} in
@@ -13294,15 +13294,15 @@ _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   is_sparc=yes
 else
-  is_sparcv9=yes
+  is_sparc64=yes
 fi
 rm -f conftest.err conftest.$ac_ext
     if test "$is_sparc" = "yes"; then
       is_sparc=yes
       GOARCH=sparc
     else
-      is_sparcv9=yes
-      GOARCH=sparcv9
+      is_sparc64=yes
+      GOARCH=sparc64
     fi
     ;;
 esac
@@ -13330,12 +13330,12 @@ else
   LIBGO_IS_SPARC_FALSE=
 fi
 
- if test $isv_sparcv9 = yes; then
-  LIBGO_IS_SPARCV9_TRUE=
-  LIBGO_IS_SPARCV9_FALSE='#'
+ if test $is_sparc64 = yes; then
+  LIBGO_IS_SPARC64_TRUE=
+  LIBGO_IS_SPARC64_FALSE='#'
 else
-  LIBGO_IS_SPARCV9_TRUE='#'
-  LIBGO_IS_SPARCV9_FALSE=
+  LIBGO_IS_SPARC64_TRUE='#'
+  LIBGO_IS_SPARC64_FALSE=
 fi
 
  if test $is_x86_64 = yes; then
@@ -14210,8 +14210,8 @@ if test -z "${LIBGO_IS_SPARC_TRUE}" && test -z "${LIBGO_IS_SPARC_FALSE}"; then
   as_fn_error "conditional \"LIBGO_IS_SPARC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${LIBGO_IS_SPARCV9_TRUE}" && test -z "${LIBGO_IS_SPARCV9_FALSE}"; then
-  as_fn_error "conditional \"LIBGO_IS_SPARCV9\" was never defined.
+if test -z "${LIBGO_IS_SPARC64_TRUE}" && test -z "${LIBGO_IS_SPARC64_FALSE}"; then
+  as_fn_error "conditional \"LIBGO_IS_SPARC64\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${LIBGO_IS_X86_64_TRUE}" && test -z "${LIBGO_IS_X86_64_FALSE}"; then
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 41860d14286..7d348dcf803 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -136,7 +136,7 @@ dnl N.B. Keep in sync with gcc/testsuite/go.test/go-test.exp (go-set-goarch).
 is_386=no
 is_arm=no
 is_sparc=no
-is_sparcv9=no
+is_sparc64=no
 is_x86_64=no
 GOARCH=unknown
 case ${host} in
@@ -165,20 +165,20 @@ changequote([,])dnl
 #if defined(__sparcv9) || defined(__arch64__)
 #error 64-bit
 #endif],
-[is_sparc=yes], [is_sparcv9=yes])
+[is_sparc=yes], [is_sparc64=yes])
     if test "$is_sparc" = "yes"; then
       is_sparc=yes
       GOARCH=sparc
     else
-      is_sparcv9=yes
-      GOARCH=sparcv9
+      is_sparc64=yes
+      GOARCH=sparc64
     fi
     ;;
 esac
 AM_CONDITIONAL(LIBGO_IS_386, test $is_386 = yes)
 AM_CONDITIONAL(LIBGO_IS_ARM, test $is_arm = yes)
 AM_CONDITIONAL(LIBGO_IS_SPARC, test $is_sparc = yes)
-AM_CONDITIONAL(LIBGO_IS_SPARCV9, test $isv_sparcv9 = yes)
+AM_CONDITIONAL(LIBGO_IS_SPARC64, test $is_sparc64 = yes)
 AM_CONDITIONAL(LIBGO_IS_X86_64, test $is_x86_64 = yes)
 AC_SUBST(GOARCH)
 
diff --git a/libgo/go/debug/proc/regs_solaris_sparcv9.go b/libgo/go/debug/proc/regs_solaris_sparc64.go
index 3fc3e51cd79..3fc3e51cd79 100644
--- a/libgo/go/debug/proc/regs_solaris_sparcv9.go
+++ b/libgo/go/debug/proc/regs_solaris_sparc64.go
diff --git a/libgo/syscalls/syscall_solaris_sparcv9.go b/libgo/syscalls/syscall_solaris_sparc64.go
index f371dd21a4c..f371dd21a4c 100644
--- a/libgo/syscalls/syscall_solaris_sparcv9.go
+++ b/libgo/syscalls/syscall_solaris_sparc64.go