Merge branch 'master' into cooking

diff --cc doc/gmqcc.1
index 7ee54c01cab814924cbc17f04fa67e903cd08b86,557995e02fb6c628011fd583f87c5349a7b8ddf5..b5d39eab4578f22ed95fade87d0162def05e98e1
--- 1/doc/gmqcc.1
--- 2/doc/gmqcc.1
+++ b/doc/gmqcc.1
@@@ -335,15 -335,9 +335,15 @@@ ignored for both cases
  When compiling original QuakeWorld QC there are instances where
  code overwrites constants. This is considered an error, however
  for QuakeWorld to compile it needs to be treated as a warning
- instead, as such this warning only works when -std=qcc.
+ instead, as such this warning only works when \-std=qcc.
  .It Fl W Ns Cm directive-inmacro
  Warn about the use of preprocessor directives inside macros.
 +.It Fl W Ns Cm builtins
 +When using a function that is not explicitly defined, the compiler
 +will search its intrinsics table for something that matches that
 +function name by appending "__builtin_" to it. This behaviour may
 +be unexpected, so enabling this will produce a diagnostic when
 +such a function is resolved to a builtin.
  .El
  .Sh COMPILE FLAGS
  .Bl -tag -width Ds