Resolve soft merge conflict.

Premerge a typo fix to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@205968 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog.wide-int b/gcc/ChangeLog.wide-int
index b5f88b2..df90c29 100644 (file)
--- a/gcc/ChangeLog.wide-int
+++ b/gcc/ChangeLog.wide-int
@@ -367,8 +367,6 @@
        * lto-streamer-out.c
        (hash_tree): Use wide-int interfaces.
        (output_cfg): Likewise.
-       * machmode.def
-       (MAX_BITS_PER_UNIT): New.
        * Makefile.in
        (RTL_H, CFGLOOP_H, C_COMMON_H, TREE_FLOW_H): Add wide-int.h.
        (REAL_H): Add signop.h.

diff --git a/gcc/genmodes.c b/gcc/genmodes.c
index a76374a..d6dcd2d 100644 (file)
--- a/gcc/genmodes.c
+++ b/gcc/genmodes.c
@@ -891,7 +891,7 @@ emit_max_int (void)
          max = i->bytesize;
       if (max > mmax)
        mmax = max;
-      printf ("#define MAX_BITSIZE_MODE_ANY_INT %d*BITS_PER_UNIT\n", mmax);
+      printf ("#define MAX_BITSIZE_MODE_ANY_INT (%d*BITS_PER_UNIT)\n", mmax);
     }
   else
     printf ("#define MAX_BITSIZE_MODE_ANY_INT %d\n", max_bitsize_mode_any_int);
@@ -901,7 +901,7 @@ emit_max_int (void)
     for (i = modes[j]; i; i = i->next)
       if (mmax < i->bytesize)
        mmax = i->bytesize;
-  printf ("#define MAX_BITSIZE_MODE_ANY_MODE %d\n", mmax * MAX_BITS_PER_UNIT);
+  printf ("#define MAX_BITSIZE_MODE_ANY_MODE (%d*BITS_PER_UNIT)\n", mmax);
 }
 
 static void

diff --git a/gcc/machmode.def b/gcc/machmode.def
index c425e6a..8c4cd73 100644 (file)
--- a/gcc/machmode.def
+++ b/gcc/machmode.def
@@ -229,9 +229,6 @@ UACCUM_MODE (USA, 4, 16, 16); /* 16.16 */
 UACCUM_MODE (UDA, 8, 32, 32); /* 32.32 */
 UACCUM_MODE (UTA, 16, 64, 64); /* 64.64 */
 
-/* Should be overridden by EXTRA_MODES_FILE if wrong.  */
-#define MAX_BITS_PER_UNIT 8
-
 /* Allow the target to specify additional modes of various kinds.  */
 #if HAVE_EXTRA_MODES
 # include EXTRA_MODES_FILE