diff --git a/tools/llvmc/ConfigLexer.h b/tools/llvmc/ConfigLexer.h
index f947da2bf2c..1548a724145 100644
--- a/tools/llvmc/ConfigLexer.h
+++ b/tools/llvmc/ConfigLexer.h
@@ -59,6 +59,7 @@ enum ConfigLexerTokens {
   DEFS_SUBST,   ///< The substitution item %defs%
   EQUALS,       ///< The equals sign, =
   FALSETOK,     ///< A boolean false value (false/no/off)
+  FOPTS_SUBST,  ///< The substitution item %fOpts%
   FORCE_SUBST,  ///< The substitution item %force%
   IN_SUBST,     ///< The substitution item %in%
   INCLS_SUBST,  ///< The substitution item %incls%
@@ -68,6 +69,7 @@ enum ConfigLexerTokens {
   LIBS,         ///< The name "libs" (and variants)
   LIBS_SUBST,   ///< The substitution item %libs%
   LINKER,       ///< The name "linker" (and variants)
+  MOPTS_SUBST,  ///< The substitution item %Mopts%
   NAME,         ///< The name "name" (and variants)
   OPT_SUBST,    ///< The substitution item %opt%
   OPTIMIZER,    ///< The name "optimizer" (and variants)
@@ -92,6 +94,7 @@ enum ConfigLexerTokens {
   TRUETOK,      ///< A boolean true value (true/yes/on)
   VERBOSE_SUBST,///< The substitution item %verbose%
   VERSION,      ///< The name "version" (and variants)
+  WOPTS_SUBST,  ///< The %WOpts% substitution
 };
 
 extern ConfigLexerTokens Configlex();
diff --git a/tools/llvmc/ConfigLexer.l b/tools/llvmc/ConfigLexer.l
index 481276ef153..cab02a1eec7 100644
--- a/tools/llvmc/ConfigLexer.l
+++ b/tools/llvmc/ConfigLexer.l
@@ -171,6 +171,9 @@ White           [ \t]*
 %target%        { return handleSubstitution(TARGET_SUBST); }
 %time%          { return handleSubstitution(TIME_SUBST); }
 %verbose%       { return handleSubstitution(VERBOSE_SUBST); }
+%fOpts%         { return handleSubstitution(FOPTS_SUBST); }
+%MOpts%         { return handleSubstitution(MOPTS_SUBST); }
+%WOpts%         { return handleSubstitution(WOPTS_SUBST); }
 {BadSubst}      { YY_FATAL_ERROR("Invalid substitution token"); }
 
 {Assembly}      { return handleValueContext(ASSEMBLY); }