Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/linux/3.0.9/100-headers_install-fix-__packed-in-exported-kernel-head.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 2735 f09ed6dd71a3
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     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;
crosstool-ng