From: JinWang An Date: Tue, 3 Aug 2021 07:29:14 +0000 (+0900) Subject: Imported Upstream version 3.7.12 X-Git-Tag: upstream/3.7.12^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3569cac7f087d513d8e40a351032b438590b533;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.7.12 --- diff --git a/LICENSE.html b/LICENSE.html index f21cec6..b7543bf 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache copyright and license

-version 3.7.11 +version 3.7.12

Table of Contents

@@ -1235,9 +1235,9 @@ following license:

diff --git a/doc/AUTHORS.adoc b/doc/AUTHORS.adoc index c8b6119..9f88a4a 100644 --- a/doc/AUTHORS.adoc +++ b/doc/AUTHORS.adoc @@ -24,6 +24,7 @@ ccache is a collective work with contributions from many people, including: * Clemens Rabe * Cristian Adam * David Givone +* Deepak Yadav * Doug Anderson * Edward Z. Yang * Erik Johansson diff --git a/doc/AUTHORS.html b/doc/AUTHORS.html index 003f658..1f397ff 100644 --- a/doc/AUTHORS.html +++ b/doc/AUTHORS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache authors

-version 3.7.11 +version 3.7.12

Table of Contents

@@ -840,6 +840,11 @@ David Givone

+Deepak Yadav +

Doug Anderson

@@ -1281,9 +1286,9 @@ Yvan Janssens

diff --git a/doc/MANUAL.adoc b/doc/MANUAL.adoc index 19fc857..0b3cd1c 100644 --- a/doc/MANUAL.adoc +++ b/doc/MANUAL.adoc @@ -1098,6 +1098,13 @@ filesystems), but keep in mind that: A tip is to set *temporary_dir* to a directory on the local host to avoid NFS traffic for temporary files. +It is recommended to use the same operating system version when using a shared +cache. If operating system versions are different then system include files +will likely be different and there will be few or no cache hits between the +systems. One way of improving cache hit rate in that case is to set +<> to *system_headers* to ignore system +headers. + Using ccache with other compiler wrappers ----------------------------------------- diff --git a/doc/MANUAL.html b/doc/MANUAL.html index c98cc1b..da39f21 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -735,7 +735,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.7.11 +version 3.7.12

Table of Contents

@@ -2451,6 +2451,12 @@ ccache hasn’t been tested very thoroughly on NFS.

A tip is to set temporary_dir to a directory on the local host to avoid NFS traffic for temporary files.

It is recommended to use the same operating system version when using a shared +cache. If operating system versions are different then system include files +will likely be different and there will be few or no cache hits between the +systems. One way of improving cache hit rate in that case is to set +sloppiness to system_headers to ignore system +headers.

@@ -2713,9 +2719,9 @@ maintained by Joel Rosdahl. See AUTHORS.txt or AUTHORS.html and

diff --git a/doc/NEWS.adoc b/doc/NEWS.adoc index 37c7d09..e7b44a7 100644 --- a/doc/NEWS.adoc +++ b/doc/NEWS.adoc @@ -1,6 +1,31 @@ ccache news =========== +ccache 3.7.12 +------------- + +Release date: 2020-10-01 + +Bug fixes +~~~~~~~~~ + +- Coverage files (`.gcno`) produced by GCC 9+ when using `-fprofile-dir=dir` + are now handled gracefully by falling back to running the compiler. + +- Fixed writing to log file larger than 2 GiB when running ccache compiled in + 32-bit mode. + + +Other +~~~~~ + +- Improved documentation about sharing a cache on NFS. + +- Fixed test case failures with old objdump versions. + +- Fixed test case failures with GCC 4.4. + + ccache 3.7.11 ------------- diff --git a/doc/NEWS.html b/doc/NEWS.html index 48700b4..2ea77a4 100644 --- a/doc/NEWS.html +++ b/doc/NEWS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache news

-version 3.7.11 +version 3.7.12

Table of Contents

@@ -743,11 +743,54 @@ asciidoc.install(2);

ccache 3.7.12

Release date: 2020-10-01

Bug fixes

