* [patch] s390: sys/user.h definitions.
@ 2005-12-16 18:59 Martin Schwidefsky
2005-12-20 6:23 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Martin Schwidefsky @ 2005-12-16 18:59 UTC (permalink / raw)
To: libc-hacker
Hi,
including asm/user.h in the s390 version of sys/user.h can lead
to a problem with clashing definitions in kernel vs. user headers:
In file included from ./sys/ustat.h:30,
from ../sysdeps/unix/sysv/linux/ustat.c:21:
../sysdeps/generic/bits/ustat.h:26: error: redefinition of struct ustat
This error comes up because sys/user.h includes asm/user.h which includes
asm/ptrace.h which includes linux/types.h which has a definition of
struct ustat.
To avoid any more problems with including sys/user.h the attached patch
creates a user space version of the kernel header. The patch has been
used without problems for quite some time now.
blue skies,
Martin.
2005-12-16 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/sys/user.h: Copy struct user and
dependent definitions from the kernel header to sys/user.h and
remove the #include of asm/user.h.
diff -urpN libc/sysdeps/unix/sysv/linux/s390/sys/user.h libc-s390/sysdeps/unix/sysv/linux/s390/sys/user.h
--- libc/sysdeps/unix/sysv/linux/s390/sys/user.h 2001-07-06 06:56:20.000000000 +0200
+++ libc-s390/sysdeps/unix/sysv/linux/s390/sys/user.h 2005-07-11 15:37:26.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000,2005 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
@@ -19,6 +19,65 @@
#ifndef _SYS_USER_H
#define _SYS_USER_H 1
-#include <asm/user.h>
+/* The whole purpose of this file is for GDB and GDB only. Don't read
+ too much into it. Don't use it for anything other than GDB unless
+ you know what you are doing. */
+
+struct _user_psw_struct
+{
+ unsigned long mask;
+ unsigned long addr;
+};
+
+struct _user_fpregs_struct
+{
+ unsigned int fpc;
+ double fprs[16];
+};
+
+struct _user_per_struct
+{
+ unsigned long control_regs[3];
+ unsigned single_step : 1;
+ unsigned instruction_fetch : 1;
+ unsigned : 30;
+ unsigned long starting_addr;
+ unsigned long ending_addr;
+ unsigned short perc_atmid;
+ unsigned long address;
+ unsigned char access_id;
+};
+
+struct _user_regs_struct
+{
+ struct _user_psw_struct psw; /* Program status word. */
+ unsigned long gprs[16]; /* General purpose registers. */
+ unsigned int acrs[16]; /* Access registers. */
+ unsigned long orig_gpr2; /* Original gpr2. */
+ struct _user_fpregs_struct fp_regs; /* Floating point registers. */
+ struct _user_per_struct per_info; /* Hardware tracing registers. */
+ unsigned long ieee_instruction_pointer;
+};
+
+struct user {
+ struct _user_regs_struct regs; /* User registers. */
+ unsigned long int u_tsize; /* Text segment size (pages). */
+ unsigned long int u_dsize; /* Data segment size (pages). */
+ unsigned long int u_ssize; /* Stack segment size (pages). */
+ unsigned long start_code; /* Starting address of text. */
+ unsigned long start_stack; /* Starting address of stack area. */
+ long int signal; /* Signal causing the core dump. */
+ struct _user_regs_struct *u_ar0; /* Help gdb find registers. */
+ unsigned long magic; /* Identifies a core file. */
+ char u_comm[32]; /* User command naem. */
+};
+
+#define PAGE_SHIFT 12
+#define PAGE_SIZE (1UL << PAGE_SHIFT)
+#define PAGE_MASK (~(PAGE_SIZE-1))
+#define NBPG PAGE_SIZE
+#define UPAGES 1
+#define HOST_TEXT_START_ADDR (u.start_code)
+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
#endif /* _SYS_USER_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch] s390: sys/user.h definitions.
2005-12-16 18:59 [patch] s390: sys/user.h definitions Martin Schwidefsky
@ 2005-12-20 6:23 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2005-12-20 6:23 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: libc-hacker
Applied.
--
⧠Ulrich Drepper ⧠Red Hat, Inc. ⧠444 Castro St ⧠Mountain View, CA â
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-12-20 6:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-12-16 18:59 [patch] s390: sys/user.h definitions Martin Schwidefsky
2005-12-20 6:23 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).