From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 25 Mar 2017 20:24:57 +0000 (+0100)
Subject: Merge branch '3.3-maint'
X-Git-Tag: v3.4~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec1f03092db27088b80fac05021a09cabde82394;p=thirdparty%2Fccache.git

Merge branch '3.3-maint'

* 3.3-maint:
  Update NEWS
  Add test for directory in ignore_headers_in_manifest
  Fix DIR_DELIM_CH for win32 and non-win32 platforms, values were mixed up
  Update NEWS
  Tweak source code format
  Support using multiple -fdebug-prefix-map
  Fixed the check for empty object file vs diagnostics
  Removed time_of_compilation check wrt SLOPPY_FILE_STAT_MATCHES
  Revert "Better parsing of g* Options, and only use last argument"
  Test that the order of debug options is kept
---

ec1f03092db27088b80fac05021a09cabde82394
diff --cc NEWS.txt
index 0b4c96e07,d412ea96b..e31a849e8
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -1,23 -1,22 +1,39 @@@
  ccache news
  ===========
  
 +ccache 3.4
 +----------
 +Unreleased
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- The compiler option form `--sysroot arg` is now handled like the documented
 +  `--sysroot=arg` form.
 +
 +- Added support for caching `.su` files generated by GCC flag `-fstack-usage`.
 +
 +- Configuration errors are now treated as warnings instead of fatal errors.
 +
 +- ccache should now work with distcc's ``pump'' wrapper.
 +
 +
+ ccache 3.3.5
+ ------------
+ Not yet released
+ 
+ Bug fixes
+ ~~~~~~~~~
+ 
+ - Fixed a regression where the original order of debug options could be lost.
+   This reverts the ``Improved parsing of `-g*` options'' feature in ccache 3.3.
+ 
+ - Multiple `-fdebug-prefix-map` options should now be handled correctly.
+ 
+ - Fixed matching of directories in the `ignore_headers_in_manifest`
+   configuration option.
+ 
+ 
  ccache 3.3.4
  ------------
  Release date: 2017-02-17
diff --cc ccache.c
index a9648b770,01e18218d..8a5b5b42b
--- a/ccache.c
+++ b/ccache.c
@@@ -178,11 -171,11 +178,14 @@@ static bool generating_dependencies
  // Is the compiler being asked to output coverage?
  static bool generating_coverage;
  
 +// Is the compiler being asked to output stack usage?
 +static bool generating_stackusage;
 +
  // Relocating debuginfo in the format old=new.
- static char *debug_prefix_map = NULL;
+ static char **debug_prefix_maps = NULL;
+ 
+ // Size of debug_prefix_maps list.
+ static size_t debug_prefix_maps_len = 0;
  
  // Is the compiler being asked to output coverage data (.gcda) at runtime?
  static bool profile_arcs;