From 956c7bf20e455201ff8045ffd300b76d0450022a Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sun, 10 May 2009 04:18:26 +0000
Subject: [PATCH] Switch x86 hardened specs to i686

svn path=/trunk/; revision=635
---
 releases/weekly/ChangeLog                      | 5 +++++
 releases/weekly/specs/x86/hardened/stage1.spec | 4 +---
 releases/weekly/specs/x86/hardened/stage2.spec | 6 ++----
 releases/weekly/specs/x86/hardened/stage3.spec | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/releases/weekly/ChangeLog b/releases/weekly/ChangeLog
index 87a23001..bb4687f3 100644
--- a/releases/weekly/ChangeLog
+++ b/releases/weekly/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 May 2009; Andrew Gaffney <agaffney@gentoo.org>
+  specs/x86/hardened/stage1.spec, specs/x86/hardened/stage2.spec,
+  specs/x86/hardened/stage3.spec:
+  Switch x86 hardened specs to i686
+
   10 May 2009; Andrew Gaffney <agaffney@gentoo.org>
   +specs/x86/i686/stage1.spec, specs/x86/i686/stage2.spec:
   Build a separate stage1-i686 for i686 stages
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index d91555b6..6eccf752 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/hardened/stage1.spec
@@ -1,9 +1,7 @@
-subarch: x86
+subarch: i686
 target: stage1
 version_stamp: hardened-2008.0
 rel_type: hardened
 profile: hardened/linux/x86/2008.0
 snapshot: 2008.0
 source_subpath: hardened/stage3-x86-hardened-2.6-2008.0
-chost: i486-pc-linux-gnu
-cflags: -mtune=i486 -O2 -pipe -fforce-addr
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index 3450ca22..85dbcd53 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -1,9 +1,7 @@
-subarch: x86
+subarch: i686
 target: stage2
 version_stamp: hardened-2008.0
 rel_type: hardened
 profile: hardened/linux/x86/2008.0
 snapshot: 2008.0
-source_subpath: hardened/stage1-x86-hardened-2008.0
-chost: i486-pc-linux-gnu
-cflags: -mtune=i486 -O2 -pipe -fforce-addr
+source_subpath: hardened/stage1-i686-hardened-2008.0
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 51f1f833..32cef5da 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -1,7 +1,7 @@
-subarch: x86
+subarch: i686
 target: stage3
 version_stamp: hardened-2008.0
 rel_type: hardened
 profile: hardened/linux/x86/2008.0
 snapshot: 2008.0
-source_subpath: hardened/stage2-x86-hardened-2008.0
+source_subpath: hardened/stage2-i686-hardened-2008.0