r1068 - in trunk/glibc-2.3-head: linuxthreads/kfreebsd/x86_64 linuxthreads/kfreebsd/x86_64/asm sysdeps/kfreebsd/x86_64 sysdeps/kfreebsd/x86_64/bits
Author: ps-guest
Date: 2006-01-18 18:29:22 +0000 (Wed, 18 Jan 2006)
New Revision: 1068
Added:
trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/asm/
trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/asm/prctl.h
Modified:
trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/sysdep-cancel.h
trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/tls.h
trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/bits/sigcontext.h
trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/start_thread.S
Log:
* amd64 fixes
Added: trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/asm/prctl.h
===================================================================
--- trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/asm/prctl.h 2006-01-18 14:13:52 UTC (rev 1067)
+++ trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/asm/prctl.h 2006-01-18 18:29:22 UTC (rev 1068)
@@ -0,0 +1 @@
+/* placeholder to make linuxthreads/sysdeps/x86_64/pt-machine.h happy */
Modified: trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/sysdep-cancel.h
===================================================================
--- trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/sysdep-cancel.h 2006-01-18 14:13:52 UTC (rev 1067)
+++ trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/sysdep-cancel.h 2006-01-18 18:29:22 UTC (rev 1068)
@@ -50,16 +50,16 @@
movq %rax, (%rsp); \
movq $SYS_ify (syscall_name), %rax; \
syscall; \
- popq %rdi; cfi_adjust_cfa_offset(-8) \
- pushfq; cfi_adjust_cfa_offset(8) \
+ popq %rdi; cfi_adjust_cfa_offset(-8); \
+ pushfq; cfi_adjust_cfa_offset(8); \
/* Save %rax since it's the error code from the syscall. */ \
movq %rax, 8(%rsp); \
CDISABLE \
- popfq; cfi_adjust_cfa_offset(-8) \
+ popfq; cfi_adjust_cfa_offset(-8); \
/* fetch the error code from the syscall. */ \
- popq %rax; cfi_adjust_cfa_offset(-8) \
+ popq %rax; cfi_adjust_cfa_offset(-8); \
/* adjust rsp, do not change flags */ \
- popq %rdx; cfi_adjust_cfa_offset(-8) \
+ popq %rdx; cfi_adjust_cfa_offset(-8); \
jb SYSCALL_ERROR_LABEL; \
L(pseudo_end):
Modified: trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/tls.h
===================================================================
--- trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/tls.h 2006-01-18 14:13:52 UTC (rev 1067)
+++ trunk/glibc-2.3-head/linuxthreads/kfreebsd/x86_64/tls.h 2006-01-18 18:29:22 UTC (rev 1068)
@@ -47,7 +47,7 @@
\
asm volatile ("syscall" \
: "=a" (_result) \
- : "0" ((unsigned long int) (SYS_sysarch), \
+ : "0" ((unsigned long int) SYS_sysarch), \
"D" ((unsigned long int) AMD64_SET_FSBASE), \
"S" (&_descr) \
: "memory", "cc", "cx", "dx", "r8", "r9", "r10", "r11"); \
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/bits/sigcontext.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/bits/sigcontext.h 2006-01-18 14:13:52 UTC (rev 1067)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/bits/sigcontext.h 2006-01-18 18:29:22 UTC (rev 1068)
@@ -69,8 +69,8 @@
* those in mcontext_t.
*/
struct sigcontext {
- struct __sigset sc_mask; /* signal mask to restore */
- long sc_onstack; /* sigstack state to restore */
+ __sigset_t sc_mask; /* signal mask to restore */
+ long sc_onstack; /* sigstack state to restore */
long sc_rdi; /* machine state (struct trapframe) */
long sc_rsi;
long sc_rdx;
@@ -95,7 +95,7 @@
long sc_rflags;
long sc_rsp;
long sc_ss;
- long sc_len; /* sizeof(mcontext_t) */
+ long sc_len; /* sizeof(mcontext_t) */
/*
* XXX - See <machine/ucontext.h> and <machine/fpu.h> for
* the following fields.
Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/start_thread.S
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/start_thread.S 2006-01-18 14:13:52 UTC (rev 1067)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/x86_64/start_thread.S 2006-01-18 18:29:22 UTC (rev 1068)
@@ -53,7 +53,7 @@
ENTRY (__start_thread)
/* Insert the argument onto the new aligned stack. */
- andq $-16 %rsi
+ andq $-16,%rsi
subq $16,%rsi
movq %rcx,8(%rsi)
@@ -142,7 +142,7 @@
jnz L(child)
/* Save the child pid, currently in %rax. */
- movl %rax, 0(%rsp)
+ movq %rax, 0(%rsp)
/* Restore the previous signal mask. */
movq $SIG_SETMASK, %rdi
@@ -159,7 +159,7 @@
L(error_unmask):
/* Save the error code, currently in %rax. */
- movl %rax, 0(%rsp)
+ movq %rax, 0(%rsp)
/* Restore the previous signal mask. */
movq $SIG_SETMASK, %rdi
Reply to: