Merge "Updates for bison 3.5" am: e262086a37 am: 55bdf75af8

Change-Id: Ic1ada8bd6b96e456a657ad2e2a3d9a88dd97bbab
diff --git a/lib/Script/ScriptParser.yy b/lib/Script/ScriptParser.yy
index 0e32a44..3bda9bc 100644
--- a/lib/Script/ScriptParser.yy
+++ b/lib/Script/ScriptParser.yy
@@ -44,9 +44,9 @@
  * END android-removed
  */
 %debug
-%error-verbose
-%define namespace "mcld"
-%define "parser_class_name" "ScriptParser"
+%define parse.error verbose
+%define api.namespace {mcld}
+%define api.parser.class {ScriptParser}
 %parse-param { const class LinkerConfig& m_LDConfig }
 %parse-param { class ScriptFile& m_ScriptFile }
 %parse-param { class ScriptScanner& m_ScriptScanner }