[PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='

[PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='

[Maciej W. Rozycki]

Move the `-mcompact-branches=' option out of the middle of a block of 
floating-point options.  The option is not related to FP in any way.  
Place it immediately below other branch instruction selection options.

	gcc/
	* doc/invoke.texi (Option Summary) <MIPS Options>: Reorder
	`-mcompact-branches='.
	(MIPS Options): Likewise.
---

 OK to apply?

  Maciej

gcc-mips-compact-branches-doc-fix.diff
Index: gcc/gcc/doc/invoke.texi
===================================================================
--- gcc.orig/gcc/doc/invoke.texi	2015-11-23 21:02:46.594781253 +0000
+++ gcc/gcc/doc/invoke.texi	2015-11-23 23:12:45.009558919 +0000
@@ -793,7 +793,6 @@ Objective-C and Objective-C++ Dialects}.
 -mgp32  -mgp64  -mfp32  -mfpxx  -mfp64  -mhard-float  -msoft-float @gol
 -mno-float  -msingle-float  -mdouble-float @gol
 -modd-spreg -mno-odd-spreg @gol
--mcompact-branches=@var{policy} @gol
 -mabs=@var{mode}  -mnan=@var{encoding} @gol
 -mdsp  -mno-dsp  -mdspr2  -mno-dspr2 @gol
 -mmcu -mmno-mcu @gol
@@ -824,6 +823,7 @@ Objective-C and Objective-C++ Dialects}.
 -mfix-vr4130  -mno-fix-vr4130  -mfix-sb1  -mno-fix-sb1 @gol
 -mflush-func=@var{func}  -mno-flush-func @gol
 -mbranch-cost=@var{num}  -mbranch-likely  -mno-branch-likely @gol
+-mcompact-branches=@var{policy} @gol
 -mfp-exceptions -mno-fp-exceptions @gol
 -mvr4130-align -mno-vr4130-align -msynci -mno-synci @gol
 -mrelax-pic-calls -mno-relax-pic-calls -mmcount-ra-address @gol
@@ -17602,30 +17602,6 @@ for the o32 ABI.  This is the default fo
 support these registers.  When using the o32 FPXX ABI, @option{-mno-odd-spreg}
 is set by default.
 
-@item -mcompact-branches=never
-@itemx -mcompact-branches=optimal
-@itemx -mcompact-branches=always
-@opindex mcompact-branches=never
-@opindex mcompact-branches=optimal
-@opindex mcompact-branches=always
-These options control which form of branches will be generated.  The
-default is @option{-mcompact-branches=optimal}.
-
-The @option{-mcompact-branches=never} option ensures that compact branch
-instructions will never be generated.
-
-The @option{-mcompact-branches=always} option ensures that a compact
-branch instruction will be generated if available.  If a compact branch
-instruction is not available, a delay slot form of the branch will be
-used instead.
-
-This option is supported from MIPS Release 6 onwards.
-
-The @option{-mcompact-branches=optimal} option will cause a delay slot
-branch to be used if one is available in the current ISA and the delay
-slot is successfully filled.  If the delay slot is not filled, a compact
-branch will be chosen if one is available.
-
 @item -mabs=2008
 @itemx -mabs=legacy
 @opindex mabs=2008
@@ -18189,6 +18165,30 @@ and processors that implement those arch
 Likely instructions are not be generated by default because the MIPS32
 and MIPS64 architectures specifically deprecate their use.
 
+@item -mcompact-branches=never
+@itemx -mcompact-branches=optimal
+@itemx -mcompact-branches=always
+@opindex mcompact-branches=never
+@opindex mcompact-branches=optimal
+@opindex mcompact-branches=always
+These options control which form of branches will be generated.  The
+default is @option{-mcompact-branches=optimal}.
+
+The @option{-mcompact-branches=never} option ensures that compact branch
+instructions will never be generated.
+
+The @option{-mcompact-branches=always} option ensures that a compact
+branch instruction will be generated if available.  If a compact branch
+instruction is not available, a delay slot form of the branch will be
+used instead.
+
+This option is supported from MIPS Release 6 onwards.
+
+The @option{-mcompact-branches=optimal} option will cause a delay slot
+branch to be used if one is available in the current ISA and the delay
+slot is successfully filled.  If the delay slot is not filled, a compact
+branch will be chosen if one is available.
+
 @item -mfp-exceptions
 @itemx -mno-fp-exceptions
 @opindex mfp-exceptions

RE: [PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='

[Moore, Catherine]

> -----Original Message-----
> From: Maciej W. Rozycki [mailto:macro@imgtec.com]
> Sent: Thursday, November 26, 2015 9:01 AM
> To: gcc-patches@gcc.gnu.org
> Cc: Moore, Catherine; Matthew Fortune
> Subject: [PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='
> 
> Move the `-mcompact-branches=' option out of the middle of a block of
> floating-point options.  The option is not related to FP in any way.
> Place it immediately below other branch instruction selection options.
> 
> 	gcc/
> 	* doc/invoke.texi (Option Summary) <MIPS Options>: Reorder
> 	`-mcompact-branches='.
> 	(MIPS Options): Likewise.
> ---
> 
>  OK to apply?
> 
 Yes -- thanks.

RE: [PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='

[Maciej W. Rozycki]

On Thu, 26 Nov 2015, Moore, Catherine wrote:

> >  OK to apply?
> > 
>  Yes -- thanks.

 Applied, thanks for your review.

  Maciej

RE: [PATCH] MIPS/GCC/doc: Reorder `-mcompact-branches='

[Matthew Fortune]

Maciej Rozycki <Maciej.Rozycki@imgtec.com> writes:
> Move the `-mcompact-branches=' option out of the middle of a block of
> floating-point options.  The option is not related to FP in any way.
> Place it immediately below other branch instruction selection options.
> 
> 	gcc/
> 	* doc/invoke.texi (Option Summary) <MIPS Options>: Reorder
> 	`-mcompact-branches='.
> 	(MIPS Options): Likewise.
> ---
> 
>  OK to apply?

OK, thanks.

Matthew