Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
  kbuild: introduce ccflags-y, asflags-y and ldflags-y
  kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
  kbuild: enable use of AFLAGS and CFLAGS on commandline
  kbuild: enable 'make AFLAGS=...' to add additional options to AS
  kbuild: fix AFLAGS use in h8300 and m68knommu
  kbuild: check for wrong use of CFLAGS
  kbuild: enable 'make CFLAGS=...' to add additional options to CC
  kbuild: fix up CFLAGS usage
  kbuild: make modpost detect unterminated device id lists
  kbuild: call export_report from the Makefile
  kbuild: move Kai Germaschewski to CREDITS
  kconfig/menuconfig: distinguish between selected-by-another options and comments
  kconfig: tristate choices with mixed tristate and boolean values
  include/linux/Kbuild: remove duplicate entries
  kbuild: kill backward compatibility checks
  kbuild: kill EXTRA_ARFLAGS
  kbuild: fix documentation in makefiles.txt
  kbuild: call make once for all targets when O=.. is used
  kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
  kbuild: update _shipped files for kconfig syntax cleanup
  ...

Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/export_report.pl b/scripts/export_report.pl
index 9ed00d9bb0..705b5ba7c1 100644
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -103,16 +103,16 @@ foreach my $thismod (@allcfiles) {
         my $state=0;
         while ( <MODULE_MODULE> ) {
                 chomp;
-                if ($state eq 0) {
+                if ($state == 0) {
                         $state = 1 if ($_ =~ /static const struct modversion_info/);
                         next;
                 }
-                if ($state eq 1) {
+                if ($state == 1) {
                         $state = 2 if ($_ =~ /__attribute__\(\(section\("__versions"\)\)\)/);
                         next;
                 }
-                if ($state eq 2) {
-                        if ( $_ !~ /0x[0-9a-f]{7,8},/ ) {
+                if ($state == 2) {
+                        if ( $_ !~ /0x[0-9a-f]+,/ ) {
                                 next;
                         }
                         my $sym = (split /([,"])/,)[4];
@@ -121,7 +121,7 @@ foreach my $thismod (@allcfiles) {
                         push(@{$MODULE{$thismod}} , $sym);
                 }
         }
-        if ($state ne 2) {
+        if ($state != 2) {
                 print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n";
         }
         close(MODULE_MODULE);