From: JinWang An Date: Tue, 3 Aug 2021 07:18:02 +0000 (+0900) Subject: Imported Upstream version 3.3.2 X-Git-Tag: upstream/3.3.2^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2e5e0106d0fea64939da7c54551da1375a4f361;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.3.2 --- diff --git a/AUTHORS.html b/AUTHORS.html index 3b4a3ac..2d4e9c1 100644 --- a/AUTHORS.html +++ b/AUTHORS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache authors

-version 3.3+5_g3df7836_dirty +version 3.3.2

Table of Contents

@@ -1065,9 +1065,9 @@ Yiding Jia <yiding@fb.com>

diff --git a/LICENSE.html b/LICENSE.html index 68009f6..497fb5e 100644 --- a/LICENSE.html +++ b/LICENSE.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache copyright and license

-version 3.3+5_g3df7836_dirty +version 3.3.2

Table of Contents

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

diff --git a/MANUAL.html b/MANUAL.html index 7595e26..8e4ddaa 100644 --- a/MANUAL.html +++ b/MANUAL.html @@ -734,7 +734,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.3+5_g3df7836_dirty +version 3.3.2

Table of Contents

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

diff --git a/NEWS.html b/NEWS.html index 0d8dd8b..c5f20ca 100644 --- a/NEWS.html +++ b/NEWS.html @@ -734,7 +734,7 @@ asciidoc.install(2);

ccache news

-version 3.3.1 +version 3.3.2

Table of Contents

@@ -742,11 +742,36 @@ asciidoc.install(2);

ccache 3.3.2

Release date: 2016-09-28

Bug fixes

+
+Fixed a regression in ccache 3.3 related to potentially bad content of + dependency files when compiling identical source code but with different + source paths. +
+
+
+Fixed a regression in ccache 3.3.1: ccache could get confused when using the + compiler option -Wp, to pass multiple options to the preprocessor, + resulting in missing dependency files from direct mode cache hits. +
+

ccache 3.3.1

Release date: 2016-09-07

Bug fixes

@@ -928,7 +953,7 @@ Increased buffer size used when reading file data. This improves performance

Bug fixes

@@ -950,11 +975,29 @@ Fixed build and test for MinGW32 and Windows.

ccache 3.2.9

Release date: 2016-09-28

Bug fixes

+
+Fixed a regression in ccache 3.2.8: ccache could get confused when using the + compiler option -Wp, to pass multiple options to the preprocessor, + resulting in missing dependency files from direct mode cache hits. +
+

ccache 3.2.8

Release date: 2016-09-07

Bug fixes

