Merge branch '3.3-maint'

* 3.3-maint:
  Run test for undefined behaviour with Travis
  Undefined: avoid shift warning in manifest
  Undefined: avoid shift warning in murmurhash
  Undefined: avoid null warning in tmp_unlink
  Include feature_macros earlier in configure.ac
  Document the different cache statistics counters
  Use correct statistics counter for -optf/--options-file failure
  Update NEWS
  Include names of include files in the hash again

diff --cc NEWS.txt
index c4994afc43ce35ff2963742bc4b76457594746ed,323fa02a0d107b4704e62ee558eabeaa7e6d6bf5..d20861bbb8db3dc62133069ed2158d7e7a6a5d9f
--- 1/NEWS.txt
--- 2/NEWS.txt
+++ b/NEWS.txt
@@@ -1,20 -1,27 +1,40 @@@
  ccache news
  ===========
  
 -
 +Unreleased 3.4
 +--------------
 +
 +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 3.3.4
+ ------------
+ Release date: TBD
+ 
+ New features and improvements
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ - Documented the different cache statistics counters.
+ 
+ 
+ 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. This was only partially fixed in 3.3.2 and reverts the new
+   "Names of included files are no longer included in the hash of the compiler's
+   preprocessed output" feature in 3.3.
+ 
+ 
  ccache 3.3.3
  ------------
  Release date: 2016-10-26

diff --cc ccache.c
index 84e27490c77e9e75405fb1ae74b4fa4cf56f05cf,2c14795a0cf220c706bbef2e699d77546e3ad348..df4a190c0992bc64f66927879aa4a484672bfaef
--- 1/ccache.c
--- 2/ccache.c
+++ b/ccache.c
@@@ -1132,10 -1126,9 +1152,12 @@@ to_cache(struct args *args
                if (tmp_cov) {
                        tmp_unlink(tmp_cov);
                }
-               tmp_unlink(tmp_dwo);
 +              if (tmp_su) {
 +                      tmp_unlink(tmp_su);
 +              }
+               if (tmp_dwo) {
+                       tmp_unlink(tmp_dwo);
+               }
                failed();
        }
        if (st.st_size != 0) {
@@@ -1146,10 -1139,9 +1168,12 @@@
                if (tmp_cov) {
                        tmp_unlink(tmp_cov);
                }
-               tmp_unlink(tmp_dwo);
 +              if (tmp_su) {
 +                      tmp_unlink(tmp_su);
 +              }
+               if (tmp_dwo) {
+                       tmp_unlink(tmp_dwo);
+               }
                failed();
        }
        tmp_unlink(tmp_stdout);
@@@ -1210,10 -1202,9 +1234,12 @@@
                if (tmp_cov) {
                        tmp_unlink(tmp_cov);
                }
-               tmp_unlink(tmp_dwo);
 +              if (tmp_su) {
 +                      tmp_unlink(tmp_su);
 +              }
+               if (tmp_dwo) {
+                       tmp_unlink(tmp_dwo);
+               }
  
                failed();
        }

diff --cc test.sh
Simple merge