+
+Coverage files (.gcno) produced by GCC 9+ when using -fprofile-dir=dir + are now handled gracefully by falling back to running the compiler. +
+
+
+Fixed writing to log file larger than 2 GiB when running ccache compiled in + 32-bit mode. +
+

Other

+
+Improved documentation about sharing a cache on NFS. +
+
+
+Fixed test case failures with old objdump versions. +
+
+
+Fixed test case failures with GCC 4.4. +
+

ccache 3.7.11

Release date: 2020-07-21

Bug fixes

@@ -768,7 +811,7 @@ Added support for NVCCâs -Werror and --Werror option

Other

@@ -785,7 +828,7 @@ ccacheâs âDirectory is not hashed if using -gz[=zlib]â tests are now skipp
Release date: 2020-06-22
-
Bug fixes
+
Bug fixes
- @@ -843,7 +886,7 @@ Fixed a bug that affected ccacheâs -o/--set-config option for the
  
  Release date: 2020-03-29
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -860,7 +903,7 @@ Removed incorrect assertion resulting in âccache: error: Internal error in
  
  -
  Other
  +
  Other
  
  @@ -881,7 +924,7 @@ Improved name of temporary file used in NFS-safe unlink.
  
  Release date: 2020-03-16
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -904,7 +947,7 @@ If localtime_r fails the epoch time is now logged instead of garbag
  
  -
  Other
  +
  Other
  
  @@ -960,7 +1003,7 @@ Clarified âinclude_file_ctime sloppinessâ in the Performance section in the
  
  Release date: 2020-01-05
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1008,7 +1051,7 @@ The âcache missâ statistics counter will now be updated for read-only cache
  
  Release date: 2019-11-17
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1055,7 +1098,7 @@ Added support for -MF=arg (with an extra equal sign) as understood
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1125,7 +1168,7 @@ Added support for converting paths like â/c/usersâ into relative paths on
  
  Release date: 2019-08-17
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1150,7 +1193,7 @@ Fixed a regression in 3.7.2 when using the compiler option â-Werrorâ and the
  
  Release date: 2019-07-19
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1607,7 +1650,7 @@ Made â./configure --without-bundled-zlibâ do whatâs intended.
  
  Release date: 2018-09-02
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1644,7 +1687,7 @@ Upgraded bundled zlib to version 1.2.11.
  
  Release date: 2018-03-25
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1688,7 +1731,7 @@ Made it possible to perform out-of-source builds in dev mode again.
  
  Release date: 2018-02-11
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1774,7 +1817,7 @@ Documented caveats related to colored warnings from compilers.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1812,7 +1855,7 @@ Improved instructions on how to get cache hits between different working
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1838,7 +1881,7 @@ Documented how automatic cache cleanup works.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1921,7 +1964,7 @@ Documented the different cache statistics counters.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1951,7 +1994,7 @@ Fixed undefined behavior warnings in ccache found by -fsanitize=undefined<
  Release date: 2016-10-26 -Bug fixes +Bug fixes @@ -1968,7 +2011,7 @@ ccache now detects usage of .incbin assembler directives in the sou Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -1993,7 +2036,7 @@ Fixed a regression in ccache 3.3.1: ccache could get confused when using the Release date: 2016-09-07 -Bug fixes +Bug fixes @@ -2175,7 +2218,7 @@ Increased buffer size used when reading file data. This improves performance -Bug fixes +Bug fixes @@ -2201,7 +2244,7 @@ Fixed build and test for MinGW32 and Windows. Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -2219,7 +2262,7 @@ Fixed a regression in ccache 3.2.8: ccache could get confused when using the Release date: 2016-09-07 -Bug fixes +Bug fixes @@ -2243,7 +2286,7 @@ ccache now understands the undocumented -coverage (only one dash) G Release date: 2016-07-20 -Bug fixes +Bug fixes @@ -2266,7 +2309,7 @@ ccache now knows how to work around a glitch in the output of GCC 6âs Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -2316,7 +2359,7 @@ Made it harder to misinterpret documentation of boolean environment settingsâ -Bug fixes +Bug fixes @@ -2376,7 +2419,7 @@ The man page is now built when running âmake installâ from Git repository Release date: 2015-10-08 -Bug fixes +Bug fixes @@ -2431,7 +2474,7 @@ Added support for compiler option -gsplit-dwarf. -Bug fixes +Bug fixes @@ -2485,7 +2528,7 @@ Add support for caching code coverage results (compiling for gcov). -Bug fixes +Bug fixes @@ -2555,7 +2598,7 @@ Fixed build error when compiling ccache with recent Clang versions. Release date: 2014-12-10 -Bug fixes +Bug fixes @@ -2787,7 +2830,7 @@ Various other improvements of the test suite. -Bug fixes +Bug fixes @@ -2818,7 +2861,7 @@ Fixed test suite failures when CC is a ccache-wrapped compiler. Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -2836,7 +2879,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose Release date: 2015-03-07 -Bug fixes +Bug fixes @@ -2918,7 +2961,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp -Bug fixes +Bug fixes @@ -2958,7 +3001,7 @@ Fixed problem with logging of current working directory. Release date: 2013-01-06 -Bug fixes +Bug fixes @@ -2992,7 +3035,7 @@ Disappearing temporary stdout/stderr files are now handled gracefully. -Other +Other @@ -3029,7 +3072,7 @@ Clang plugins are now hashed to catch plugin upgrades. -Bug fixes +Bug fixes @@ -3056,7 +3099,7 @@ Paths are now correctly canonicalized when computing paths relative to the -Other +Other @@ -3077,7 +3120,7 @@ Fixed static_assert macro definition clash with GCC 4.7. Release date: 2012-01-08 -Bug fixes +Bug fixes @@ -3129,7 +3172,7 @@ Reverted the GCC bug compatibility introduced in ccache 3.1.5 for -MT -Other +Other @@ -3160,7 +3203,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use -Bug fixes +Bug fixes @@ -3213,7 +3256,7 @@ Improved order of statistics counters in ccache -s output. -Bug fixes +Bug fixes @@ -3246,7 +3289,7 @@ Systems that lack (and donât need to be linked with) libm are now supported. Release date: 2011-01-09 -Bug fixes +Bug fixes @@ -3279,7 +3322,7 @@ The file handle in now correctly closed on write error when trying to create Release date: 2010-11-28 -Bug fixes +Bug fixes @@ -3290,7 +3333,7 @@ The -MFarg, -MTarg and -MQarg compiler options (i.e, without space between -Other +Other @@ -3306,7 +3349,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems. Release date: 2010-11-21 -Bug fixes +Bug fixes @@ -3327,7 +3370,7 @@ Fixed issue when parsing precompiler output on AIX. -Other +Other @@ -3354,7 +3397,7 @@ The test suite now also works on systems that lack a /dev/zero. Release date: 2010-11-07 -Bug fixes +Bug fixes @@ -3392,7 +3435,7 @@ ccache development version (set by dev.mk) now works with gits whose -Other +Other @@ -3476,7 +3519,7 @@ Added -install_name as an option known to take an argument. (This i -Bug fixes +Bug fixes @@ -3501,7 +3544,7 @@ EINTR is now handled correctly. -Other +Other @@ -3562,7 +3605,7 @@ New HACKING.txt file with some notes about ccache code conventions. Release date: 2010-07-15 -Bug fixes +Bug fixes @@ -3751,7 +3794,7 @@ The following options are no longer hashed in the preprocessor mode: -Bug fixes +Bug fixes @@ -3896,9 +3939,9 @@ Statistics counters are now correctly updated for -E option failures and -Version 3.7.11 +Version 3.7.12 Last updated - 2020-07-21 20:30:11 CEST + 2020-10-01 14:20:15 CEST diff --git a/doc/ccache.1 b/doc/ccache.1 index 9bdae4f..ca71648 100644 --- a/doc/ccache.1 +++ b/doc/ccache.1 @@ -2,12 +2,12 @@ .\" Title: ccache .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 07/21/2020 +.\" Date: 10/01/2020 .\" Manual: ccache Manual -.\" Source: ccache 3.7.11 +.\" Source: ccache 3.7.12 .\" Language: English .\" -.TH "CCACHE" "1" "07/21/2020" "ccache 3\&.7\&.11" "ccache Manual" +.TH "CCACHE" "1" "10/01/2020" "ccache 3\&.7\&.12" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1912,6 +1912,8 @@ ccache hasn\(cqt been tested very thoroughly on NFS\&. .RE .sp A tip is to set \fBtemporary_dir\fR to a directory on the local host to avoid NFS traffic for temporary files\&. +.sp +It is recommended to use the same operating system version when using a shared cache\&. If operating system versions are different then system include files will likely be different and there will be few or no cache hits between the systems\&. One way of improving cache hit rate in that case is to set \fBsloppiness\fR to \fBsystem_headers\fR to ignore system headers\&. .SH "USING CCACHE WITH OTHER COMPILER WRAPPERS" .sp The recommended way of combining ccache with another compiler wrapper (such as \(lqdistcc\(rq) is by letting ccache execute the compiler wrapper\&. This is accomplished by defining the configuration setting \fBprefix_command\fR, for example by setting the environment variable \fBCCACHE_PREFIX\fR to the name of the wrapper (e\&.g\&. \fBdistcc\fR)\&. ccache will then prefix the command line with the specified command when running the compiler\&. To specify several prefix commands, set \fBprefix_command\fR to a colon\-separated list of commands\&. diff --git a/src/ccache.c b/src/ccache.c index 5fb7b05..c0d2a4f 100644 --- a/src/ccache.c +++ b/src/ccache.c @@ -1645,12 +1645,22 @@ to_cache(struct args *args, struct hash *depend_mode_hash) MTR_BEGIN("file", "file_put"); - put_file_in_cache(output_obj, cached_obj); if (produce_dep_file) { copy_file_to_cache(output_dep, cached_dep); } if (generating_coverage) { - copy_file_to_cache(output_cov, cached_cov); + if (stat(output_cov, &st) == 0) { + copy_file_to_cache(output_cov, cached_cov); + } else { + // The .gcno file is missing. This is likely due to compiling with GCC 9+, + // which uses another name for the .gcno file when using -ftest-coverage + // or --coverage when -fprofile-dir=dir is given. The .gcno file is still + // placed next to the object file, not in the specified profile directory, + // though. + cc_log("%s is missing", output_cov); + stats_update(STATS_UNSUPPORTED_OPTION); + failed(); + } } if (generating_stackusage) { copy_file_to_cache(output_su, cached_su); @@ -1661,6 +1671,7 @@ to_cache(struct args *args, struct hash *depend_mode_hash) if (using_split_dwarf) { copy_file_to_cache(output_dwo, cached_dwo); } + put_file_in_cache(output_obj, cached_obj); MTR_END("file", "file_put"); diff --git a/src/system.h b/src/system.h index c669553..86d7f30 100644 --- a/src/system.h +++ b/src/system.h @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2020 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -19,6 +19,19 @@ #include "config.h" +#ifdef __clang__ +#pragma clang diagnostic push +#if __has_warning("-Wreserved-id-macro") +#pragma clang diagnostic ignored "-Wreserved-id-macro" +#endif +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 64 +#endif +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + #include #ifdef HAVE_SYS_MMAN_H #include diff --git a/src/util.c b/src/util.c index 9f014bd..5766094 100644 --- a/src/util.c +++ b/src/util.c @@ -320,12 +320,20 @@ copy_file(const char *src, int compress_level, bool via_tmp_file) { - int fd_out; + int fd_out = -1; char *tmp_name = NULL; gzFile gz_in = NULL; gzFile gz_out = NULL; int saved_errno = 0; + // Open source file. + int fd_in = open(src, O_RDONLY | O_BINARY); + if (fd_in == -1) { + saved_errno = errno; + cc_log("open error: %s", strerror(saved_errno)); + goto error; + } + // Open destination file. if (via_tmp_file) { tmp_name = x_strdup(dest); @@ -344,14 +352,6 @@ copy_file(const char *src, src, dest, compress_level > 0 ? "" : "un"); } - // Open source file. - int fd_in = open(src, O_RDONLY | O_BINARY); - if (fd_in == -1) { - saved_errno = errno; - cc_log("open error: %s", strerror(saved_errno)); - goto error; - } - gz_in = gzdopen(fd_in, "rb"); if (!gz_in) { saved_errno = errno; @@ -473,7 +473,7 @@ error: if (fd_out != -1) { close(fd_out); } - if (via_tmp_file) { + if (via_tmp_file && tmp_name) { tmp_unlink(tmp_name); free(tmp_name); } diff --git a/src/version.c b/src/version.c index 5e4c555..cfcddb5 100644 --- a/src/version.c +++ b/src/version.c @@ -1 +1 @@ -extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.11"; +extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.12"; diff --git a/test/suites/debug_prefix_map.bash b/test/suites/debug_prefix_map.bash index d00e654..3cff720 100644 --- a/test/suites/debug_prefix_map.bash +++ b/test/suites/debug_prefix_map.bash @@ -23,10 +23,8 @@ EOF objdump_cmd() { if $HOST_OS_APPLE; then xcrun dwarfdump -r0 $1 - elif $HOST_OS_FREEBSD; then - objdump -W $1 else - objdump -g $1 + objdump -W $1 fi } diff --git a/test/suites/direct.bash b/test/suites/direct.bash index e766af5..14a2770 100644 --- a/test/suites/direct.bash +++ b/test/suites/direct.bash @@ -361,7 +361,7 @@ EOF int test() { return 0; } EOF - if $COMPILER_TYPE_GCC; then + if $REAL_COMPILER -c -fstack-usage code.c >/dev/null 2>&1; then $CCACHE_COMPILE -c -fstack-usage code.c expect_stat 'cache hit (direct)' 0 expect_stat 'cache hit (preprocessed)' 0 diff --git a/test/suites/profiling.bash b/test/suites/profiling.bash index 553f908..babc478 100644 --- a/test/suites/profiling.bash +++ b/test/suites/profiling.bash @@ -74,7 +74,7 @@ SUITE_profiling() { expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 1 - $COMPILER -fprofile-generate=data test.o -o test + $COMPILER -fprofile-generate=data test.o -lgcov -o test ./test merge_profiling_data data diff --git a/test/suites/profiling_gcc.bash b/test/suites/profiling_gcc.bash index fe61109..8142122 100644 --- a/test/suites/profiling_gcc.bash +++ b/test/suites/profiling_gcc.bash @@ -17,21 +17,21 @@ SUITE_profiling_gcc() { expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 1 - $COMPILER -fprofile-generate test.o -o test + $COMPILER -fprofile-generate test.o -lgcov -o test ./test - $CCACHE_COMPILE -fbranch-probabilities -c test.c + $CCACHE_COMPILE -fbranch-probabilities -c test.c 2>/dev/null expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 2 - $CCACHE_COMPILE -fbranch-probabilities -c test.c + $CCACHE_COMPILE -fbranch-probabilities -c test.c 2>/dev/null expect_stat 'cache hit (direct)' 1 expect_stat 'cache miss' 2 ./test - $CCACHE_COMPILE -fbranch-probabilities -c test.c + $CCACHE_COMPILE -fbranch-probabilities -c test.c 2>/dev/null expect_stat 'cache hit (direct)' 1 expect_stat 'cache miss' 3 @@ -44,7 +44,7 @@ SUITE_profiling_gcc() { expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 1 - $COMPILER -fprofile-dir=data -fprofile-generate test.o -o test + $COMPILER -fprofile-dir=data -fprofile-generate test.o -lgcov -o test ./test @@ -71,7 +71,7 @@ SUITE_profiling_gcc() { expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 1 - $COMPILER -fprofile-generate -fprofile-dir=data test.o -o test + $COMPILER -fprofile-generate -fprofile-dir=data test.o -lgcov -o test ./test @@ -98,7 +98,7 @@ SUITE_profiling_gcc() { expect_stat 'cache hit (direct)' 0 expect_stat 'cache miss' 1 - $COMPILER -fprofile-dir=data2 -fprofile-generate=data test.o -o test + $COMPILER -fprofile-dir=data2 -fprofile-generate=data test.o -lgcov -o test ./test