@@ -978,7 +1021,7 @@ ccache now understands the undocumented -coverage (only one dash) G
Release date: 2016-07-20
-
Bug fixes
+
Bug fixes
- @@ -1001,7 +1044,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
  
  @@ -1051,7 +1094,7 @@ Made it harder to misinterpret documentation of boolean environment settings'
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1111,7 +1154,7 @@ The man page is now built when running “make install” from Git repos
  
  Release date: 2015-10-08
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1166,7 +1209,7 @@ Added support for compiler option -gsplit-dwarf.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1220,7 +1263,7 @@ Add support for caching code coverage results (compiling for gcov).
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1291,7 +1334,7 @@ Fixed build error when compiling ccache with recent clang versions.
  
  Release date: 2014-12-10
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1523,7 +1566,7 @@ Various other improvements of the test suite.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1554,7 +1597,7 @@ Fixed test suite failures when CC is a ccache-wrapped compiler.
  
  Release date: 2016-07-12
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1572,7 +1615,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose
  
  Release date: 2015-03-07
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1655,7 +1698,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp
  -Bug fixes +Bug fixes @@ -1695,7 +1738,7 @@ Fixed problem with logging of current working directory. Release date: 2013-01-06 -Bug fixes +Bug fixes @@ -1766,7 +1809,7 @@ Clang plugins are now hashed to catch plugin upgrades. -Bug fixes +Bug fixes @@ -1814,7 +1857,7 @@ Fixed static_assert macro definition clash with GCC 4.7. Release date: 2012-01-08 -Bug fixes +Bug fixes @@ -1897,7 +1940,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use -Bug fixes +Bug fixes @@ -1950,7 +1993,7 @@ Improved order of statistics counters in ccache -s output. -Bug fixes +Bug fixes @@ -1983,7 +2026,7 @@ Systems that lack (and don’t need to be linked with) libm are now supporte Release date: 2011-01-09 -Bug fixes +Bug fixes @@ -2016,7 +2059,7 @@ The file handle in now correctly closed on write error when trying to create Release date: 2010-11-28 -Bug fixes +Bug fixes @@ -2043,7 +2086,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems. Release date: 2010-11-21 -Bug fixes +Bug fixes @@ -2091,7 +2134,7 @@ The test suite now also works on systems that lack a /dev/zero. Release date: 2010-11-07 -Bug fixes +Bug fixes @@ -2213,7 +2256,7 @@ Added -install_name as an option known to take an argument. (This i -Bug fixes +Bug fixes @@ -2299,7 +2342,7 @@ New HACKING.txt file with some notes about ccache code conventions. Release date: 2010-07-15 -Bug fixes +Bug fixes @@ -2488,7 +2531,7 @@ The following options are no longer hashed in the preprocessor mode: -Bug fixes +Bug fixes @@ -2633,9 +2676,9 @@ Statistics counters are now correctly updated for -E option failures and -Version 3.3.1 +Version 3.3.2 Last updated - 2016-09-07 21:19:19 CEST + 2016-09-28 22:44:16 CEST diff --git a/NEWS.txt b/NEWS.txt index 8eaf4b6..2c95723 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,6 +1,22 @@ ccache news =========== +ccache 3.3.2 +------------ +Release date: 2016-09-28 + +Bug fixes +~~~~~~~~~ + +- Fixed a regression in ccache 3.3 related to potentially bad content of + dependency files when compiling identical source code but with different + source paths. + +- Fixed a regression in ccache 3.3.1: ccache could get confused when using the + compiler option `-Wp,` to pass multiple options to the preprocessor, + resulting in missing dependency files from direct mode cache hits. + + ccache 3.3.1 ------------ Release date: 2016-09-07 @@ -111,6 +127,18 @@ Bug fixes - Fixed build and test for MinGW32 and Windows. +ccache 3.2.9 +------------ +Release date: 2016-09-28 + +Bug fixes +~~~~~~~~~ + +- Fixed a regression in ccache 3.2.8: ccache could get confused when using the + compiler option `-Wp,` to pass multiple options to the preprocessor, + resulting in missing dependency files from direct mode cache hits. + + ccache 3.2.8 ------------ Release date: 2016-09-07 diff --git a/ccache.1 b/ccache.1 index 9b777fe..afa8a49 100644 --- a/ccache.1 +++ b/ccache.1 @@ -2,12 +2,12 @@ .\" Title: ccache .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 09/07/2016 +.\" Date: 09/28/2016 .\" Manual: ccache Manual -.\" Source: ccache 3.3.1 +.\" Source: ccache 3.3.2 .\" Language: English .\" -.TH "CCACHE" "1" "09/07/2016" "ccache 3\&.3\&.1" "ccache Manual" +.TH "CCACHE" "1" "09/28/2016" "ccache 3\&.3\&.2" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/ccache.c b/ccache.c index 8ffadcc..c4070ad 100644 --- a/ccache.c +++ b/ccache.c @@ -1536,6 +1536,13 @@ calculate_common_hash(struct args *args, struct mdfour *hash) } } + // Possibly hash input file location to avoid false positive cache hits since + // the dependency file includes the source file path. + if (generating_dependencies) { + hash_delimiter(hash, "inputfile"); + hash_string(hash, input_file); + } + // Possibly hash the coverage data file path. if (generating_coverage && profile_arcs) { char *dir = dirname(output_obj); @@ -2438,8 +2445,15 @@ cc_process_args(struct args *args, struct args **preprocessor_args, // Treat it like -D. args_add(cpp_args, argv[i] + 4); continue; - } else if (str_startswith(argv[i], "-Wp,-M")) { - // -MF, -MP, -MQ, -MT, etc. TODO: Make argument to MF/MQ/MT relative. + } else if (str_eq(argv[i], "-Wp,-MP") + || (strlen(argv[i]) > 8 + && str_startswith(argv[i], "-Wp,-M") + && argv[i][7] == ',' + && (argv[i][6] == 'F' + || argv[i][6] == 'Q' + || argv[i][6] == 'T') + && !strchr(argv[i] + 8, ','))) { + // TODO: Make argument to MF/MQ/MT relative. args_add(dep_args, argv[i]); continue; } else if (conf->direct_mode) { diff --git a/test.sh b/test.sh index 6ca18c9..9c7314e 100755 --- a/test.sh +++ b/test.sh @@ -975,6 +975,20 @@ EOF expect_stat 'cache miss' 0 expect_stat 'unsupported compiler option' 1 + # ------------------------------------------------------------------------- + TEST "-MMD for different source files" + + mkdir a b + touch a/source.c b/source.c + $CCACHE_COMPILE -MMD -c a/source.c + expect_file_content source.d "source.o: a/source.c" + + $CCACHE_COMPILE -MMD -c b/source.c + expect_file_content source.d "source.o: b/source.c" + + $CCACHE_COMPILE -MMD -c a/source.c + expect_file_content source.d "source.o: a/source.c" + # ------------------------------------------------------------------------- TEST "-Wp,-P" @@ -1610,6 +1624,20 @@ EOF expect_stat 'cache hit (preprocessed)' 1 expect_stat 'cache miss' 1 + # ------------------------------------------------------------------------- + TEST "-MMD for different source files" + + mkdir a b + touch a/source.c b/source.c + $CCACHE_COMPILE -MMD -c a/source.c + expect_file_content source.d "source.o: a/source.c" + + $CCACHE_COMPILE -MMD -c b/source.c + expect_file_content source.d "source.o: b/source.c" + + $CCACHE_COMPILE -MMD -c a/source.c + expect_file_content source.d "source.o: a/source.c" + # ------------------------------------------------------------------------- TEST "Multiple object entries in manifest" @@ -3380,11 +3408,11 @@ upgrade input_charset " -compiler_location=$(which $COMPILER) +compiler_location=$(which $(echo "$COMPILER" | awk '{print $1}')) if [ "$compiler_location" = "$COMPILER" ]; then echo "Compiler: $COMPILER" else - echo "Compiler: $COMPILER ($(which $COMPILER))" + echo "Compiler: $COMPILER ($compiler_location)" fi echo "Compiler version: $($COMPILER --version | head -n 1)" echo diff --git a/version.c b/version.c index 0e7b9ec..df441b8 100644 --- a/version.c +++ b/version.c @@ -1 +1 @@ -const char CCACHE_VERSION[] = "3.3.1"; +const char CCACHE_VERSION[] = "3.3.2";