From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sun, 26 Jan 2014 11:38:00 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.0~14
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=9cc4fe1ed246e3c37af7cbd7245b0b413372f3b9

Merge branch 'master' into cooking
---

9cc4fe1ed246e3c37af7cbd7245b0b413372f3b9
diff --cc doc/gmqcc.1
index 7ee54c0,557995e..b5d39ea
--- a/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