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

diff --cc NEWS.txt
index 0b4c96e07e1724586f0081bc8f1dbfe354ffa468,d412ea96b958204d77de35c98a26910d9d9fc158..e31a849e88b62c368edf596aa51c620e3b021c3b
--- 1/NEWS.txt
--- 2/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 a9648b770ae7bc1aacf8d17ebe2946821a88339b,01e18218df3ea4db76949669af9ca3b1dfced074..8a5b5b42b250184a747ac70139c1209f6b916b40
--- 1/ccache.c
--- 2/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;

diff --cc ccache.h
Simple merge

diff --cc test.sh
Simple merge

diff --cc test/test_argument_processing.c
Simple merge