Merge branch '3.2-maint'

* 3.2-maint:
  Only set SA_RESTART if it is defined

diff --cc NEWS.txt
index 02ad96ac6364e4f44040e547c1b7cedc3d35e0fd,18c7c540c05b11c05523d14a1adf356ee4910a86..c9429873b6c252f5c359d551e3399473243b9dcd
--- 1/NEWS.txt
--- 2/NEWS.txt
+++ b/NEWS.txt
@@@ -2,54 -2,15 +2,63 @@@ ccache new
  ===========
  
  
 +Unreleased 3.3
 +--------------
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Added support for cuda including the -optf/--options-file option.
 +
 +- Added new sloppiness option `no_system_headers`, which tells ccache not to
 +  include system headers in manifest files.
 +
 +- Multiple identical `-arch` arguments are now handled without bailing.
 +
 +- Added new `ignore_headers_in_manifest` configuration option, which specifies
 +  headers that should be ignored in the direct mode.
 +
 +- Added new `prefix_command_cpp` (`CCACHE_PREFIX_CPP`) configuration option,
 +  which specifies one or several prefixes to add to the command line ccache
 +  uses when invoking the preprocessor.
 +
 +- The concatenated form of some long compiler options is now recognized, for
 +  example when using `-isystemPATH` instead of `-isystem PATH`.
 +
 +- If hard-linking is enabled and but fails (e.g. due to cross-device linking),
 +  ccache now falls back to copying instead of running the compiler.
 +
 +- Made the `hash_dir` option only have effect when generating debug info.
 +
 +- Added support for relocating debug info directory using `-fdebug-prefix-map`.
 +  This allows for cache hits even when `hash_dir` is used in combination with
 +  `base_dir`.
 +
 +- Added new `keep_comments_cpp` (`CCACHE_COMMENTS`) configuration option, which
 +  tells ccache not to discard the comments before hashing preprocessor output.
 +  This can be used to check documentation with *-Wdocumentation*.
 +
 +- ccache now knows how to convert absolute paths to relative paths inside
 +  dependency files when using `base_dir`.
 +
 +
 +Bug fixes
 +~~~~~~~~~
 +
 +- Fixed clang test suite when running on Linux.
 +
 +- Fixed build and test for MinGW32 and Windows.
 +
 +
+ Unreleased 3.2.6
+ ----------------
+ 
+ Bug fixes
+ ~~~~~~~~~
+ 
+ - Fixed build problem on QNX, which lacks ``SA_RESTART''.
+ 
+ 
  ccache 3.2.5
  ------------
  Release date: 2016-04-17

diff --cc ccache.c
Simple merge