SPECS (LINUX_2_6): kernel.spec - disable math emulation also on i5...

[baggins]

Author: baggins                      Date: Sat May  6 22:56:15 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- disable math emulation also on i586
- disable HIGHMEM64G on uniprocessor because there are recent Pentium-M
  processors (some of Sonoma core, at least) that do not have PAE,
  and I don't believe anyone have more than 4GB RAM on UP hardware

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1530 -> 1.441.2.1531) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1530 SPECS/kernel.spec:1.441.2.1531
--- SPECS/kernel.spec:1.441.2.1530	Sat May  6 00:31:15 2006
+++ SPECS/kernel.spec	Sun May  7 00:56:09 2006
@@ -775,6 +775,8 @@
 %build
 TuneUpConfigForIX86 () {
 %ifarch %{ix86}
+	smp=
+	[ "$2" = "yes" ] && smp=yes
 	%ifnarch i386
 	sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
 	%endif
@@ -797,8 +799,12 @@
 	sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
 	%endif
 	%ifarch i686 athlon pentium3 pentium4
-	sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
-	sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
+	if [ "$smp" = "yes" ]; then
+		sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
+		sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
+	fi
+	%endif
+	%ifarch i586 i686 athlon pentium3 pentium4
 	sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
 	%endif
 	%if %{with regparm}
@@ -838,7 +844,7 @@
 	echo "Building config file [using $Config.conf] for KERNEL $1..."
 	cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
 
-	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
+	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig "$smp"
 
 %ifarch ppc ppc64
 	if [ "$smp" = "yes" ]; then
@@ -1589,6 +1595,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1531  2006/05/06 22:56:09  baggins
+- disable math emulation also on i586
+- disable HIGHMEM64G on uniprocessor because there are recent Pentium-M
+  processors (some of Sonoma core, at least) that do not have PAE,
+  and I don't believe anyone have more than 4GB RAM on UP hardware
+
 Revision 1.441.2.1530  2006/05/05 22:31:15  baggins
 - fix alpha/sparc/sparc64 compilation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1530&r2=1.441.2.1531&f=u