From 4fe8fad55873cfabf5197d50539caa8654c49a9d Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 3 Apr 2015 12:08:22 +0300
Subject: [PATCH] buildsys: set default arch to x86_64. drop i386 support

---
 config/arch.i386               | 14 --------------
 config/graphic                 |  5 -----
 config/options                 |  6 +++---
 distributions/OpenELEC/options |  6 +-----
 projects/Generic/options       | 12 ------------
 scripts/image                  |  2 +-
 scripts/unpack                 |  2 +-
 7 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 config/arch.i386

diff --git a/config/arch.i386 b/config/arch.i386
deleted file mode 100644
index 0eb8172c07..0000000000
--- a/config/arch.i386
+++ /dev/null
@@ -1,14 +0,0 @@
-# determines TARGET_CPU, if not forced by user
-  if [ -z "$TARGET_CPU" ]; then
-    TARGET_CPU=i686
-  fi
-
-# determine architecture's family
-  TARGET_SUBARCH=i686
-
-# setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
-  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
-
-# build with SIMD support ( yes / no )
-  SIMD_SUPPORT="yes"
diff --git a/config/graphic b/config/graphic
index 45813b00b2..0c23ab8b9b 100644
--- a/config/graphic
+++ b/config/graphic
@@ -51,11 +51,6 @@ get_graphicdrivers() {
       VDPAU_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "nvidia-legacy" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
-    fi
-
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
diff --git a/config/options b/config/options
index 45540588e9..7cd5b37f7b 100644
--- a/config/options
+++ b/config/options
@@ -17,10 +17,10 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
-# default is i386
+# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
+# default is x86_64
 if [ -z "$ARCH" ]; then
-  TARGET_ARCH="i386"
+  TARGET_ARCH="x86_64"
 else
   TARGET_ARCH="$ARCH"
 fi
diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
index a8a6dd7b74..535340db4b 100644
--- a/distributions/OpenELEC/options
+++ b/distributions/OpenELEC/options
@@ -145,11 +145,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
     GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
   fi
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 998faa7896..e70514827c 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -5,18 +5,6 @@
   # The TARGET_CPU variable controls which processor should be targeted for
   # generated code.
     case $TARGET_ARCH in
-      i386)
-        # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-        #               athlon-fx athlon-mp athlon-xp athlon-4
-        #               athlon-tbird athlon k6-3 k6-2 k6 geode
-        # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
-        #               pentium-m pentium2 pentiumpro pentium-mmx pentium
-        #               i686 i586 i486 i386
-        # (VIA CPUs)    c3 c3-2
-        #
-        TARGET_CPU="i686"
-        ;;
-
       x86_64)
         # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
         #               athlon-fx amdfam10 barcelona
diff --git a/scripts/image b/scripts/image
index 8a4c6c6949..d8e00ff7c1 100755
--- a/scripts/image
+++ b/scripts/image
@@ -203,7 +203,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
     KERNEL_IMAGE="bzImage"
   fi
 
-  if [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
+  if [ "$TARGET_ARCH" = x86_64 ]; then
     KERNEL_ARCH="x86"
   elif [ "$TARGET_ARCH" = arm ]; then
     KERNEL_ARCH="arm"
diff --git a/scripts/unpack b/scripts/unpack
index df74c7bf56..7924ac1b41 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -119,7 +119,7 @@ if [ "$(type -t pre_patch)" = "function" ]; then
   pre_patch
 fi
 
-if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
+if [ "$TARGET_ARCH" = "x86_64" ]; then
   PATCH_ARCH="x86"
 else
   PATCH_ARCH="$TARGET_ARCH"