Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.13/190-localedef-mmap.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     1 sniped from Debian

     2 http://bugs.gentoo.org/289615

     3 

     4 2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>

     5 

     6 	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory

     7 	used later with MMAP_FIXED | MMAP_SHARED to cope with different

     8 	alignment restrictions.

     9 

    10 diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c

    11 --- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200

    12 +++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100

    13 @@ -134,7 +134,7 @@

    14    size_t reserved = RESERVE_MMAP_SIZE;

    15    int xflags = 0;

    16    if (total < reserved

    17 -      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

    18 +      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

    19  		       -1, 0)) != MAP_FAILED))

    20      xflags = MAP_FIXED;

    21    else

    22 @@ -396,7 +396,7 @@

    23    size_t reserved = RESERVE_MMAP_SIZE;

    24    int xflags = 0;

    25    if (total < reserved

    26 -      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

    27 +      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

    28  		       -1, 0)) != MAP_FAILED))

    29      xflags = MAP_FIXED;

    30    else

    31 @@ -614,7 +614,7 @@

    32    int xflags = 0;

    33    void *p;

    34    if (st.st_size < reserved

    35 -      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

    36 +      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

    37  		       -1, 0)) != MAP_FAILED))

    38      xflags = MAP_FIXED;

    39    else
crosstool-ng