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

ccache copyright and license

-version 3.7.10 +version 3.7.11

Table of Contents

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

diff --git a/dev.mk.in b/dev.mk.in index 2e3ac90..fe1bcd3 100644 --- a/dev.mk.in +++ b/dev.mk.in @@ -195,7 +195,7 @@ update-authors: | grep '^[^ ]' \ | sed -r -e 's/[^ ]+/*/' -e 's/<.*//' -e 's/ *$$//' \ | sort -u \ - | perl -00 -p -i -e 's/^\*.*/ . "\n"/es' doc/AUTHORS.adoc + | perl -00 -p -i -e 's/^\*.*/ . "\n"/es' $(srcdir)/doc/AUTHORS.adoc .PHONY: check-syntax check-syntax: diff --git a/doc/AUTHORS.adoc b/doc/AUTHORS.adoc index 1f1d4e2..c8b6119 100644 --- a/doc/AUTHORS.adoc +++ b/doc/AUTHORS.adoc @@ -7,6 +7,7 @@ maintained by Joel Rosdahl. ccache is a collective work with contributions from many people, including: * Alexander Korsunsky +* Alexander Lanin * Alexey Tourbin * Alfred Landrum * Anders F BjÃ¶rklund @@ -75,6 +76,7 @@ ccache is a collective work with contributions from many people, including: * Nick Schultz * Norbert Lange * Oded Shimon +* Olle Liljenzin * Orgad Shaneh * Orion Poplawski * Owen Mann diff --git a/doc/AUTHORS.html b/doc/AUTHORS.html index 2d0513a..003f658 100644 --- a/doc/AUTHORS.html +++ b/doc/AUTHORS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache authors

-version 3.7.10 +version 3.7.11

Table of Contents

@@ -755,6 +755,11 @@ Alexander Korsunsky

+Alexander Lanin +

Alexey Tourbin

@@ -1095,6 +1100,11 @@ Oded Shimon

+Olle Liljenzin +

Orgad Shaneh

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

diff --git a/doc/MANUAL.html b/doc/MANUAL.html index 91706a1..c98cc1b 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -735,7 +735,7 @@ asciidoc.install(2);

CCACHE(1)

-version 3.7.10 +version 3.7.11

Table of Contents

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

diff --git a/doc/NEWS.adoc b/doc/NEWS.adoc index 4877274..37c7d09 100644 --- a/doc/NEWS.adoc +++ b/doc/NEWS.adoc @@ -1,6 +1,29 @@ ccache news =========== +ccache 3.7.11 +------------- + +Release date: 2020-07-21 + +Bug fixes +~~~~~~~~~ + +- Added knowledge about `-fprofile-{correction,reorder-functions,values}`. + +- ccache now handles the Intel compiler option `-xCODE` (where `CODE` is a + processor feature code) correctly. + +- Added support for NVCCâs `-Werror` and `--Werror` options. + + +Other +~~~~~ + +- ccacheâs âDirectory is not hashed if using -gz[=zlib]â tests are now skipped + for GCC 6. + + ccache 3.7.10 ------------ Release date: 2020-06-22 @@ -16,11 +39,11 @@ Bug fixes - ccache now copies files directly from the cache to the destination file instead of via a temporary file. This avoids problems when using filenames - long enough to be near the file system's filename max limit. + long enough to be near the file systemâs filename max limit. - When the hard-link mode is enabled, ccache now only uses hard links for object files, not other files like dependency files. This is because - compilers unlink object files before writing to them but they don't do that + compilers unlink object files before writing to them but they donât do that for dependency files, so the latter can become overwritten and therefore corrupted in the cache. @@ -31,7 +54,7 @@ Bug fixes - Temporary files are now deleted immediately on signals like SIGTERM and SIGINT instead of some time later in a cleanup phase. -- Fixed a bug that affected ccache's `-o/--set-config` option for the +- Fixed a bug that affected ccacheâs `-o/--set-config` option for the `base_dir` and `cache_dir_levels` keys. @@ -208,7 +231,7 @@ 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. + 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. @@ -747,7 +770,7 @@ New features and enhancements - Added support for Fortran 77. -- Added support for multiple `-arch` options to produce "fat binaries". +- Added support for multiple `-arch` options to produce âfat binariesâ. - Multiple identical `-arch` arguments are now handled without bailing. @@ -866,7 +889,7 @@ Bug fixes - Include m4 files used by configure.ac in the source dist archives. -- Corrected "Performance" section in the manual regarding `__DATE_`, `__TIME__` +- Corrected âPerformanceâ section in the manual regarding `__DATE_`, `__TIME__` and `__FILE__` macros. - Fixed build on Solaris 10+ and AIX 7. @@ -934,7 +957,7 @@ Bug fixes - Bail out on compiler option `--save-temps` in addition to `-save-temps`. -- Only log "Disabling direct mode" once when failing to read potential include +- Only log âDisabling direct modeâ once when failing to read potential include files. @@ -1280,7 +1303,7 @@ Bug fixes - Made failure to create files (typically due to bad directory permissions) in the cache directory fatal. Previously, such failures were silently and - erroneously flagged as "compiler produced stdout". + erroneously flagged as âcompiler produced stdoutâ. - Both the `-specs=file` and `--specs=file` forms are now recognized. diff --git a/doc/NEWS.html b/doc/NEWS.html index ecf65da..48700b4 100644 --- a/doc/NEWS.html +++ b/doc/NEWS.html @@ -735,7 +735,7 @@ asciidoc.install(2);

