Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild changes from Michal Marek:
 "Kbuild commits for v3.10-rc1:

   - Fix make mrproper after mod/file2alias rework
   - Fix ld-option Makefile function
   - Rewrite headers_install to shell to drop Perl dependency.

  There are some more patches I have to look at, so I might send another
  pull request later.  Or just queue them for 3.11."

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Fix cleaning in scripts/mod
  headers_install.pl: convert to headers_install.sh
  kbuild: fix ld-option function

1 files changed, 43 insertions, 0 deletions

diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
new file mode 100644
index 000000000000..643764f53ea7
--- /dev/null
+++ b/scripts/headers_install.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+if [ $# -lt 1 ]
+then
+        echo "Usage: headers_install.sh OUTDIR [FILES...]
+        echo
+        echo "Prepares kernel header files for use by user space, by removing"
+        echo "all compiler.h definitions and #includes, removing any"
+        echo "#ifdef __KERNEL__ sections, and putting __underscores__ around"
+        echo "asm/inline/volatile keywords."
+        echo
+        echo "OUTDIR: directory to write each userspace header FILE to."
+        echo "FILES:  list of header files to operate on."
+
+        exit 1
+fi
+
+# Grab arguments
+
+OUTDIR="$1"
+shift
+
+# Iterate through files listed on command line
+
+FILE=
+trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT
+for i in "$@"
+do
+        FILE="$(basename "$i")"
+        sed -r \
+                -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
+                -e 's/__attribute_const__([ \t]|$)/\1/g' \
+                -e 's@^#include <linux/compiler.h>@@' \
+                -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
+                -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
+                -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
+                "$i" > "$OUTDIR/$FILE.sed" || exit 1
+        scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
+                > "$OUTDIR/$FILE"
+        [ $? -gt 1 ] && exit 1
+        rm -f "$OUTDIR/$FILE.sed"
+done
+trap - EXIT