patches/glibc/ports-2.13/330-m68k-sys-user.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@2438
     1
copied from kernel as it is sanitized now
yann@2438
     2
yann@2438
     3
diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
yann@2438
     4
--- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
yann@2438
     5
+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
yann@2438
     6
@@ -1,3 +1,90 @@
yann@2438
     7
+#ifndef _SYS_USER_H
yann@2438
     8
+#define _SYS_USER_H
yann@2438
     9
+
yann@2438
    10
+/* Core file format: The core file is written in such a way that gdb
yann@2438
    11
+   can understand it and provide useful information to the user (under
yann@2438
    12
+   linux we use the 'trad-core' bfd).  There are quite a number of
yann@2438
    13
+   obstacles to being able to view the contents of the floating point
yann@2438
    14
+   registers, and until these are solved you will not be able to view the
yann@2438
    15
+   contents of them.  Actually, you can read in the core file and look at
yann@2438
    16
+   the contents of the user struct to find out what the floating point
yann@2438
    17
+   registers contain.
yann@2438
    18
+   The actual file contents are as follows:
yann@2438
    19
+   UPAGE: 1 page consisting of a user struct that tells gdb what is present
yann@2438
    20
+   in the file.  Directly after this is a copy of the task_struct, which
yann@2438
    21
+   is currently not used by gdb, but it may come in useful at some point.
yann@2438
    22
+   All of the registers are stored as part of the upage.  The upage should
yann@2438
    23
+   always be only one page.
yann@2438
    24
+   DATA: The data area is stored.  We use current->end_text to
yann@2438
    25
+   current->brk to pick up all of the user variables, plus any memory
yann@2438
    26
+   that may have been malloced.  No attempt is made to determine if a page
yann@2438
    27
+   is demand-zero or if a page is totally unused, we just cover the entire
yann@2438
    28
+   range.  All of the addresses are rounded in such a way that an integral
yann@2438
    29
+   number of pages is written.
yann@2438
    30
+   STACK: We need the stack information in order to get a meaningful
yann@2438
    31
+   backtrace.  We need to write the data from (esp) to
yann@2438
    32
+   current->start_stack, so we round each of these off in order to be able
yann@2438
    33
+   to write an integer number of pages.
yann@2438
    34
+   The minimum core file size is 3 pages, or 12288 bytes.
yann@2438
    35
+*/
yann@2438
    36
+
yann@2438
    37
+struct user_m68kfp_struct {
yann@2438
    38
+	unsigned long  fpregs[8*3];	/* fp0-fp7 registers */
yann@2438
    39
+	unsigned long  fpcntl[3];	/* fp control regs */
yann@2438
    40
+};
yann@2438
    41
+
yann@2438
    42
+/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
yann@2438
    43
+   is still the layout used by user (the new pt_regs doesn't have
yann@2438
    44
+   all registers). */
yann@2438
    45
+struct user_regs_struct {
yann@2438
    46
+	long d1,d2,d3,d4,d5,d6,d7;
yann@2438
    47
+	long a0,a1,a2,a3,a4,a5,a6;
yann@2438
    48
+	long d0;
yann@2438
    49
+	long usp;
yann@2438
    50
+	long orig_d0;
yann@2438
    51
+	short stkadj;
yann@2438
    52
+	short sr;
yann@2438
    53
+	long pc;
yann@2438
    54
+	short fmtvec;
yann@2438
    55
+	short __fill;
yann@2438
    56
+};
yann@2438
    57
+
yann@2438
    58
+
yann@2438
    59
+/* When the kernel dumps core, it starts by dumping the user struct -
yann@2438
    60
+   this will be used by gdb to figure out where the data and stack segments
yann@2438
    61
+   are within the file, and what virtual addresses to use. */
yann@2438
    62
+struct user{
yann@2438
    63
+/* We start with the registers, to mimic the way that "memory" is returned
yann@2438
    64
+   from the ptrace(3,...) function.  */
yann@2438
    65
+  struct user_regs_struct regs;	/* Where the registers are actually stored */
yann@2438
    66
+/* ptrace does not yet supply these.  Someday.... */
yann@2438
    67
+  int u_fpvalid;		/* True if math co-processor being used. */
yann@2438
    68
+                                /* for this mess. Not yet used. */
yann@2438
    69
+  struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
yann@2438
    70
+/* The rest of this junk is to help gdb figure out what goes where */
yann@2438
    71
+  unsigned long int u_tsize;	/* Text segment size (pages). */
yann@2438
    72
+  unsigned long int u_dsize;	/* Data segment size (pages). */
yann@2438
    73
+  unsigned long int u_ssize;	/* Stack segment size (pages). */
yann@2438
    74
+  unsigned long start_code;     /* Starting virtual address of text. */
yann@2438
    75
+  unsigned long start_stack;	/* Starting virtual address of stack area.
yann@2438
    76
+				   This is actually the bottom of the stack,
yann@2438
    77
+				   the top of the stack is always found in the
yann@2438
    78
+				   esp register.  */
yann@2438
    79
+  long int signal;		/* Signal that caused the core dump. */
yann@2438
    80
+  int reserved;			/* No longer used */
yann@2438
    81
+  struct user_regs_struct *u_ar0;
yann@2438
    82
+				/* Used by gdb to help find the values for */
yann@2438
    83
+				/* the registers. */
yann@2438
    84
+  struct user_m68kfp_struct* u_fpstate;	/* Math Co-processor pointer. */
yann@2438
    85
+  unsigned long magic;		/* To uniquely identify a core file */
yann@2438
    86
+  char u_comm[32];		/* User command that was responsible */
yann@2438
    87
+};
yann@2438
    88
+#define NBPG 4096
yann@2438
    89
+#define UPAGES 1
yann@2438
    90
+#define HOST_TEXT_START_ADDR (u.start_code)
yann@2438
    91
+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
yann@2438
    92
+
yann@2438
    93
+#endif
yann@2438
    94
 /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
yann@2438
    95
    This file is part of the GNU C Library.
yann@2438
    96
 
yann@2438
    97
diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h