ccache news

-version 3.7.10 +version 3.7.11

Table of Contents

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

ccache 3.7.11

Release date: 2020-07-21

Bug fixes

+
+Added knowledge about -fprofile-{correction,reorder-functions,values}. +
+
+
+ccache now handles the Intel compiler option -xCODE (where CODE is a + processor feature code) correctly. +
+
+
+Added support for NVCCâs -Werror and --Werror options. +
+

Other

+
+ccacheâs âDirectory is not hashed if using -gz[=zlib]â tests are now skipped + for GCC 6. +
+

ccache 3.7.10

Release date: 2020-06-22

Bug fixes

@@ -762,14 +800,14 @@ Improved handling of profiling options. ccache should now work correctly for
ccache now copies files directly from the cache to the destination file instead of via a temporary file. This avoids problems when using filenames - long enough to be near the file system’s filename max limit. + long enough to be near the file systemâs filename max limit.
When the hard-link mode is enabled, ccache now only uses hard links for object files, not other files like dependency files. This is because - compilers unlink object files before writing to them but they don’t do that + compilers unlink object files before writing to them but they donât do that for dependency files, so the latter can become overwritten and therefore corrupted in the cache.
@@ -792,7 +830,7 @@ Temporary files are now deleted immediately on signals like SIGTERM and
-Fixed a bug that affected ccache’s -o/--set-config option for the +Fixed a bug that affected ccacheâs -o/--set-config option for the base_dir and cache_dir_levels keys.

-o/--set-config

Release date: 2020-03-29

Bug fixes

@@ -822,7 +860,7 @@ Removed incorrect assertion resulting in âccache: error: Internal error in

Other

