From fe187bf43ad91e530cb1028ac1df045f9ca9c27c Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sat, 29 Apr 2006 14:26:56 +0000
Subject: [PATCH] Merged r2547 from trunk (removal of sparcv8 arch in CLFS)

---
 CLFS/config                     | 1 -
 common/common-functions         | 2 +-
 common/func_validate_configs.sh | 4 +---
 master.sh                       | 4 ----
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CLFS/config b/CLFS/config
index 0dc5274..24c428b 100644
--- a/CLFS/config
+++ b/CLFS/config
@@ -20,7 +20,6 @@ TARGET=
 # ARCH=mips ;    TARGET="mipsel-unknown-linux-gnu"
 # ARCH=mips ;    TARGET="mips-unknown-linux-gnu"
 # ARCH=sparc ;   TARGET="sparcv9-unknown-linux-gnu"
-# ARCH=sparcv8 ; TARGET="sparc-unknown-linux-gnu"
 #--------------------------------
 # >>>> 64-64 BUILD <<<<
 # ARCH=x86_64-64  ; TARGET="x86_64-unknown-linux-gnu"
diff --git a/common/common-functions b/common/common-functions
index c5041cf..cffe02c 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -107,7 +107,7 @@ cat <<- -EOF-
 ${BOLD}  -A, --arch ARCH ${OFF}
         Select the TARGET architecture, valid selections are:
            32bit builds
-        x86, i486, i586, ppc, mips, mipsel, sparc, sparcv8
+        x86, i486, i586, ppc, mips, mipsel, sparc
            64bit builds
         x86_64-64, mips64-64, mipsel64-64, sparc64-64, alpha
            64bit multi-lib
diff --git a/common/func_validate_configs.sh b/common/func_validate_configs.sh
index 6e9173d..801750b 100644
--- a/common/func_validate_configs.sh
+++ b/common/func_validate_configs.sh
@@ -34,8 +34,6 @@ validate_target() {          #
     ;;
    "sparc")      [[ "${TARGET}" = "sparcv9-unknown-linux-gnu" ]] && return
     ;;
-   "sparcv8")    [[ "${TARGET}" = "sparc-unknown-linux-gnu" ]] && return
-    ;;
    "x86_64-64")  [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return
     ;;
    "mips64-64")  [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return
@@ -213,7 +211,7 @@ inline_doc
       MODEL)      validate_against_str "xglibcx xuclibcx" ;;
       PAGE)       validate_against_str "xletterx xA4x" ;;
       METHOD)     validate_against_str "xchrootx xbootx" ;;
-      ARCH)       validate_against_str "xx86x xx86_64x xx86_64-64x xsparcx xsparcv8x xsparc64x xsparc64-64x xmipsx xmips64x xmips64-64x xppcx xppc64x xalphax" ;;
+      ARCH)       validate_against_str "xx86x xx86_64x xx86_64-64x xsparcx xsparc64x xsparc64-64x xmipsx xmips64x xmips64-64x xppcx xppc64x xalphax" ;;
       TARGET)     validate_target ;;
       GRSECURITY_HOST)  validate_against_str "x0x x1x" ;;
 
diff --git a/master.sh b/master.sh
index 7209d11..2743642 100755
--- a/master.sh
+++ b/master.sh
@@ -299,10 +299,6 @@ while test $# -gt 0 ; do
           ARCH=sparc
           TARGET="sparcv9-unknown-linux-gnu"
           ;;
-        sparcv8 )
-          ARCH=sparcv8
-          TARGET="sparc-unknown-linux-gnu"
-          ;;
         x86_64-64 )
           ARCH=x86_64-64
           TARGET="x86_64-unknown-linux-gnu"