generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"

Browse Source 
* commit '0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c':
  Fix TIMING/STATS/COUNT_PAGES dynamic linker build
This commit is contained in:
Elliott Hughes 2013-03-06 09:41:56 -08:00 committed by Android Git Automerger
commit 50a2cd865e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linker/linker.cpp
View File

@ -1744,13 +1744,13 @@ static unsigned __linker_init_post_relocation(KernelArgumentBlock& args, unsigne
#if TIMING #if TIMING
gettimeofday(&t1,NULL); gettimeofday(&t1,NULL);
PRINT("LINKER TIME: %s: %d microseconds\n", e.argv[0], (int) ( PRINT("LINKER TIME: %s: %d microseconds\n", args.argv[0], (int) (
(((long long)t1.tv_sec * 1000000LL) + (long long)t1.tv_usec) - (((long long)t1.tv_sec * 1000000LL) + (long long)t1.tv_usec) -
(((long long)t0.tv_sec * 1000000LL) + (long long)t0.tv_usec) (((long long)t0.tv_sec * 1000000LL) + (long long)t0.tv_usec)
)); ));
#endif #endif
#if STATS #if STATS
PRINT("RELO STATS: %s: %d abs, %d rel, %d copy, %d symbol\n", e.argv[0], PRINT("RELO STATS: %s: %d abs, %d rel, %d copy, %d symbol\n", args.argv[0],
linker_stats.count[kRelocAbsolute], linker_stats.count[kRelocAbsolute],
linker_stats.count[kRelocRelative], linker_stats.count[kRelocRelative],
linker_stats.count[kRelocCopy], linker_stats.count[kRelocCopy],
@ -1772,7 +1772,7 @@ static unsigned __linker_init_post_relocation(KernelArgumentBlock& args, unsigne
} }
} }
} }
PRINT("PAGES MODIFIED: %s: %d (%dKB)\n", e.argv[0], count, count * 4); PRINT("PAGES MODIFIED: %s: %d (%dKB)\n", args.argv[0], count, count * 4);
} }
#endif #endif