summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryroux <yroux@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-02 07:15:01 +0000
committeryroux <yroux@138bc75d-0d04-0410-961f-82ee72b054a4>2015-04-02 07:15:01 +0000
commit65668adf48adb258b9ed93308db4c60ba77d944b (patch)
tree4484a547fe7bbaa7fc20a8c37721a68e5eab073c
parenta48a7003cda1343311244b8a3cdd04b7a03cd4f2 (diff)
downloadgcc-65668adf48adb258b9ed93308db4c60ba77d944b.tar.gz
2015-04-02 Yvan Roux <yvan.roux@linaro.org>
Backport from trunk r218897. 2014-12-19 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * doc/invoke.texi (ARM options): Remove mention of Advanced RISC Machines. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@221827 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.linaro8
-rw-r--r--gcc/doc/invoke.texi3
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro
index 4f65f925ae4..1c6e72071d6 100644
--- a/gcc/ChangeLog.linaro
+++ b/gcc/ChangeLog.linaro
@@ -1,5 +1,13 @@
2015-04.02 Yvan Roux <yvan.roux@linaro.org>
+ Backport from trunk r218897.
+ 2014-12-19 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
+
+ * doc/invoke.texi (ARM options): Remove mention of Advanced RISC
+ Machines.
+
+2015-04.02 Yvan Roux <yvan.roux@linaro.org>
+
Backport from trunk r218895.
2014-12-19 Xingxing Pan <xxingpan@marvell.com>
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 9accb77d132..1dcac767fa5 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -12190,8 +12190,7 @@ Replaced by @samp{-mmultcost}.
@subsection ARM Options
@cindex ARM options
-These @samp{-m} options are defined for Advanced RISC Machines (ARM)
-architectures:
+These @samp{-m} options are defined for the ARM port:
@table @gcctabopt
@item -mabi=@var{name}