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

ccache copyright and license

-version 3.7.2 +version 3.7.3

Table of Contents

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

diff --git a/autogen.sh b/autogen.sh index 00c9f52..709b605 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,7 +5,7 @@ set -e if [ -f dev_mode_disabled ]; then cat <&2 Error: It looks like you are building ccache from a release archive. If so, -there is no need to run autoconf.sh. See INSTALL.md for further instructions. +there is no need to run autogen.sh. See INSTALL.md for further instructions. If you do want to the enable the development mode, delete the file dev_mode_disabled first, but it's probably a better idea to work with the diff --git a/doc/AUTHORS.adoc b/doc/AUTHORS.adoc index 660eff4..9e7e3f4 100644 --- a/doc/AUTHORS.adoc +++ b/doc/AUTHORS.adoc @@ -31,6 +31,7 @@ ccache is a collective work with contributions from many people, including: * Havard Graff * Hongli Lai * Ivan Vaigult +* Ivan Volnov * Jiang Jiang * Joel Galenson * Joel Rosdahl diff --git a/doc/AUTHORS.html b/doc/AUTHORS.html index 306ab6e..ce41f65 100644 --- a/doc/AUTHORS.html +++ b/doc/AUTHORS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache authors

-version 3.7.2 +version 3.7.3

Table of Contents

@@ -875,6 +875,11 @@ Ivan Vaigult

+Ivan Volnov +

Jiang Jiang

@@ -1236,9 +1241,9 @@ Yvan Janssens

diff --git a/doc/MANUAL.html b/doc/MANUAL.html index 3bfcdf0..36b175c 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -735,7 +735,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.7.2 +version 3.7.3

Table of Contents

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

diff --git a/doc/NEWS.adoc b/doc/NEWS.adoc index 8661a3f..ec502c3 100644 --- a/doc/NEWS.adoc +++ b/doc/NEWS.adoc @@ -1,6 +1,22 @@ ccache news =========== +ccache 3.7.3 +------------ +Release date: 2019-08-17 + +Bug fixes +~~~~~~~~~ + +- The cache size (which is counted in âused disk blocksâ) is now correct on + filesystems that use more or less disk blocks than conventional filesystems, + e.g. ecryptfs or btrfs/zfs with transparent compression. This also fixes a + related problem with ccache's own test suite when run on such file systems. + +- Fixed a regression in 3.7.2 when using the compiler option â-Werrorâ and then + â-Wno-errorâ later on the command line. + + ccache 3.7.2 ------------ Release date: 2019-07-19 diff --git a/doc/NEWS.html b/doc/NEWS.html index 6b0c6bb..69cafa3 100644 --- a/doc/NEWS.html +++ b/doc/NEWS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache news

-version 3.7.2 +version 3.7.3

Table of Contents

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

ccache 3.7.3

Release date: 2019-08-17

Bug fixes

+
+The cache size (which is counted in âused disk blocksâ) is now correct on + filesystems that use more or less disk blocks than conventional filesystems, + e.g. ecryptfs or btrfs/zfs with transparent compression. This also fixes a + related problem with ccache’s own test suite when run on such file systems. +
+
+
+Fixed a regression in 3.7.2 when using the compiler option â-Werrorâ and then + â-Wno-errorâ later on the command line. +
+

ccache 3.7.2

Release date: 2019-07-19

Bug fixes

