- add ia32e arch.

CVS patchset: 7116
CVS date: 2004/02/22 20:24:13

diff --git a/CHANGES b/CHANGES
index d3bebf8..2c633fd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@
        - python: include Python.h before glibc features.h.
        - python: return [], not None, accessing header tags (#112794).
        - python: avoid invoking python to acquire ill-specified parameters.
+       - add ia32e arch.
 
 4.2 -> 4.2.1:
        - fix: nested %if handling, optind initialization posix vs. glibc.

diff --git a/rpm.spec.in b/rpm.spec.in
index 441fa81..e357a6e 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -482,6 +482,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Sun Feb 22 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.14
+- add ia32e arch.
+
 * Fri Feb 20 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.13
 - fix: only first "mkdir -p" directory had context set.
                                                                                 

diff --git a/rpmrc.in b/rpmrc.in
index 4e6335c..aa8356f 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.57 2003/12/11 19:09:59 jbj Exp $
+# $Id: rpmrc.in,v 2.58 2004/02/22 20:24:14 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -19,6 +19,7 @@ optflags: athlon -O2 -g -march=athlon
 optflags: ia64 -O2 -g
 optflags: x86_64 -O2 -g
 optflags: amd64 -O2 -g
+optflags: ia32e -O2 -g
 
 optflags: alpha -O2 -g -mieee
 optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
@@ -72,6 +73,7 @@ arch_canon:   i486:   i486    1
 arch_canon:    i386:   i386    1
 arch_canon:    x86_64: x86_64  1
 arch_canon:    amd64:  amd64   1
+arch_canon:    ia32e:  ia32e   1
 
 arch_canon:    alpha:  alpha   2
 arch_canon:    alphaev5: alphaev5      2
@@ -203,6 +205,7 @@ buildarchtranslate: ia64: ia64
 
 buildarchtranslate: x86_64: x86_64
 buildarchtranslate: amd64: x86_64
+buildarchtranslate: ia32e: x86_64
 
 #############################################################
 # Architecture compatibility
@@ -273,6 +276,7 @@ arch_compat: ia64: noarch
 
 arch_compat: x86_64: amd64 athlon noarch
 arch_compat: amd64: x86_64 athlon noarch
+arch_compat: ia32e: x86_64 athlon noarch
 
 os_compat:   IRIX64: IRIX
 os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
@@ -360,7 +364,8 @@ buildarch_compat: s390x: noarch
 buildarch_compat: ia64: noarch
 
 buildarch_compat: x86_64: noarch
-buildarch_compat: amd64: noarch
+buildarch_compat: amd64: x86_64
+buildarch_compat: ia32e: x86_64
 
 macrofiles:    @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.prelink:@SYSCONFIGDIR@/macros.solve:@SYSCONFIGDIR@/macros.up2date:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros