From: Maxim Kuvyrkov Date: Mon, 11 Jun 2012 21:42:02 +0000 (+0000) Subject: * gcc/config/mips/mips-tables.opt (xlp): Fix merge typo. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b007d75c35c436c3929f2ee75f559d05cff5cbd;p=gcc.git * gcc/config/mips/mips-tables.opt (xlp): Fix merge typo. From-SVN: r188401 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bf972d0614c..49c23e81b57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-06-12 Maxim Kuvyrkov + + * gcc/config/mips/mips-tables.opt (xlp): Fix merge typo. + 2012-06-11 Roland McGrath * dwarf2out.c (const_ok_for_output_1): Detect a TLS UNSPEC using diff --git a/gcc/config/mips/mips-tables.opt b/gcc/config/mips/mips-tables.opt index e2325572803..75e742ea43b 100644 --- a/gcc/config/mips/mips-tables.opt +++ b/gcc/config/mips/mips-tables.opt @@ -616,5 +616,5 @@ EnumValue Enum(mips_arch_opt_value) String(octeon2) Value(83) Canonical EnumValue -Enum(mips_arch_opt_value) String(xlp) Value(83) Canonical +Enum(mips_arch_opt_value) String(xlp) Value(84) Canonical