fix __WORDSIZE on x32 sys/user.h

[musl] / arch / x32 / bits / user.h

diff --git a/arch/x32/bits/user.h b/arch/x32/bits/user.h
index 8b42632..eac82a1 100644 (file)
--- a/arch/x32/bits/user.h
+++ b/arch/x32/bits/user.h
@@ -1,16 +1,14 @@
 #undef __WORDSIZE
-#define __WORDSIZE 64
+#define __WORDSIZE 32
 
-typedef struct user_fpregs_struct
-{
+typedef struct user_fpregs_struct {
        uint16_t cwd, swd, ftw, fop;
        uint64_t rip, rdp;
-       uint32_t mxcsr, mxcs_mask;
+       uint32_t mxcsr, mxcr_mask;
        uint32_t st_space[32], xmm_space[64], padding[24];
 } elf_fpregset_t;
 
-struct user_regs_struct
-{
+struct user_regs_struct {
        unsigned long r15, r14, r13, r12, rbp, rbx, r11, r10, r9, r8;
        unsigned long rax, rcx, rdx, rsi, rdi, orig_rax, rip;
        unsigned long cs, eflags, rsp, ss, fs_base, gs_base, ds, es, fs, gs;
@@ -18,8 +16,7 @@ struct user_regs_struct
 #define ELF_NGREG 27
 typedef unsigned long long elf_greg_t, elf_gregset_t[ELF_NGREG];
 
-struct user
-{
+struct user {
        struct user_regs_struct         regs;
        int                             u_fpvalid;
        struct user_fpregs_struct       i387;
@@ -37,8 +34,8 @@ struct user
        unsigned long                   u_debugreg[8];
 };
 
-#define PAGE_MASK              (~(PAGE_SIZE-1))
-#define NBPG                   PAGE_SIZE
+#define PAGE_MASK              (~(PAGESIZE-1))
+#define NBPG                   PAGESIZE
 #define UPAGES                 1
 #define HOST_TEXT_START_ADDR   (u.start_code)
 #define HOST_STACK_END_ADDR    (u.start_stack + u.u_ssize * NBPG)