aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2014-05-01 21:54:33 -0600
committerJeff Law <law@gcc.gnu.org>2014-05-01 21:54:33 -0600
commitcea4a152f6c7824ec28e27580f2086b7c3e8f87c (patch)
treef923842622b57a2da86ad49ed1dae2fd344ffb7b /gcc
parent99c00993aed842de39de077fb67212857221338d (diff)
downloadgcc-cea4a152f6c7824ec28e27580f2086b7c3e8f87c.zip
gcc-cea4a152f6c7824ec28e27580f2086b7c3e8f87c.tar.gz
gcc-cea4a152f6c7824ec28e27580f2086b7c3e8f87c.tar.bz2
[multiple changes]
2014-05-01 Jeff Law <law@redhat.com> * Revert: 2014-04-24 Jincheng Miao <jincheng.miao@gmail.com> * zh_CN.po: Fix typo for -mfentry. From-SVN: r209997
Diffstat (limited to 'gcc')
-rw-r--r--gcc/po/ChangeLog7
-rw-r--r--gcc/po/zh_CN.po2
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 7526dda..a25a90e 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-01 Jeff Law <law@redhat.com>
+
+ * Revert:
+ 2014-04-24 Jincheng Miao <jincheng.miao@gmail.com>
+
+ * zh_CN.po: Fix typo for -mfentry.
+
2014-05-01 Joseph Myers <joseph@codesourcery.com>
* sv.po: Update.
diff --git a/gcc/po/zh_CN.po b/gcc/po/zh_CN.po
index 237e930..7edfcb4 100644
--- a/gcc/po/zh_CN.po
+++ b/gcc/po/zh_CN.po
@@ -24308,7 +24308,7 @@ msgstr "堆栈探针目前需要框架指针或 %saccumulate-outgoing-args%s 来
#: config/i386/i386.c:4108
#, gcc-internal-format
msgid "-mfentry isn%'t supported for 32-bit in combination with -fpic"
-msgstr "-mfentry 在 32 位下不能和 -fpic 同时使用"
+msgstr "-mfentry 在 32 位下不能和 -pic 同时使用"
#: config/i386/i386.c:4115
#, gcc-internal-format