From cf4c7a1fc6a125ba9584dffd6529f3539ee0c630 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Thu, 1 Jun 2000 14:16:58 +0000
Subject: [PATCH] Add optflags for i486/i586, delete the silly i[789]86
 entries.

CVS patchset: 3792
CVS date: 2000/06/01 14:16:58
---
 rpmrc.in | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/rpmrc.in b/rpmrc.in
index 9b4d1b0..dda95b9 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id: rpmrc.in,v 2.21 2000/06/01 00:54:36 jbj Exp $
+# $Id: rpmrc.in,v 2.22 2000/06/01 14:16:58 jbj Exp $
 
 #############################################################
 
@@ -8,6 +8,8 @@
 # Values for RPM_OPT_FLAGS for various platforms
 
 optflags: i386 -O2 -m486 -fno-strength-reduce
+optflags: i486 -O2 -m486 -fno-strength-reduce
+optflags: i586 -O2 -m486 -fno-strength-reduce
 optflags: i686 -O2 -march=i686
 optflags: athlon -O2 -march=athlon
 optflags: ia64 -O2
@@ -38,9 +40,6 @@ optflags: hades -O2 -fomit-frame-pointer
 # Canonical arch names and numbers
 
 arch_canon:	athlon:	athlon	1
-arch_canon:	i986:	i986	1
-arch_canon:	i886:	i886	1
-arch_canon:	i786:	i786	1
 arch_canon:	i686:	i686	1
 arch_canon:	i586:	i586	1
 arch_canon:	i486:	i486	1
@@ -111,9 +110,6 @@ os_canon:    Linux/ESA: VM/ESA	20
 #############################################################
 # For a given uname().machine, the default build arch
 
-buildarchtranslate: osfmach3_i986: i386
-buildarchtranslate: osfmach3_i886: i386
-buildarchtranslate: osfmach3_i786: i386
 buildarchtranslate: osfmach3_i686: i386
 buildarchtranslate: osfmach3_i586: i386
 buildarchtranslate: osfmach3_i486: i386
@@ -122,9 +118,6 @@ buildarchtranslate: osfmach3_i386: i386
 buildarchtranslate: ia64: ia64
 
 buildarchtranslate: athlon: i386
-buildarchtranslate: i986: i386
-buildarchtranslate: i886: i386
-buildarchtranslate: i786: i386
 buildarchtranslate: i686: i386
 buildarchtranslate: i586: i386
 buildarchtranslate: i486: i386
@@ -156,17 +149,11 @@ arch_compat: alpha: axp noarch
 arch_compat: ia64: noarch
 
 arch_compat: athlon: i686
-arch_compat: i986: i886
-arch_compat: i886: i786
-arch_compat: i786: i686
 arch_compat: i686: i586
 arch_compat: i586: i486
 arch_compat: i486: i386
 arch_compat: i386: noarch
 
-arch_compat: osfmach3_i986: i986 osfmach3_i886
-arch_compat: osfmach3_i886: i886 osfmach3_i786
-arch_compat: osfmach3_i786: i786 osfmach3_i686
 arch_compat: osfmach3_i686: i686 osfmach3_i586
 arch_compat: osfmach3_i586: i586 osfmach3_i486
 arch_compat: osfmach3_i486: i486 osfmach3_i386
@@ -238,9 +225,6 @@ os_compat: TOS: FreeMiNT MiNT mint
 buildarch_compat: ia64: noarch
 
 buildarch_compat: athlon: i686
-buildarch_compat: i986: i886
-buildarch_compat: i886: i786
-buildarch_compat: i786: i686
 buildarch_compat: i686: i586
 buildarch_compat: i586: i486
 buildarch_compat: i486: i386
@@ -270,7 +254,7 @@ buildarch_compat: atariclone: m68kmint noarch
 buildarch_compat: milan: m68kmint noarch
 buildarch_compat: hades: m68kmint noarch
 
-buildarch_compat: ia64: ia64 moarch
+buildarch_compat: ia64: noarch
 
 macrofiles:	@RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
 
-- 
2.7.4