Added X86_64 asm-* specific patches; closes bug #43520.

3 files changed, 126 insertions, 35 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index dd21fe690550..455f93c73df5 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.46 2004/02/22 16:55:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.47 2004/02/29 21:54:54 plasmaroo Exp $
+
+  29 Feb 2004; <plasmaroo@gentoo.org>
+  files/linux-headers-2.6.3-strict-ansi-fix.patch:
+  Added Kevin Owen's contributed patch porting our X86 specific
+  compatibility patches to AMD64. Closes bug #43520. Thanks!
 
 *linux-headers-2.6.3-r1 (22 Feb 2004)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 6b77aac5acfd..f03d4e361052 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,49 +1,49 @@
-MD5 5c1cb87b2ad3472736f4c32b83b4359a ChangeLog 10637
+MD5 018b7249d2eb482b86bfa6a4d524af7a ChangeLog 10852
 MD5 5aad4907c20fa590956de7b1a2d7940b linux-headers-2.2.20.ebuild 3919
-MD5 cfdef44dfa55b9d8f7fef25db8f02cec linux-headers-2.2.21_pre3.ebuild 4090
-MD5 c4d84a23943d7b0cecd3baf6c7b06680 linux-headers-2.4.16-r1.ebuild 5047
-MD5 785b286c8defb723e3675aca048086c4 linux-headers-2.4.16-r3.ebuild 6098
-MD5 c9e9df8d5028f963800a54f871477ecf linux-headers-2.4.16.ebuild 4776
-MD5 7a73b7d702bb2c5b4e6bbce930ea603b linux-headers-2.4.17-r3.ebuild 4408
-MD5 525f41de0855a78cfa75194bf2631a46 linux-headers-2.4.17-r4.ebuild 4661
 MD5 170788a0df1aa51a83238327ef340706 linux-headers-2.4.17-r5.ebuild 4249
-MD5 e17e4ec533bc71c9a73b6ce2d93930ae linux-headers-2.4.18-r1.ebuild 4508
-MD5 361dc9c5be0b3312b620b331f77ad0e1 linux-headers-2.4.18-r2.ebuild 4550
-MD5 c527ccb0c6e15e75a352146bf0c16000 linux-headers-2.4.18.ebuild 3171
-MD5 700a7f741d57affd86d8834659e200a3 linux-headers-2.4.19-r1.ebuild 4795
+MD5 c3d510bb531ff548ff5c2e3e1ad56fff linux-headers-2.4.23.ebuild 3395
+MD5 525f41de0855a78cfa75194bf2631a46 linux-headers-2.4.17-r4.ebuild 4661
+MD5 66670455b1bddf50c8919429c9cfc092 linux-headers-2.6.3-r1.ebuild 4022
 MD5 6f7564daf75852f1c3b50a7b586294bc linux-headers-2.4.19.ebuild 4620
+MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
+MD5 c9e9df8d5028f963800a54f871477ecf linux-headers-2.4.16.ebuild 4776
 MD5 b1e89fa26436fd884bd4a09bb26c3853 linux-headers-2.4.21-r1.ebuild 3883
-MD5 434a527a81552b011ec5ad591db3fa84 linux-headers-2.4.21.ebuild 3591
+MD5 c4d84a23943d7b0cecd3baf6c7b06680 linux-headers-2.4.16-r1.ebuild 5047
 MD5 e0213763ec7f52b581e0f3d78c72cf58 linux-headers-2.4.22.ebuild 3881
-MD5 c3d510bb531ff548ff5c2e3e1ad56fff linux-headers-2.4.23.ebuild 3395
+MD5 700a7f741d57affd86d8834659e200a3 linux-headers-2.4.19-r1.ebuild 4795
+MD5 c527ccb0c6e15e75a352146bf0c16000 linux-headers-2.4.18.ebuild 3171
+MD5 434a527a81552b011ec5ad591db3fa84 linux-headers-2.4.21.ebuild 3591
 MD5 19415dce5c0292f8cd736aab42caffdf linux-headers-2.6.1.ebuild 4029
-MD5 66670455b1bddf50c8919429c9cfc092 linux-headers-2.6.3-r1.ebuild 4022
-MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
+MD5 785b286c8defb723e3675aca048086c4 linux-headers-2.4.16-r3.ebuild 6098
+MD5 361dc9c5be0b3312b620b331f77ad0e1 linux-headers-2.4.18-r2.ebuild 4550
+MD5 7a73b7d702bb2c5b4e6bbce930ea603b linux-headers-2.4.17-r3.ebuild 4408
+MD5 cfdef44dfa55b9d8f7fef25db8f02cec linux-headers-2.2.21_pre3.ebuild 4090
+MD5 e17e4ec533bc71c9a73b6ce2d93930ae linux-headers-2.4.18-r1.ebuild 4508
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
-MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
-MD5 4bb39400b782c620a61abff4b8abd627 files/digest-linux-headers-2.4.16-r1 348
+MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
 MD5 d0ff4105ca806cb26f3f990422722cfb files/digest-linux-headers-2.4.16-r3 429
