diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-29 21:54:54 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-29 21:54:54 +0000 |
| commit | d86e96f7a4c2d76cd8f4c7291892bd524af69bab (patch) | |
| tree | b8c62a333fdffeb00bb7ce07c7bbdc2c3c4e91e3 /sys-kernel/linux-headers | |
| parent | Put xinerama into IUSE (Manifest recommit) (diff) | |
| download | gentoo-2-d86e96f7a4c2d76cd8f4c7291892bd524af69bab.tar.gz gentoo-2-d86e96f7a4c2d76cd8f4c7291892bd524af69bab.tar.bz2 gentoo-2-d86e96f7a4c2d76cd8f4c7291892bd524af69bab.zip | |
Added X86_64 asm-* specific patches; closes bug #43520.
Diffstat (limited to 'sys-kernel/linux-headers')
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-2.6.3-strict-ansi-fix.patch | 86 |
2 files changed, 92 insertions, 1 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/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__ */ + |