patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
changeset 2809 4cd9134739b5
parent 2735 f09ed6dd71a3
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>
     1 commit f210735fe2f17a6225432ee3d1239bcf23a8659c
     2 Author: Markus Trippelsdorf <markus@trippelsdorf.de>
     3 Date:   Fri Jun 24 15:51:00 2011 +0200
     4 
     5     headers_install: fix __packed in exported kernel headers
     6     
     7     checkpatch.pl warns about using __attribute__((packed)) in kernel
     8     headers: "__packed is preferred over __attribute__((packed))". If one
     9     follows that advice it could cause problems in the exported header
    10     files, because the outside world doesn't know about this shortcut.
    11     
    12     For example busybox will fail to compile:
    13      CC      miscutils/ubi_attach_detach.o
    14      In file included from miscutils/ubi_attach_detach.c:27:0:
    15      /usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
    16      /usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
    17     ...
    18     
    19     Fix the problem by substituting __packed with __attribute__((packed)) in
    20     the header_install.pl script.
    21     
    22     Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    23     CC: Joe Perches <joe@perches.com>
    24     Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    25     Signed-off-by: Michal Marek <mmarek@suse.cz>
    26 
    27 diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
    28 index efb3be1..48462be 100644
    29 --- a/scripts/headers_install.pl
    30 +++ b/scripts/headers_install.pl
    31 @@ -35,6 +35,7 @@ foreach my $file (@files) {
    32  		$line =~ s/([\s(])__iomem\s/$1/g;
    33  		$line =~ s/\s__attribute_const__\s/ /g;
    34  		$line =~ s/\s__attribute_const__$//g;
    35 +		$line =~ s/\b__packed\b/__attribute__((packed))/g;
    36  		$line =~ s/^#include <linux\/compiler.h>//;
    37  		$line =~ s/(^|\s)(inline)\b/$1__$2__/g;
    38  		$line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;