From d79a9c949c84e7f0ba33e87447c47af833e9f11a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 May 2011 01:35:07 -0400 Subject: [PATCH] Cleanup x86-64 sys/user.h --- ChangeLog | 4 ++ NEWS | 12 ++--- sysdeps/unix/sysv/linux/x86_64/sys/user.h | 86 +++++++++++++++---------------- 3 files changed, 53 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d3cf6d..f7f2618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-05-16 Ulrich Drepper + [BZ #11820] + * sysdeps/unix/sysv/linux/x86_64/sys/user.h + (struct user_fpregs_struct): Avoid __uint*_t types. + [BZ #6420] * malloc/mtrace.c (tr_where): Add additional parameter to point to symbol info. Use it instead of calling _dl_addr locally. diff --git a/NEWS b/NEWS index df4932d..ad92348 100644 --- a/NEWS +++ b/NEWS @@ -10,12 +10,12 @@ Version 2.14 * The following bugs are resolved with this release: 386, 6420, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258, - 11487, 11532, 11578, 11653, 11668, 11724, 11901, 11945, 11947, 11952, - 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432, - 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510, 12511, - 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601, - 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12681, 12685, - 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746 + 11487, 11532, 11578, 11653, 11668, 11724, 11820, 11901, 11945, 11947, + 11952, 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420, + 12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510, + 12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597, + 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12681, + 12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746 * The RPC implementation in libc is obsoleted. Old programs keep working but new programs cannot be linked with the routines in libc anymore. diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/user.h b/sysdeps/unix/sysv/linux/x86_64/sys/user.h index ceadcf4..c54cca8 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sys/user.h +++ b/sysdeps/unix/sysv/linux/x86_64/sys/user.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2004, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,48 +29,48 @@ struct user_fpregs_struct { - __uint16_t cwd; - __uint16_t swd; - __uint16_t ftw; - __uint16_t fop; - __uint64_t rip; - __uint64_t rdp; - __uint32_t mxcsr; - __uint32_t mxcr_mask; - __uint32_t st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ - __uint32_t xmm_space[64]; /* 16*16 bytes for each XMM-reg = 256 bytes */ - __uint32_t padding[24]; + unsigned short int cwd; + unsigned short int swd; + unsigned short int ftw; + unsigned short int fop; + unsigned long int rip; + unsigned long int rdp; + unsigned int mxcsr; + unsigned int mxcr_mask; + unsigned int st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ + unsigned int xmm_space[64]; /* 16*16 bytes for each XMM-reg = 256 bytes */ + unsigned int padding[24]; }; struct user_regs_struct { - unsigned long r15; - unsigned long r14; - unsigned long r13; - unsigned long r12; - unsigned long rbp; - unsigned long rbx; - unsigned long r11; - unsigned long r10; - unsigned long r9; - unsigned long r8; - unsigned long rax; - unsigned long rcx; - unsigned long rdx; - unsigned long rsi; - unsigned long rdi; - unsigned long orig_rax; - unsigned long rip; - unsigned long cs; - unsigned long eflags; - unsigned long rsp; - unsigned long ss; - unsigned long fs_base; - unsigned long gs_base; - unsigned long ds; - unsigned long es; - unsigned long fs; - unsigned long gs; + unsigned long int r15; + unsigned long int r14; + unsigned long int r13; + unsigned long int r12; + unsigned long int rbp; + unsigned long int rbx; + unsigned long int r11; + unsigned long int r10; + unsigned long int r9; + unsigned long int r8; + unsigned long int rax; + unsigned long int rcx; + unsigned long int rdx; + unsigned long int rsi; + unsigned long int rdi; + unsigned long int orig_rax; + unsigned long int rip; + unsigned long int intcs; + unsigned long int eflags; + unsigned long int rsp; + unsigned long int ss; + unsigned long int fs_base; + unsigned long int gs_base; + unsigned long int ds; + unsigned long int es; + unsigned long int fs; + unsigned long int gs; }; struct user @@ -81,8 +81,8 @@ struct user unsigned long int u_tsize; unsigned long int u_dsize; unsigned long int u_ssize; - unsigned long start_code; - unsigned long start_stack; + unsigned long int start_code; + unsigned long int start_stack; long int signal; int reserved; struct user_regs_struct* u_ar0; @@ -152,8 +152,8 @@ struct user unsigned long int u_tsize; unsigned long int u_dsize; unsigned long int u_ssize; - unsigned long start_code; - unsigned long start_stack; + unsigned long int start_code; + unsigned long int start_stack; long int signal; int reserved; struct user_regs_struct* u_ar0; -- 2.7.4