patches/glibc/ports-2.13/350-pre20040117-pt_pax.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)
     1 
     2 
     3 diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
     4 --- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
     5 +++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
     6 @@ -580,6 +580,7 @@
     7  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
     8  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
     9  #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
    10 +#define PT_PAX_FLAGS	0x65041580	/* Indicates PaX flag markings */
    11  #define PT_LOSUNW	0x6ffffffa
    12  #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
    13  #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
    14 @@ -593,6 +594,18 @@
    15  #define PF_X		(1 << 0)	/* Segment is executable */
    16  #define PF_W		(1 << 1)	/* Segment is writable */
    17  #define PF_R		(1 << 2)	/* Segment is readable */
    18 +#define PF_PAGEEXEC	(1 << 4)	/* Enable  PAGEEXEC */
    19 +#define PF_NOPAGEEXEC	(1 << 5)	/* Disable PAGEEXEC */
    20 +#define PF_SEGMEXEC	(1 << 6)	/* Enable  SEGMEXEC */
    21 +#define PF_NOSEGMEXEC	(1 << 7)	/* Disable SEGMEXEC */
    22 +#define PF_MPROTECT	(1 << 8)	/* Enable  MPROTECT */
    23 +#define PF_NOMPROTECT	(1 << 9)	/* Disable MPROTECT */
    24 +#define PF_RANDEXEC	(1 << 10)	/* Enable  RANDEXEC */
    25 +#define PF_NORANDEXEC	(1 << 11)	/* Disable RANDEXEC */
    26 +#define PF_EMUTRAMP	(1 << 12)	/* Enable  EMUTRAMP */
    27 +#define PF_NOEMUTRAMP	(1 << 13)	/* Disable EMUTRAMP */
    28 +#define PF_RANDMMAP	(1 << 14)	/* Enable  RANDMMAP */
    29 +#define PF_NORANDMMAP	(1 << 15)	/* Disable RANDMMAP */
    30  #define PF_MASKOS	0x0ff00000	/* OS-specific */
    31  #define PF_MASKPROC	0xf0000000	/* Processor-specific */
    32