diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b31f166df7f3f15822f601bdf39903d8c34e0d8..281a4a43a07382eb1d685a1200c3411cfc89a2e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-03  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* doc/invoke.texi (SPARC options): Document -mlra as the default.
+	* config/sparc/sparc.c (sparc_option_override): Force LRA unless
+	-mlra/-mno-lra was passed to the compiler.
+
 2017-01-03  James Cowgill  <James.Cowgill@imgtec.com>
 
 	PR rtl-optimization/65618
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index ae0d0f67a724bbaf5e6e7e687b52355bf57fc49a..b9213c30bcb0e49826f319667bbf7fe4d7bac157 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -1523,6 +1523,10 @@ sparc_option_override (void)
   if (TARGET_ARCH32)
     target_flags &= ~MASK_STACK_BIAS;
 
+  /* Use LRA instead of reload, unless otherwise instructed.  */
+  if (!(target_flags_explicit & MASK_LRA))
+    target_flags |= MASK_LRA;
+
   /* Supply a default value for align_functions.  */
   if (align_functions == 0
       && (sparc_cpu == PROCESSOR_ULTRASPARC
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index a8f8efe4e8e2914768207affb0a74435e0e50ed5..f1794bc0fe69230c008d7b06435ff07d87b66127 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -23271,8 +23271,8 @@ in 64-bit mode.
 @itemx -mno-lra
 @opindex mlra
 @opindex mno-lra
-Enable Local Register Allocation.  This is experimental for SPARC, so by
-default the compiler uses standard reload (i.e. @option{-mno-lra}).
+Enable Local Register Allocation.  This is the default for SPARC since GCC 7
+so @option{-mno-lra} needs to be passed to get old Reload.
 
 @item -mcpu=@var{cpu_type}
 @opindex mcpu