diff options
| author | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
| commit | f1c18afafc2b321465ae6b07ede127095942d7dc (patch) | |
| tree | 812093eebfa8510367718c12c02f7da03c0e73bf /gcc-4.9/gcc/gcov-tool.c | |
| parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
| download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip | |
[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch
Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.
Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2
Diffstat (limited to 'gcc-4.9/gcc/gcov-tool.c')
| -rw-r--r-- | gcc-4.9/gcc/gcov-tool.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/gcc-4.9/gcc/gcov-tool.c b/gcc-4.9/gcc/gcov-tool.c index f15e6f33f..e7b551e3b 100644 --- a/gcc-4.9/gcc/gcov-tool.c +++ b/gcc-4.9/gcc/gcov-tool.c @@ -61,17 +61,22 @@ extern void lipo_set_substitute_string (const char *); -- otherwise we get duplicated defintions. Make the defines weak to link with other objects/libraries that potentially compiled with -fprofile-generate. */ +#if !defined(_WIN32) +#define WEAK_ATTR __attribute__ ((weak)) +#else +#define WEAK_ATTR +#endif -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_grouping_algorithm; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_merge_modu_edges; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_weak_inclusion; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_max_mem; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_comdat_algorithm; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_random_group_size; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_cutoff; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_random_seed; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_dump_cgraph; -__attribute__ ((weak)) gcov_unsigned_t __gcov_lipo_propagate_scale; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_grouping_algorithm; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_merge_modu_edges; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_weak_inclusion; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_max_mem; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_comdat_algorithm; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_random_group_size; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_cutoff; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_random_seed; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_dump_cgraph; +WEAK_ATTR gcov_unsigned_t __gcov_lipo_propagate_scale; #else gcov_unsigned_t __gcov_lipo_grouping_algorithm; gcov_unsigned_t __gcov_lipo_merge_modu_edges; @@ -85,6 +90,8 @@ gcov_unsigned_t __gcov_lipo_dump_cgraph; gcov_unsigned_t __gcov_lipo_propagate_scale; #endif +#undef WEAK_ATTR + /* Set to verbose output mode. */ static bool verbose; |