From 9a3d23967b2dee2e2057c1b0d4b540c8d10c11af Mon Sep 17 00:00:00 2001 From: fake Date: Sun, 12 Sep 2004 13:21:34 +0000 Subject: [PATCH] fake: linux=linux24: update to 2.4.27 for testing.... (does not depend on the 2.6 update ;) rediff: add gcc34 fixes patch, thanks archlinux ;) [2004090206520529086] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4130 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.desc | 8 ++-- .../99-hotfix-i386-x86_64-fpu-state.patch | 38 ------------------- .../linux/linux24/arch-sparc64-use-KCC.patch | 2 +- 3 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 package/base/linux/linux24/99-hotfix-i386-x86_64-fpu-state.patch diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 82dba51f2..32577c6da 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -42,10 +42,10 @@ [P] X -?---5---9 101.500 #if xpkg == linux24.* -[V] 2.4.26 -[O] var_append patchfiles " " "gcc340-fixes-v2.4.26-r6.patch" -[D] 2171221430 linux-2.4.26.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ -[D] 3033730141 gcc340-fixes-v2.4.26-r6.patch http://dl.rocklinux-consulting.de/oss/linux24/ +[V] 2.4.27 +[O] var_append patchfiles " " "gcc34-fixes-v2.4.27.patch" +[D] 3224398821 linux-2.4.27.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/ +[D] 3677506958 gcc34-fixes-v2.4.27.patch http://www.rocklinux.net/people/fake/linux24/ #endif #if xpkg == linux26.* diff --git a/package/base/linux/linux24/99-hotfix-i386-x86_64-fpu-state.patch b/package/base/linux/linux24/99-hotfix-i386-x86_64-fpu-state.patch deleted file mode 100644 index 233bc666b..000000000 --- a/package/base/linux/linux24/99-hotfix-i386-x86_64-fpu-state.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# ChangeSet - -# We need to clear all exceptions before synchronizing -# with the FPU, since we aren't ready to handle a FP -# exception here and we're getting rid of all FP state. - -# Special thanks to Alexander Nyberg for reports and -# testing. Alternate patches by Sergey Vlasov and Andi -# Kleen, who both worked on this. - -# Signed-off-by: Linus Torvalds - -diff -Nru a/include/asm-i386/i387.h b/include/asm-i386/i387.h ---- a/include/asm-i386/i387.h 2004-06-15 08:57:43 -07:00 -+++ b/include/asm-i386/i387.h 2004-06-15 08:57:43 -07:00 -@@ -34,7 +34,7 @@ - - #define clear_fpu( tsk ) do { \ - if ( tsk->flags & PF_USEDFPU ) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - tsk->flags &= ~PF_USEDFPU; \ - stts(); \ - } \ -diff -Naur a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h ---- a/include/asm-x86_64/i387.h 2003-08-25 13:44:44.000000000 +0200 -+++ b/include/asm-x86_64/i387.h 2004-06-13 05:27:55.000000000 +0200 -@@ -34,7 +34,7 @@ - - #define clear_fpu( tsk ) do { \ - if ( tsk->flags & PF_USEDFPU ) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - tsk->flags &= ~PF_USEDFPU; \ - stts(); \ - } \ - diff --git a/package/base/linux/linux24/arch-sparc64-use-KCC.patch b/package/base/linux/linux24/arch-sparc64-use-KCC.patch index 9f778d80b..7288953a8 100644 --- a/package/base/linux/linux24/arch-sparc64-use-KCC.patch +++ b/package/base/linux/linux24/arch-sparc64-use-KCC.patch @@ -32,7 +32,7 @@ diff -ruN linux-2.4.22/arch/sparc64/Makefile linux-2.4.22.new/arch/sparc64/Makef # line... SHELL =/bin/bash --CC := $(shell if gcc -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo gcc; else echo sparc64-linux-gcc; fi ) +-CC := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo $(CC); else echo sparc64-linux-gcc; fi ) +CC := $(KCC) NEW_GCC := $(shell if $(CC) -m64 -mcmodel=medlow -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo y; else echo n; fi; )