diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer
index 803b5e9..c182a68 100755
--- a/tools/scan-build/ccc-analyzer
+++ b/tools/scan-build/ccc-analyzer
@@ -315,6 +315,7 @@
 my %CompileOptionMap = (
   '-nostdinc' => 0,
   '-fblocks' => 0,
+  '-fno-builtin' => 0,
   '-fobjc-gc-only' => 0,
   '-fobjc-gc' => 0,
   '-ffreestanding' => 0,
@@ -365,6 +366,7 @@
 
 my %LangMap = (
   'c'   => 'c',
+  'cp'  => 'c++',
   'cpp' => 'c++',
   'cc'  => 'c++',
   'i'   => 'c-cpp-output',