Attachment #859 for bug #411

Lines 44-49 Link Here

(-)./nptl/sysdeps/pthread/pt-initfini.c.orig (+4 lines)
44		44
45	/* Embed an #include to pull in the alignment and .end directives. */	45	/* Embed an #include to pull in the alignment and .end directives. */
46	asm ("\n#include \"defs.h\"");	46	asm ("\n#include \"defs.h\"");
		47	asm ("\n#ifdef __i686");
		48	asm ("\n# undef __i686");
		49	asm ("\n# define __i686 __i686");
		50	asm ("\n#endif");
47		51
48	/* The initial common code ends here. */	52	/* The initial common code ends here. */
49	asm ("\n/@HEADER_ENDS/");	53	asm ("\n/@HEADER_ENDS/");

Lines 22-27 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S.orig (+5 lines)
22	#include <lowlevelcond.h>	22	#include <lowlevelcond.h>
23	#include <tcb-offsets.h>	23	#include <tcb-offsets.h>
24		24
		25	#if defined(PIC) && defined(__i686)
		26	# undef __i686
		27	# define __i686 __i686
		28	#endif
		29
25	#ifdef UP	30	#ifdef UP
26	# define LOCK	31	# define LOCK
27	#else	32	#else

Lines 21-26 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S.orig (+5 lines)
21	#include <shlib-compat.h>	21	#include <shlib-compat.h>
22	#include <pthread-errnos.h>	22	#include <pthread-errnos.h>
23		23
		24	#if defined(PIC) && defined(__i686)
		25	# undef __i686
		26	# define __i686 __i686
		27	#endif
		28
24	#ifndef UP	29	#ifndef UP
25	# define LOCK lock	30	# define LOCK lock
26	#else	31	#else

Lines 21-26 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S.orig (+5 lines)
21	#include <shlib-compat.h>	21	#include <shlib-compat.h>
22	#include <pthread-errnos.h>	22	#include <pthread-errnos.h>
23		23
		24	#if defined(PIC) && defined(__i686)
		25	# undef __i686
		26	# define __i686 __i686
		27	#endif
		28
24	#ifndef UP	29	#ifndef UP
25	# define LOCK lock	30	# define LOCK lock
26	#else	31	#else

Lines 21-26 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S.orig (+5 lines)
21	#include <shlib-compat.h>	21	#include <shlib-compat.h>
22	#include <pthread-errnos.h>	22	#include <pthread-errnos.h>
23		23
		24	#if defined(PIC) && defined(__i686)
		25	# undef __i686
		26	# define __i686 __i686
		27	#endif
		28
24	#ifndef UP	29	#ifndef UP
25	# define LOCK lock	30	# define LOCK lock
26	#else	31	#else

Lines 21-26 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S.orig (+5 lines)
21	#include <shlib-compat.h>	21	#include <shlib-compat.h>
22	#include <pthread-errnos.h>	22	#include <pthread-errnos.h>
23		23
		24	#if defined(PIC) && defined(__i686)
		25	# undef __i686
		26	# define __i686 __i686
		27	#endif
		28
24	#ifndef UP	29	#ifndef UP
25	# define LOCK lock	30	# define LOCK lock
26	#else	31	#else

Lines 20-25 Link Here

(-)./nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S.orig (+5 lines)
20	#include <unwindbuf.h>	20	#include <unwindbuf.h>
21	#include <sysdep.h>	21	#include <sysdep.h>
22		22
		23	#if defined(PIC) && defined(__i686)
		24	# undef __i686
		25	# define __i686 __i686
		26	#endif
		27
23	#ifndef UP	28	#ifndef UP
24	# define LOCK lock	29	# define LOCK lock
25	#else	30	#else

Lines 24-29 Link Here

(-)./sysdeps/i386/elf/setjmp.S.orig (+5 lines)
24	#include "bp-sym.h"	24	#include "bp-sym.h"
25	#include "bp-asm.h"	25	#include "bp-asm.h"
26		26
		27	#ifdef __i686
		28	# undef __i686
		29	# define __i686 __i686
		30	#endif
		31
