[oe-commits] Khem Raj : Revert "conf/machine: Add x86_64 machine."

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 43e9523bacaac2ce3cb5b385ccd7bd3d9b505c7e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=43e9523bacaac2ce3cb5b385ccd7bd3d9b505c7e

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Dec 25 12:05:59 2009 -0800

Revert "conf/machine: Add x86_64 machine."

This reverts commit c2b7702d52fd6f62f34e58dc2e806b44b8fb976b.

---

 conf/machine/include/tune-x86_64.inc |    4 ----
 conf/machine/x86_64-generic.conf     |   31 -------------------------------
 recipes/gcc/gcc-common.inc           |    4 ----
 3 files changed, 0 insertions(+), 39 deletions(-)

diff --git a/conf/machine/include/tune-x86_64.inc b/conf/machine/include/tune-x86_64.inc
deleted file mode 100644
index db2a560..0000000
--- a/conf/machine/include/tune-x86_64.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_CC_ARCH = "-mtune=generic"
-BASE_PACKAGE_ARCH = "x86_64"
-FEED_ARCH = "x86_64"
-PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 i686"
diff --git a/conf/machine/x86_64-generic.conf b/conf/machine/x86_64-generic.conf
deleted file mode 100644
index 0dad0ff..0000000
--- a/conf/machine/x86_64-generic.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2007,2009 Stelios Koroneos - Digital OPSiS, All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-#@TYPE: Machine
-#@NAME: x86_64-generic
-#@DESCRIPTION: Machine configuration for a generic x86_64 machine
-
-
-TARGET_ARCH = "x86_64"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER="xserver-kdrive-vesa"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-IMAGE_FSTYPES ?= "ext2.gz"
-IMAGE_DEVICE_TABLES = " \
-  files/device_table-minimal.txt \
-  files/device_table_add-loop.txt \
-  files/device_table_add-scsi.txt \
-"
-
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-
-#tune for x86_64
-require conf/machine/include/tune-x86_64.inc
-
diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc
index fc34357..97b140c 100644
--- a/recipes/gcc/gcc-common.inc
+++ b/recipes/gcc/gcc-common.inc
@@ -20,10 +20,6 @@ def get_gcc_mips_plt_setting(bb, d):
         return "--with-mips-plt"
     return ""
 
-EXTRA_OECONF_append_x86_64	= " --disable-multilib"
-EXTRA_OECONF_append_mips64	= " --disable-multilib"
-EXTRA_OECONF_append_powerpc64	= " --disable-multilib"
-
 # We really need HOST_SYS here for some packages and TARGET_SYS for others.
 # For now, libgcc is most important so we fix for that - RP.
 SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"