re PR target/54854 ([avr] Deprecate and finally remove the -mshort-calls command...

	PR target/54854
	* doc/invoke.texi (AVR Options): Remove -mshort-calls.
	* config/avr/avr.opt (-mshort-calls): Remove option.
	* config/avr/avr.h (AVR_HAVE_JMP_CALL): Don't depend on
	TARGET_SHORT_CALLS.

From-SVN: r192201

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75b99cd..9a38826 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-08  Georg-Johann Lay  <avr@gjlay.de>
+
+       PR target/54854
+       * doc/invoke.texi (AVR Options): Remove -mshort-calls.
+       * config/avr/avr.opt (-mshort-calls): Remove option.
+       * config/avr/avr.h (AVR_HAVE_JMP_CALL): Don't depend on
+       TARGET_SHORT_CALLS.
+
 2012-10-08  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/54685

diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 8488ecd..4925e0e 100644 (file)
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -57,7 +57,7 @@ enum
 
 #define TARGET_CPU_CPP_BUILTINS()      avr_cpu_cpp_builtins (pfile)
 
-#define AVR_HAVE_JMP_CALL (avr_current_arch->have_jmp_call && !TARGET_SHORT_CALLS)
+#define AVR_HAVE_JMP_CALL (avr_current_arch->have_jmp_call)
 #define AVR_HAVE_MUL (avr_current_arch->have_mul)
 #define AVR_HAVE_MOVW (avr_current_arch->have_movw_lpmx)
 #define AVR_HAVE_LPMX (avr_current_arch->have_movw_lpmx)

diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt
index 10769e8..35fca20 100644 (file)
--- a/gcc/config/avr/avr.opt
+++ b/gcc/config/avr/avr.opt
@@ -50,10 +50,6 @@ Target Report Undocumented Mask(ORDER_1)
 morder2
 Target Report Undocumented Mask(ORDER_2)
 
-mshort-calls
-Target Report Mask(SHORT_CALLS)
-Use rjmp/rcall (limited range) on >8K devices
-
 mtiny-stack
 Target Report Mask(TINY_STACK)
 Change only the low 8 bits of the stack pointer

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 711c151..9d48597 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -505,7 +505,7 @@ Objective-C and Objective-C++ Dialects}.
 
 @emph{AVR Options}
 @gccoptlist{-mmcu=@var{mcu} -maccumulate-args -mbranch-cost=@var{cost} @gol
--mcall-prologues -mint8 -mno-interrupts -mrelax -mshort-calls @gol
+-mcall-prologues -mint8 -mno-interrupts -mrelax @gol
 -mstrict-X -mtiny-stack}
 
 @emph{Blackfin Options}
@@ -11296,13 +11296,6 @@ differ from instructions in the assembler code.
 Relaxing must be turned on if linker stubs are needed, see the
 section on @code{EIND} and linker stubs below.
 
-@item -mshort-calls
-@opindex mshort-calls
-Use @code{RCALL}/@code{RJMP} instructions even on devices with
-16@tie{}KiB or more of program memory, i.e.@: on devices that
-have the @code{CALL} and @code{JMP} instructions.
-See also the @code{-mrelax} command line option.
-
 @item -msp8
 @opindex msp8
 Treat the stack pointer register as an 8-bit register,
@@ -11565,7 +11558,7 @@ The device has a hardware multiplier.
 @item __AVR_HAVE_JMP_CALL__
 The device has the @code{JMP} and @code{CALL} instructions.
 This is the case for devices with at least 16@tie{}KiB of program
-memory and if @code{-mshort-calls} is not set.
+memory.
 
 @item __AVR_HAVE_EIJMP_EICALL__
 @item __AVR_3_BYTE_PC__