From f3ffbb86e6ce49dc92a7f625eba07e768ffe1d87 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Thu, 23 Jul 2009 17:16:15 +0100
Subject: [PATCH] --- yaml --- r: 156244 b: refs/heads/master c:
 bd171d5ffc5cb2ba471e8205c679ee9d12b90116 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/recordmcount.pl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98d5d188461e..2aa5777724cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc4c73554c9d93b3e495f2f7acae1323b0d5db84
+refs/heads/master: bd171d5ffc5cb2ba471e8205c679ee9d12b90116
diff --git a/trunk/scripts/recordmcount.pl b/trunk/scripts/recordmcount.pl
index 16c5563b4129..d29baa2e063a 100755
--- a/trunk/scripts/recordmcount.pl
+++ b/trunk/scripts/recordmcount.pl
@@ -403,7 +403,6 @@ sub update_funcs
     # section found, now is this a start of a function?
     } elsif ($read_function && /$function_regex/) {
 	$text_found = 1;
-	$offset = hex $1;
 	$text = $2;
 
 	# if this is either a local function or a weak function
@@ -412,10 +411,12 @@ sub update_funcs
 	if (!defined($locals{$text}) && !defined($weak{$text})) {
 	    $ref_func = $text;
 	    $read_function = 0;
+	    $offset = hex $1;
 	} else {
 	    # if we already have a function, and this is weak, skip it
 	    if (!defined($ref_func) && !defined($weak{$text})) {
 		$ref_func = $text;
+		$offset = hex $1;
 	    }
 	}
     } elsif ($read_headers && /$mcount_section/) {