27	#define PARMS LINKAGE /* no space for saved regs */	32	#define PARMS LINKAGE /* no space for saved regs */
28	#define JMPBUF PARMS	33	#define JMPBUF PARMS
29	#define SIGMSK JMPBUF+PTR_SIZE	34	#define SIGMSK JMPBUF+PTR_SIZE

Lines 24-29 Link Here

(-)./sysdeps/i386/elf/bsd-setjmp.S.orig (+5 lines)
24	#include "bp-sym.h"	24	#include "bp-sym.h"
25	#include "bp-asm.h"	25	#include "bp-asm.h"
26		26
		27	#ifdef __i686
		28	# undef __i686
		29	# define __i686 __i686
		30	#endif
		31
27	#define PARMS LINKAGE /* no space for saved regs */	32	#define PARMS LINKAGE /* no space for saved regs */
28	#define JMPBUF PARMS	33	#define JMPBUF PARMS
29	#define SIGMSK JMPBUF+PTR_SIZE	34	#define SIGMSK JMPBUF+PTR_SIZE

Lines 22-27 Link Here

(-)./sysdeps/i386/i686/memcmp.S.orig (+5 lines)
22	#include "bp-sym.h"	22	#include "bp-sym.h"
23	#include "bp-asm.h"	23	#include "bp-asm.h"
24		24
		25	#ifdef __i686
		26	# undef __i686
		27	# define __i686 __i686
		28	#endif
		29
25	#define PARMS LINKAGE+4 /* Preserve EBX. */	30	#define PARMS LINKAGE+4 /* Preserve EBX. */
26	#define BLK1 PARMS	31	#define BLK1 PARMS
27	#define BLK2 BLK1+PTR_SIZE	32	#define BLK2 BLK1+PTR_SIZE

Lines 117-122 Link Here

(-)./sysdeps/unix/sysv/linux/i386/sysdep.h.orig (+4 lines)
117	ret; \	117	ret; \
118	.previous	118	.previous
119	# else	119	# else
		120	# ifdef __i686
		121	# undef __i686
		122	# define __i686 __i686
		123	# endif
120	# define SETUP_PIC_REG(reg) \	124	# define SETUP_PIC_REG(reg) \
121	.section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits; \	125	.section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits; \
122	.globl __i686.get_pc_thunk.reg; \	126	.globl __i686.get_pc_thunk.reg; \

Lines 24-29 Link Here

(-)./linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h.orig (+5 lines)
24	# include <linuxthreads/internals.h>	24	# include <linuxthreads/internals.h>
25	#endif	25	#endif
26		26
		27	#if defined(PIC) && defined(__i686)
		28	# undef __i686
		29	# define __i686 __i686
		30	#endif
		31
27	#if !defined NOT_IN_libc \|\| defined IS_IN_libpthread \|\| defined IS_IN_librt	32	#if !defined NOT_IN_libc \|\| defined IS_IN_libpthread \|\| defined IS_IN_librt
28		33
29	# undef PSEUDO	34	# undef PSEUDO

Lines 22-27 Link Here

(-)./linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S.orig (+6 lines)
22	#include <bits/errno.h>	22	#include <bits/errno.h>
23	#include <kernel-features.h>	23	#include <kernel-features.h>
24		24
		25	#ifdef __i686
		26	# undef __i686
		27	# define __i686 __i686
		28	#endif
		29
		30
25	/* Clone the calling process, but without copying the whole address space.	31	/* Clone the calling process, but without copying the whole address space.
26	The calling process is suspended until the new process exits or is	32	The calling process is suspended until the new process exits or is
27	replaced by a call to `execve'. Return -1 for errors, 0 to the new process,	33	replaced by a call to `execve'. Return -1 for errors, 0 to the new process,

Return to bug 411