2016-04-14 Basile Starynkevitch <basile@starynkevitch.net>

	{{merging with even more of GCC 6, using subversion 1.9
	svn merge -r228401:229500 ^/trunk
	}}



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@234985 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 14 insertions, 38 deletions

diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index 7b3b6efd3db..d77e07dc4bd 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -22,39 +22,19 @@
 #include "system.h"
 #include "coretypes.h"
 #include "backend.h"
-#include "cfghooks.h"
-#include "tree.h"
+#include "target.h"
 #include "rtl.h"
+#include "tree.h"
 #include "df.h"
-#include "alias.h"
-#include "fold-const.h"
-#include "stor-layout.h"
-#include "calls.h"
 #include "tm_p.h"
 #include "regs.h"
-#include "insn-config.h"
+#include "emit-rtl.h"
+#include "diagnostic-core.h"
+#include "stor-layout.h"
+#include "calls.h"
 #include "conditions.h"
 #include "output.h"
-#include "insn-codes.h"
-#include "insn-attr.h"
-#include "flags.h"
-#include "except.h"
-#include "recog.h"
-#include "expmed.h"
-#include "dojump.h"
-#include "explow.h"
-#include "emit-rtl.h"
-#include "varasm.h"
-#include "stmt.h"
 #include "expr.h"
-#include "optabs.h"
-#include "diagnostic-core.h"
-#include "cfgrtl.h"
-#include "cfganal.h"
-#include "lcm.h"
-#include "cfgbuild.h"
-#include "cfgcleanup.h"
-#include "target.h"
 #include "builtins.h"
 
 /* This file should be included last.  */
@@ -1386,10 +1366,8 @@ cr16_const_double_ok (rtx op)
 {
   if (GET_MODE (op) == SFmode)
     {
-      REAL_VALUE_TYPE r;
       long l;
-      REAL_VALUE_FROM_CONST_DOUBLE (r, op);
-      REAL_VALUE_TO_TARGET_SINGLE (r, l);
+      REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (op), l);
       return UNSIGNED_INT_FITS_N_BITS (l, 4) ? 1 : 0;
     }
 
@@ -1521,11 +1499,9 @@ cr16_print_operand (FILE * file, rtx x, int code)
 
 	case CONST_DOUBLE:
 	  {
-	    REAL_VALUE_TYPE r;
 	    long l;
 
-	    REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-	    REAL_VALUE_TO_TARGET_SINGLE (r, l);
+	    REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (x), l);
 
 	    fprintf (file, "$0x%lx", l);
 	    return;
diff --git a/gcc/config/cr16/cr16.opt b/gcc/config/cr16/cr16.opt
index ff43868d267..02d8609e914 100644
--- a/gcc/config/cr16/cr16.opt
+++ b/gcc/config/cr16/cr16.opt
@@ -20,30 +20,30 @@
 
 msim
 Target
--msim   Use simulator runtime
+-msim   Use simulator runtime.
 
 mbit-ops
 Target Report Mask(BIT_OPS)
-Generate SBIT, CBIT instructions
+Generate SBIT, CBIT instructions.
 
 mmac
 Target Report Mask(MAC)
-Support multiply accumulate instructions
+Support multiply accumulate instructions.
 
 mdebug-addr
 Target RejectNegative Var(TARGET_DEBUG_ADDR) Undocumented
 
 mdata-model=
 Target RejectNegative JoinedOrMissing Var(cr16_data_model)
-Treat data references as near, far or medium. medium is default
+Treat data references as near, far or medium. medium is default.
 
 mcr16c
 Target RejectNegative Mask(CR16C)
-Generate code for CR16C architecture
+Generate code for CR16C architecture.
 
 mcr16cplus
 Target RejectNegative InverseMask(CR16C,CR16CP)
-Generate code for CR16C+ architecture (Default)
+Generate code for CR16C+ architecture (Default).
 
 mint32
 Target RejectNegative Mask(INT32)