@@ -1204,7 +1229,7 @@ Made â./configure --without-bundled-zlibâ do whatâs intended.
Release date: 2018-09-02
-
Bug fixes
+
Bug fixes
- @@ -1241,7 +1266,7 @@ Upgraded bundled zlib to version 1.2.11.
  
  Release date: 2018-03-25
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1285,7 +1310,7 @@ Made it possible to perform out-of-source builds in dev mode again.
  
  Release date: 2018-02-11
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1371,7 +1396,7 @@ Documented caveats related to colored warnings from compilers.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1409,7 +1434,7 @@ Improved instructions on how to get cache hits between different working
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1435,7 +1460,7 @@ Documented how automatic cache cleanup works.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1518,7 +1543,7 @@ Documented the different cache statistics counters.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1548,7 +1573,7 @@ Fixed undefined behavior warnings in ccache found by -fsanitize=undefined<
  Release date: 2016-10-26 -Bug fixes +Bug fixes @@ -1565,7 +1590,7 @@ ccache now detects usage of .incbin assembler directives in the sou Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -1590,7 +1615,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 @@ -1772,7 +1797,7 @@ Increased buffer size used when reading file data. This improves performance -Bug fixes +Bug fixes @@ -1798,7 +1823,7 @@ Fixed build and test for MinGW32 and Windows. Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -1816,7 +1841,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 @@ -1840,7 +1865,7 @@ ccache now understands the undocumented -coverage (only one dash) G Release date: 2016-07-20 -Bug fixes +Bug fixes @@ -1863,7 +1888,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 @@ -1913,7 +1938,7 @@ Made it harder to misinterpret documentation of boolean environment settingsâ -Bug fixes +Bug fixes @@ -1973,7 +1998,7 @@ The man page is now built when running âmake installâ from Git repository Release date: 2015-10-08 -Bug fixes +Bug fixes @@ -2028,7 +2053,7 @@ Added support for compiler option -gsplit-dwarf. -Bug fixes +Bug fixes @@ -2082,7 +2107,7 @@ Add support for caching code coverage results (compiling for gcov). -Bug fixes +Bug fixes @@ -2152,7 +2177,7 @@ Fixed build error when compiling ccache with recent Clang versions. Release date: 2014-12-10 -Bug fixes +Bug fixes @@ -2384,7 +2409,7 @@ Various other improvements of the test suite. -Bug fixes +Bug fixes @@ -2415,7 +2440,7 @@ Fixed test suite failures when CC is a ccache-wrapped compiler. Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -2433,7 +2458,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose Release date: 2015-03-07 -Bug fixes +Bug fixes @@ -2515,7 +2540,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp -Bug fixes +Bug fixes @@ -2555,7 +2580,7 @@ Fixed problem with logging of current working directory. Release date: 2013-01-06 -Bug fixes +Bug fixes @@ -2626,7 +2651,7 @@ Clang plugins are now hashed to catch plugin upgrades. -Bug fixes +Bug fixes @@ -2674,7 +2699,7 @@ Fixed static_assert macro definition clash with GCC 4.7. Release date: 2012-01-08 -Bug fixes +Bug fixes @@ -2757,7 +2782,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use -Bug fixes +Bug fixes @@ -2810,7 +2835,7 @@ Improved order of statistics counters in ccache -s output. -Bug fixes +Bug fixes @@ -2843,7 +2868,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 @@ -2876,7 +2901,7 @@ The file handle in now correctly closed on write error when trying to create Release date: 2010-11-28 -Bug fixes +Bug fixes @@ -2903,7 +2928,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems. Release date: 2010-11-21 -Bug fixes +Bug fixes @@ -2951,7 +2976,7 @@ The test suite now also works on systems that lack a /dev/zero. Release date: 2010-11-07 -Bug fixes +Bug fixes @@ -3073,7 +3098,7 @@ Added -install_name as an option known to take an argument. (This i -Bug fixes +Bug fixes @@ -3159,7 +3184,7 @@ New HACKING.txt file with some notes about ccache code conventions. Release date: 2010-07-15 -Bug fixes +Bug fixes @@ -3348,7 +3373,7 @@ The following options are no longer hashed in the preprocessor mode: -Bug fixes +Bug fixes @@ -3493,9 +3518,9 @@ Statistics counters are now correctly updated for -E option failures and -Version 3.7.2 +Version 3.7.3 Last updated - 2019-07-19 09:58:41 CEST + 2019-08-17 22:37:25 CEST diff --git a/doc/ccache.1 b/doc/ccache.1 index 5c40657..525220a 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/19/2019 +.\" Date: 08/17/2019 .\" Manual: ccache Manual -.\" Source: ccache 3.7.2 +.\" Source: ccache 3.7.3 .\" Language: English .\" -.TH "CCACHE" "1" "07/19/2019" "ccache 3\&.7\&.2" "ccache Manual" +.TH "CCACHE" "1" "08/17/2019" "ccache 3\&.7\&.3" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/src/compopt.c b/src/compopt.c index 413a1b3..6b46cbe 100644 --- a/src/compopt.c +++ b/src/compopt.c @@ -75,6 +75,7 @@ static const struct compopt compopts[] = { {"-Wa,", TAKES_CONCAT_ARG | AFFECTS_COMP}, {"-Werror", AFFECTS_COMP}, // don't exit with error when preprocessing {"-Wl,", TAKES_CONCAT_ARG | AFFECTS_COMP}, + {"-Wno-error", AFFECTS_COMP}, {"-Xassembler", TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP}, {"-Xclang", TAKES_ARG}, {"-Xlinker", TAKES_ARG | TAKES_CONCAT_ARG | AFFECTS_COMP}, diff --git a/src/util.c b/src/util.c index 233c932..8f4490f 100644 --- a/src/util.c +++ b/src/util.c @@ -984,12 +984,7 @@ file_size(struct stat *st) #ifdef _WIN32 return (st->st_size + 1023) & ~1023; #else - size_t size = st->st_blocks * 512; - if ((size_t)st->st_size > size) { - // Probably a broken stat() call... - size = (st->st_size + 1023) & ~1023; - } - return size; + return st->st_blocks * 512; #endif } diff --git a/src/version.c b/src/version.c index 3c2231d..8b285dd 100644 --- a/src/version.c +++ b/src/version.c @@ -1 +1 @@ -extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.2"; +extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.3"; diff --git a/test/suites/cleanup.bash b/test/suites/cleanup.bash index f36dc75..a907ac4 100644 --- a/test/suites/cleanup.bash +++ b/test/suites/cleanup.bash @@ -75,32 +75,34 @@ SUITE_cleanup() { done # ------------------------------------------------------------------------- - TEST "Forced cache cleanup, size limit" - - # NOTE: This test is known to fail on filesystems that have unusual block - # sizes, including ecryptfs. The workaround is to place the test directory - # elsewhere: - # - # cd /tmp - # CCACHE=$DIR/ccache $DIR/test.sh - - prepare_cleanup_test_dir $CCACHE_DIR/a - - $CCACHE -F 0 -M 256K >/dev/null - $CCACHE -c >/dev/null - expect_file_count 3 '*.o' $CCACHE_DIR - expect_file_count 4 '*.d' $CCACHE_DIR - expect_file_count 4 '*.stderr' $CCACHE_DIR - expect_stat 'files in cache' 11 - expect_stat 'cleanups performed' 1 - for i in 0 1 2 3 4 5 6; do - file=$CCACHE_DIR/a/result$i-4017.o - expect_file_missing $file - done - for i in 7 8 9; do - file=$CCACHE_DIR/a/result$i-4017.o - expect_file_exists $file - done + if [ -n "$ENABLE_CACHE_CLEANUP_TESTS" ]; then + TEST "Forced cache cleanup, size limit" + + # NOTE: This test is known to fail on filesystems that have unusual block + # sizes, including ecryptfs. The workaround is to place the test directory + # elsewhere: + # + # cd /tmp + # CCACHE=$DIR/ccache $DIR/test.sh + + prepare_cleanup_test_dir $CCACHE_DIR/a + + $CCACHE -F 0 -M 256K >/dev/null + $CCACHE -c >/dev/null + expect_file_count 3 '*.o' $CCACHE_DIR + expect_file_count 4 '*.d' $CCACHE_DIR + expect_file_count 4 '*.stderr' $CCACHE_DIR + expect_stat 'files in cache' 11 + expect_stat 'cleanups performed' 1 + for i in 0 1 2 3 4 5 6; do + file=$CCACHE_DIR/a/result$i-4017.o + expect_file_missing $file + done + for i in 7 8 9; do + file=$CCACHE_DIR/a/result$i-4017.o + expect_file_exists $file + done + fi # ------------------------------------------------------------------------- TEST "Automatic cache cleanup, limit_multiple 0.9" diff --git a/unittest/test_argument_processing.c b/unittest/test_argument_processing.c index 7974f8a..6993e42 100644 --- a/unittest/test_argument_processing.c +++ b/unittest/test_argument_processing.c @@ -497,10 +497,10 @@ TEST(debug_flag_order_with_known_option_last) TEST(options_not_to_be_passed_to_the_preprocesor) { struct args *orig = args_init_from_string( - "cc -Wa,foo foo.c -g -Xlinker fie -Xlinker,fum -c -Werror"); - struct args *exp_cpp = args_init_from_string("cc -g"); + "cc -Wa,foo foo.c -g -c -DX -Werror -Xlinker fie -Xlinker,fum -Wno-error"); + struct args *exp_cpp = args_init_from_string("cc -g -DX"); struct args *exp_cc = args_init_from_string( - "cc -g -Wa,foo -Xlinker fie -Xlinker,fum -Werror -c"); + "cc -g -Wa,foo -Werror -Xlinker fie -Xlinker,fum -Wno-error -DX -c"); struct args *act_cpp = NULL; struct args *act_cc = NULL;