@@ -843,7 +881,7 @@ Improved name of temporary file used in NFS-safe unlink.
Release date: 2020-03-16
-
Bug fixes
+
Bug fixes
- @@ -866,7 +904,7 @@ If localtime_r fails the epoch time is now logged instead of garbag
-
Other
+
Other
- @@ -922,7 +960,7 @@ Clarified âinclude_file_ctime sloppinessâ in the Performance section in the
  
  Release date: 2020-01-05
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -970,7 +1008,7 @@ The âcache missâ statistics counter will now be updated for read-only cache
  
  Release date: 2019-11-17
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1017,7 +1055,7 @@ Added support for -MF=arg (with an extra equal sign) as understood
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1087,14 +1125,14 @@ Added support for converting paths like â/c/usersâ into relative paths on
  
  Release date: 2019-08-17
  
  -
  Bug fixes
  +
  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. + related problem with ccacheâs own test suite when run on such file systems.
  
  @@ -1112,7 +1150,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
  
  @@ -1569,7 +1607,7 @@ Made â./configure --without-bundled-zlibâ do whatâs intended.
  
  Release date: 2018-09-02
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1606,7 +1644,7 @@ Upgraded bundled zlib to version 1.2.11.
  
  Release date: 2018-03-25
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1650,7 +1688,7 @@ Made it possible to perform out-of-source builds in dev mode again.
  
  Release date: 2018-02-11
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1736,7 +1774,7 @@ Documented caveats related to colored warnings from compilers.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1774,7 +1812,7 @@ Improved instructions on how to get cache hits between different working
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1800,7 +1838,7 @@ Documented how automatic cache cleanup works.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1883,7 +1921,7 @@ Documented the different cache statistics counters.
  
  -
  Bug fixes
  +
  Bug fixes
  
  @@ -1913,7 +1951,7 @@ Fixed undefined behavior warnings in ccache found by -fsanitize=undefined<
  Release date: 2016-10-26 -Bug fixes +Bug fixes @@ -1930,7 +1968,7 @@ ccache now detects usage of .incbin assembler directives in the sou Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -1955,7 +1993,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 @@ -2074,7 +2112,7 @@ Added support for Fortran 77. -Added support for multiple -arch options to produce "fat binaries". +Added support for multiple -arch options to produce âfat binariesâ. @@ -2137,7 +2175,7 @@ Increased buffer size used when reading file data. This improves performance -Bug fixes +Bug fixes @@ -2163,7 +2201,7 @@ Fixed build and test for MinGW32 and Windows. Release date: 2016-09-28 -Bug fixes +Bug fixes @@ -2181,7 +2219,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 @@ -2205,7 +2243,7 @@ ccache now understands the undocumented -coverage (only one dash) G Release date: 2016-07-20 -Bug fixes +Bug fixes @@ -2228,7 +2266,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 @@ -2278,7 +2316,7 @@ Made it harder to misinterpret documentation of boolean environment settingsâ -Bug fixes +Bug fixes @@ -2287,7 +2325,7 @@ Include m4 files used by configure.ac in the source dist archives. -Corrected "Performance" section in the manual regarding __DATE_, __TIME__ +Corrected âPerformanceâ section in the manual regarding __DATE_, __TIME__ and __FILE__ macros. @@ -2338,7 +2376,7 @@ The man page is now built when running âmake installâ from Git repository Release date: 2015-10-08 -Bug fixes +Bug fixes @@ -2393,7 +2431,7 @@ Added support for compiler option -gsplit-dwarf. -Bug fixes +Bug fixes @@ -2417,7 +2455,7 @@ Bail out on compiler option --save-temps in addition to -save -Only log "Disabling direct mode" once when failing to read potential include +Only log âDisabling direct modeâ once when failing to read potential include files. @@ -2447,7 +2485,7 @@ Add support for caching code coverage results (compiling for gcov). -Bug fixes +Bug fixes @@ -2517,7 +2555,7 @@ Fixed build error when compiling ccache with recent Clang versions. Release date: 2014-12-10 -Bug fixes +Bug fixes @@ -2749,7 +2787,7 @@ Various other improvements of the test suite. -Bug fixes +Bug fixes @@ -2780,7 +2818,7 @@ Fixed test suite failures when CC is a ccache-wrapped compiler. Release date: 2016-07-12 -Bug fixes +Bug fixes @@ -2798,7 +2836,7 @@ Fixed a bug where (due to ccache rewriting paths) the compiler could choose Release date: 2015-03-07 -Bug fixes +Bug fixes @@ -2880,7 +2918,7 @@ Stale files in the internal temporary directory (<ccache_dir>/tmp -Bug fixes +Bug fixes @@ -2920,7 +2958,7 @@ Fixed problem with logging of current working directory. Release date: 2013-01-06 -Bug fixes +Bug fixes @@ -2954,7 +2992,7 @@ Disappearing temporary stdout/stderr files are now handled gracefully. -Other +Other @@ -2991,7 +3029,7 @@ Clang plugins are now hashed to catch plugin upgrades. -Bug fixes +Bug fixes @@ -3018,7 +3056,7 @@ Paths are now correctly canonicalized when computing paths relative to the -Other +Other @@ -3039,7 +3077,7 @@ Fixed static_assert macro definition clash with GCC 4.7. Release date: 2012-01-08 -Bug fixes +Bug fixes @@ -3051,7 +3089,7 @@ Non-writable CCACHE_DIR is now handled gracefully when CCACHE Made failure to create files (typically due to bad directory permissions) in the cache directory fatal. Previously, such failures were silently and - erroneously flagged as "compiler produced stdout". + erroneously flagged as âcompiler produced stdoutâ. @@ -3091,7 +3129,7 @@ Reverted the GCC bug compatibility introduced in ccache 3.1.5 for -MT -Other +Other @@ -3122,7 +3160,7 @@ Rewrite argument to --sysroot if CCACHE_BASEDIR is use -Bug fixes +Bug fixes @@ -3175,7 +3213,7 @@ Improved order of statistics counters in ccache -s output. -Bug fixes +Bug fixes @@ -3208,7 +3246,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 @@ -3241,7 +3279,7 @@ The file handle in now correctly closed on write error when trying to create Release date: 2010-11-28 -Bug fixes +Bug fixes @@ -3252,7 +3290,7 @@ The -MFarg, -MTarg and -MQarg compiler options (i.e, without space between -Other +Other @@ -3268,7 +3306,7 @@ Portability fixes for HP-UX 11.00 and other esoteric systems. Release date: 2010-11-21 -Bug fixes +Bug fixes @@ -3289,7 +3327,7 @@ Fixed issue when parsing precompiler output on AIX. -Other +Other @@ -3316,7 +3354,7 @@ The test suite now also works on systems that lack a /dev/zero. Release date: 2010-11-07 -Bug fixes +Bug fixes @@ -3354,7 +3392,7 @@ ccache development version (set by dev.mk) now works with gits whose -Other +Other @@ -3438,7 +3476,7 @@ Added -install_name as an option known to take an argument. (This i -Bug fixes +Bug fixes @@ -3463,7 +3501,7 @@ EINTR is now handled correctly. -Other +Other @@ -3524,7 +3562,7 @@ New HACKING.txt file with some notes about ccache code conventions. Release date: 2010-07-15 -Bug fixes +Bug fixes @@ -3713,7 +3751,7 @@ The following options are no longer hashed in the preprocessor mode: -Bug fixes +Bug fixes @@ -3858,9 +3896,9 @@ Statistics counters are now correctly updated for -E option failures and -Version 3.7.10 +Version 3.7.11 Last updated - 2020-06-22 19:59:54 CEST + 2020-07-21 20:30:11 CEST diff --git a/doc/ccache.1 b/doc/ccache.1 index 72cf3d0..9bdae4f 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: 06/22/2020 +.\" Date: 07/21/2020 .\" Manual: ccache Manual -.\" Source: ccache 3.7.10 +.\" Source: ccache 3.7.11 .\" Language: English .\" -.TH "CCACHE" "1" "06/22/2020" "ccache 3\&.7\&.10" "ccache Manual" +.TH "CCACHE" "1" "07/21/2020" "ccache 3\&.7\&.11" "ccache Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/src/ccache.c b/src/ccache.c index 1b80fe0..5fb7b05 100644 --- a/src/ccache.c +++ b/src/ccache.c @@ -2212,7 +2212,7 @@ calculate_object_hash(struct args *args, struct args *preprocessor_args, if ((str_eq(args->argv[i], "-ccbin") || str_eq(args->argv[i], "--compiler-bindir")) && i + 1 < args->argc - && x_stat(args->argv[i+1], &st) == 0) { + && stat(args->argv[i+1], &st) == 0) { found_ccbin = true; hash_delimiter(hash, "ccbin"); hash_nvcc_host_compiler(hash, &st, args->argv[i+1]); @@ -2616,7 +2616,10 @@ process_profiling_option(const char *arg) || str_startswith(arg, "-fauto-profile=")) { new_profile_use = true; new_profile_path = x_strdup(strchr(arg, '=') + 1); - } else if (str_eq(arg, "-fprofile-sample-accurate")) { + } else if (str_eq(arg, "-fprofile-correction") + || str_eq(arg, "-fprofile-reorder-functions") + || str_eq(arg, "-fprofile-sample-accurate") + || str_eq(arg, "-fprofile-values")) { return true; } else { cc_log("Unknown profiling option: %s", arg); @@ -2846,7 +2849,8 @@ cc_process_args(struct args *args, // Handle options that should not be passed to the preprocessor. if (compopt_affects_comp(argv[i])) { args_add(compiler_only_args, argv[i]); - if (compopt_takes_arg(argv[i])) { + if (compopt_takes_arg(argv[i]) + || (guessed_compiler == GUESSED_NVCC && str_eq(argv[i], "-Werror"))) { if (i == argc - 1) { cc_log("Missing argument to %s", argv[i]); stats_update(STATS_ARGS); @@ -2889,6 +2893,17 @@ cc_process_args(struct args *args, continue; } + if (strlen(argv[i]) >= 3 + && str_startswith(argv[i], "-x") + && !islower(argv[i][2])) { + // -xCODE (where CODE can be e.g. Host or CORE-AVX2, always starting with + // an uppercase letter) is an ordinary Intel compiler option, not a + // language specification. (GCC's "-x" language argument is always + // lowercase.) + args_add(common_args, argv[i]); + continue; + } + // Special handling for -x: remember the last specified language before the // input file and strip all -x options from the arguments. if (str_eq(argv[i], "-x")) { diff --git a/src/compopt.c b/src/compopt.c index f59def9..cbf9f40 100644 --- a/src/compopt.c +++ b/src/compopt.c @@ -46,6 +46,7 @@ struct compopt { }; static const struct compopt compopts[] = { + {"--Werror", TAKES_ARG}, // nvcc {"--analyze", TOO_HARD}, // clang {"--compiler-bindir", AFFECTS_CPP | TAKES_ARG}, // nvcc {"--libdevice-directory", AFFECTS_CPP | TAKES_ARG}, // nvcc diff --git a/src/version.c b/src/version.c index 2d81361..5e4c555 100644 --- a/src/version.c +++ b/src/version.c @@ -1 +1 @@ -extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.10"; +extern const char CCACHE_VERSION[]; const char CCACHE_VERSION[] = "3.7.11"; diff --git a/test/suites/base.bash b/test/suites/base.bash index 7a864e9..bd5bbcb 100644 --- a/test/suites/base.bash +++ b/test/suites/base.bash @@ -373,7 +373,8 @@ base_tests() { # ------------------------------------------------------------------------- TEST "Directory is not hashed if using -gz" - if $REAL_COMPILER -c test1.c -gz -o /dev/null 2>/dev/null; then + $REAL_COMPILER -E test1.c -gz >preprocessed.i 2>/dev/null + if [ -s preprocessed.i ] && ! fgrep -q $PWD preprocessed.i; then mkdir dir1 dir2 cp test1.c dir1 cp test1.c dir2 @@ -395,7 +396,8 @@ base_tests() { # ------------------------------------------------------------------------- TEST "Directory is not hashed if using -gz=zlib" - if $REAL_COMPILER -c test1.c -gz=zlib -o /dev/null 2>/dev/null; then + $REAL_COMPILER -E test1.c -gz=zlib >preprocessed.i 2>/dev/null + if [ -s preprocessed.i ] && ! fgrep -q $PWD preprocessed.i; then mkdir dir1 dir2 cp test1.c dir1 cp test1.c dir2 diff --git a/test/suites/nvcc.bash b/test/suites/nvcc.bash index c121a57..f7b2e9e 100644 --- a/test/suites/nvcc.bash +++ b/test/suites/nvcc.bash @@ -286,6 +286,19 @@ nvcc_tests() { expect_stat 'cache miss' 1 expect_stat 'files in cache' 1 expect_equal_files reference_test1.o test_cpp.o + + # ------------------------------------------------------------------------- + TEST "Option -Werror" + + $ccache_nvcc_cpp -Werror cross-execution-space-call test_cpp.cu + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 1 + + $ccache_nvcc_cpp -Werror cross-execution-space-call test_cpp.cu + expect_stat 'cache hit (preprocessed)' 1 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 1 } SUITE_nvcc_PROBE() {