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

Pull kbuild misc updates from Michal Marek:
 "This is the non-critical part of kbuild for v3.16-rc1:
   - make deb-pkg can do s390x and arm64
   - new patterns in scripts/tags.sh
   - scripts/tags.sh skips userspace tools' sources (which sometimes
     have copies of kernel structures) and symlinks
   - improvements to the objdiff tool
   - two new coccinelle patches
   - other minor fixes"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts: objdiff: support directories for the augument of record command
  scripts: objdiff: fix a comment
  scripts: objdiff: change the extension of disassembly from .o to .dis
  scripts: objdiff: improve path flexibility for record command
  scripts: objdiff: remove unnecessary code
  scripts: objdiff: direct error messages to stderr
  scripts: objdiff: get the path to .tmp_objdiff more simply
  deb-pkg: Add automatic support for s390x architecture
  coccicheck: Add unneeded return variable test
  kbuild: Fix a typo in documentation
  kbuild: trivial - use tabs for code indent where possible
  kbuild: trivial - remove trailing empty lines
  coccinelle: Check for missing NULL terminators in of_device_id tables
  scripts/tags.sh: ignore symlink'ed source files
  scripts/tags.sh: add regular expression replacement pattern for memcg
  builddeb: add arm64 in the supported architectures
  builddeb: use $OBJCOPY variable instead of objcopy
  scripts/tags.sh: ignore code of user space tools
  scripts/tags.sh: add pattern for DEFINE_HASHTABLE
  .gitignore: ignore Module.symvers in all directories

3 files changed, 6 insertions, 6 deletions

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index c5d473393816..99ca6e76eb0a 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -143,4 +143,3 @@ help: FORCE
         @echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
         @echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
         @echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
-
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b151b63f9be3..b5f08f727868 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -35,13 +35,15 @@ create_package() {
         sparc*)
                 debarch=sparc ;;
         s390*)
-                debarch=s390 ;;
+                debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
         ppc*)
                 debarch=powerpc ;;
         parisc*)
                 debarch=hppa ;;
         mips*)
                 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
+        arm64)
+                debarch=arm64 ;;
         arm*)
                 debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
         *)
@@ -155,11 +157,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
                         for module in $(find lib/modules/ -name *.ko); do
                                 mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
                                 # only keep debug symbols in the debug file
-                                objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
+                                $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
                                 # strip original module from debug symbols
-                                objcopy --strip-debug $module
+                                $OBJCOPY --strip-debug $module
                                 # then add a link to those
-                                objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
+                                $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
                         done
                 )
         fi
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index aa22f9447ddc..995c1eafaff6 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -136,4 +136,3 @@ esac
 echo "Tarball successfully created in ${tarball}${file_ext}"
 
 exit 0
-