From 545d1aa13cca695b161fd4b9740f07a8fd391db0 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 13 Jan 2011 06:18:45 +0000
Subject: Use GOARCH value of sparc64 rather than sparcv9.

From-SVN: r168740
---
 libgo/configure                             | 26 +++++++++++++-------------
 libgo/configure.ac                          | 10 +++++-----
 libgo/go/debug/proc/regs_solaris_sparc64.go |  5 +++++
 libgo/go/debug/proc/regs_solaris_sparcv9.go |  5 -----
 libgo/syscalls/syscall_solaris_sparc64.go   |  7 +++++++
 libgo/syscalls/syscall_solaris_sparcv9.go   |  7 -------
 6 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 libgo/go/debug/proc/regs_solaris_sparc64.go
 delete mode 100644 libgo/go/debug/proc/regs_solaris_sparcv9.go
 create mode 100644 libgo/syscalls/syscall_solaris_sparc64.go
 delete mode 100644 libgo/syscalls/syscall_solaris_sparcv9.go

diff --git a/libgo/configure b/libgo/configure
index ff404f2..9b8aeaa 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 41860d1..7d348dc 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_sparc64.go b/libgo/go/debug/proc/regs_solaris_sparc64.go
new file mode 100644
index 0000000..3fc3e51
--- /dev/null
+++ b/libgo/go/debug/proc/regs_solaris_sparc64.go
@@ -0,0 +1,5 @@
+// Copyright 2011 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package proc
diff --git a/libgo/go/debug/proc/regs_solaris_sparcv9.go b/libgo/go/debug/proc/regs_solaris_sparcv9.go
deleted file mode 100644
index 3fc3e51..0000000
--- a/libgo/go/debug/proc/regs_solaris_sparcv9.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proc
diff --git a/libgo/syscalls/syscall_solaris_sparc64.go b/libgo/syscalls/syscall_solaris_sparc64.go
new file mode 100644
index 0000000..f371dd2
--- /dev/null
+++ b/libgo/syscalls/syscall_solaris_sparc64.go
@@ -0,0 +1,7 @@
+// syscall_solaris_v9.go -- Solaris sparc9v specific support
+
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package syscall
diff --git a/libgo/syscalls/syscall_solaris_sparcv9.go b/libgo/syscalls/syscall_solaris_sparcv9.go
deleted file mode 100644
index f371dd2..0000000
--- a/libgo/syscalls/syscall_solaris_sparcv9.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// syscall_solaris_v9.go -- Solaris sparc9v specific support
-
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-- 
cgit v1.1