aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim@codesourcery.com>2012-06-11 21:42:02 +0000
committerMaxim Kuvyrkov <mkuvyrkov@gcc.gnu.org>2012-06-11 21:42:02 +0000
commit8b007d75c35c436c3929f2ee75f559d05cff5cbd (patch)
treee22970e1c5a98800a73ee802409d84b7c22d9552
parent67a218c536ea9df14dbfdf5f4d8c208b64e2225d (diff)
downloadgcc-8b007d75c35c436c3929f2ee75f559d05cff5cbd.zip
gcc-8b007d75c35c436c3929f2ee75f559d05cff5cbd.tar.gz
gcc-8b007d75c35c436c3929f2ee75f559d05cff5cbd.tar.bz2
* gcc/config/mips/mips-tables.opt (xlp): Fix merge typo.
From-SVN: r188401
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/mips/mips-tables.opt2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf972d0..49c23e8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-12 Maxim Kuvyrkov <maxim@codesourcery.com>
+
+ * gcc/config/mips/mips-tables.opt (xlp): Fix merge typo.
+
2012-06-11 Roland McGrath <mcgrathr@google.com>
* 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 e232557..75e742e 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