-MD5 6db03bb67f89f2fb55870bcdba4c24e5 files/digest-linux-headers-2.4.17-r3 145
-MD5 700dfcb704ed5987434f84006e39787e files/digest-linux-headers-2.4.17-r4 144
-MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
-MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r1 67
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r2 67
-MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
+MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19-r1 67
+MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
+MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
+MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
+MD5 6db03bb67f89f2fb55870bcdba4c24e5 files/digest-linux-headers-2.4.17-r3 145
+MD5 700dfcb704ed5987434f84006e39787e files/digest-linux-headers-2.4.17-r4 144
+MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
 MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
-MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
-MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
 MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 472b4fc39c7c2855c7e86606927bc2a2 files/linux-headers-2.6.3-appCompat.patch 17484
-MD5 679eec2a96d0951ce7ea0603d9b76c21 files/linux-headers-2.6.3-strict-ansi-fix.patch 1855
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+MD5 4bb39400b782c620a61abff4b8abd627 files/digest-linux-headers-2.4.16-r1 348
+MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r1 67
+MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19 67
+MD5 ac116e74551067f3bd3a2a3c85ba0b0b files/digest-linux-headers-2.4.16 281
+MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
+MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.3-strict-ansi-fix.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.3-strict-ansi-fix.patch
index c69af64b9df7..bfcd7269c1d6 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.3-strict-ansi-fix.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.3-strict-ansi-fix.patch
@@ -57,3 +57,89 @@
  #include <linux/compiler.h>
  
  /* casts are necessary for constants, because we never know how for sure
+--- linux-2.6.3/include/asm-x86_64/byteorder.h	2004-02-17 19:58:49.000000000 -0800
++++ linux-2.6.3/include/asm-x86_64/byteorder.h	2004-02-28 18:49:20.000000000 -0800
+@@ -1,6 +1,8 @@
+ #ifndef _X86_64_BYTEORDER_H
+ #define _X86_64_BYTEORDER_H
+ 
++#define __attribute_const__	__attribute__((__const__))
++
+ #include <asm/types.h>
+ #include <linux/compiler.h>
+ 
+--- linux-2.6.3/include/asm-x86_64/semaphore.h	2004-02-17 19:57:11.000000000 -0800
++++ linux-2.6.3/include/asm-x86_64/semaphore.h	2004-02-28 18:49:20.000000000 -0800
+@@ -3,8 +3,6 @@
+ 
+ #include <linux/linkage.h>
+ 
+-#ifdef __KERNEL__
+-
+ /*
+  * SMP- and interrupt-safe semaphores..
+  *
+@@ -215,5 +213,4 @@
+ 		:"D" (sem)
+ 		:"memory");
+ }
+-#endif /* __KERNEL__ */
+ #endif
+--- linux-2.6.3/include/asm-x86_64/signal.h	2004-02-17 19:57:12.000000000 -0800
++++ linux-2.6.3/include/asm-x86_64/signal.h	2004-02-28 18:49:20.000000000 -0800
+@@ -32,7 +32,9 @@
+ /* Here we must cater to libcs that poke about in kernel headers.  */
+ 
+ #define NSIG		32
++#ifndef __sigset_t_defined
+ typedef unsigned long sigset_t;
++#endif
+ 
+ #endif /* __KERNEL__ */
+ #endif
+@@ -142,22 +144,26 @@
+ #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
+ #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
+ 
++#ifndef _SIGNAL_H			/* added by KMO */
+ struct sigaction {
+ 	__sighandler_t sa_handler;
+ 	unsigned long sa_flags;
+ 	void (*sa_restorer)(void);
+ 	sigset_t sa_mask;		/* mask last for extensibility */
+ };
++#endif					/* added by KMO */
+ 
+ struct k_sigaction {
+ 	struct sigaction sa;
+ };
+ 
++#ifndef _SIGNAL_H			/* added by KMO */
+ typedef struct sigaltstack {
+ 	void *ss_sp;
+ 	int ss_flags;
+ 	size_t ss_size;
+ } stack_t;
++#endif					/* added by KMO */
+ 
+ #ifdef __KERNEL__
+ #include <asm/sigcontext.h>
+--- linux-2.6.3/include/asm-x86_64/types.h	2004-02-17 19:59:16.000000000 -0800
++++ linux-2.6.3/include/asm-x86_64/types.h	2004-02-28 18:49:21.000000000 -0800
+@@ -19,8 +19,14 @@
+ typedef __signed__ int __s32;
+ typedef unsigned int __u32;
+ 
+-typedef __signed__ long long __s64;
+-typedef unsigned long long  __u64;
++#ifndef __GNUC__
++# ifndef __extension__
++#  define __extension__
++# endif /* __extension__ */
++#endif /* __GNUC__ */
++
++__extension__ typedef __signed__ long long __s64;
++__extension__ typedef unsigned long long  __u64;
+ 
+ #endif /* __ASSEMBLY__ */
+