diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 17:14:25 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 17:14:25 +0900 |
| commit | 236573d2405d6b9fa5395d14731c2ec2f8cb8f4f (patch) | |
| tree | ff261b48f83b55785d146a36d88fa2a51479e247 /scripts | |
| parent | 97aee1b8e444d0aa4904fb5d4850c9490e5b9935 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into dt3-base
Linux 3.13-rc3
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
drivers/pinctrl/sh-pfc/pfc-sh7372.c
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index d0da66396f62..91280b82da08 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -364,7 +364,8 @@ if ($arch eq "x86_64") { } elsif ($arch eq "blackfin") { $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; $mcount_adjust = -4; -} elsif ($arch eq "tilegx") { +} elsif ($arch eq "tilegx" || $arch eq "tile") { + # Default to the newer TILE-Gx architecture if only "tile" is given. $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$"; $type = ".quad"; $alignment = 8; |