On Dec 13, 2013, at 11:16 AM, Mike Stump <mikest...@comcast.net> wrote:
> Here are some soft merge conflict resolutions….
>
> I've checked them in to fix the build.
So, this let's us get farther…
Ok?
Index: ChangeLog.wide-int
===================================================================
--- ChangeLog.wide-int (revision 206019)
+++ ChangeLog.wide-int (working copy)
@@ -869,7 +869,9 @@
(output_constructor_bitfield): Likewise.
* var-tracking.c
(loc_cmp): Handle CONST_WIDE_INT.
- * mkconfig.sh: Define BITS_PER_UNIT for GENERATOR_FILEs.
+ * mkconfig.sh: Include machmode.h to pick up BITS_PER_UNIT for
+ GENERATOR_FILEs.
+ * gencheck.c: Define BITS_PER_UNIT.
* wide-int.cc: New.
* wide-int.h: New.
* wide-int-print.cc: New.
Index: gencheck.c
===================================================================
--- gencheck.c (revision 206019)
+++ gencheck.c (working copy)
@@ -17,6 +17,9 @@ You should have received a copy of the G
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
+/* We don't have insn-modes.h, but we include tm.h. */
+#define BITS_PER_UNIT 8
+
#include "bconfig.h"
#include "system.h"
#include "coretypes.h"
Index: mkconfig.sh
===================================================================
--- mkconfig.sh (revision 206019)
+++ mkconfig.sh (working copy)
@@ -100,8 +100,8 @@ case $output in
#if defined IN_GCC && !defined GENERATOR_FILE
# include "insn-modes.h"
#endif
-#if defined IN_GCC && defined GENERATOR_FILE
-# define BITS_PER_UNIT 8
+#if defined IN_GCC && defined GENERATOR_FILE && !defined BITS_PER_UNIT
+#include "machmode.h"
#endif
EOF
;;
