diff mbox

we are starting the wide int merge

Message ID 26FAA857-3084-4D75-AE89-3E24ADA98801@comcast.net
State New
Headers show

Commit Message

Mike Stump May 6, 2014, 10:54 p.m. UTC
On May 6, 2014, at 2:17 PM, Jan-Benedict Glaw <jbglaw@lug-owl.de> wrote:
> On Tue, 2014-05-06 12:20:54 -0700, Mike Stump <mikestump@comcast.net> wrote:
>> On May 6, 2014, at 8:19 AM, Kenneth Zadeck <zadeck@naturalbridge.com> wrote:
>>> please hold off on committing patches for the next couple of hours as we have a very large merge to do.
>>> thanks.
>> 
>> All done…  It is in.
> 
> My build robot experiences errors like this:
> 
> g++ -c   -g -O2 -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE  -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -fno-common  -DHAVE_CONFIG_H -I. -I. -I/home/jbglaw/repos/gcc/gcc -I/home/jbglaw/repos/gcc/gcc/. -I/home/jbglaw/repos/gcc/gcc/../include -I/home/jbglaw/repos/gcc/gcc/../libcpp/include -I/opt/cfarm/gmp-latest/include -I/opt/cfarm/mpfr-latest/include -I/opt/cfarm/mpc-latest/include  -I/home/jbglaw/repos/gcc/gcc/../libdecnumber -I/home/jbglaw/repos/gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I/home/jbglaw/repos/gcc/gcc/../libbacktrace    -o alias.o -MT alias.o -MMD -MP -MF ./.deps/alias.TPo /home/jbglaw/repos/gcc/gcc/alias.c
> In file included from /home/jbglaw/repos/gcc/gcc/real.h:25:0,
>                 from /home/jbglaw/repos/gcc/gcc/rtl.h:27,
>                 from /home/jbglaw/repos/gcc/gcc/alias.c:25:
> /home/jbglaw/repos/gcc/gcc/wide-int.h: In instantiation of 'bool wi::ltu_p(const T1&, const T2&) [with T1 = generic_wide_int<wi::extended_tree<96> >; T2 = long int]':
> /home/jbglaw/repos/gcc/gcc/alias.c:346:28:   required from here
> /home/jbglaw/repos/gcc/gcc/wide-int.h:1787:25: error: incomplete type 'wi::int_traits<long int>' used in nested name specifier
>   WIDE_INT_REF_FOR (T2) yi (y, precision);

I’m pretty sure this:


will fix it.  If someone can confirm that would be great.

Comments

Jan-Benedict Glaw May 6, 2014, 11:03 p.m. UTC | #1
On Tue, 2014-05-06 15:54:05 -0700, Mike Stump <mikestump@comcast.net> wrote:
> On May 6, 2014, at 2:17 PM, Jan-Benedict Glaw <jbglaw@lug-owl.de> wrote:
> > On Tue, 2014-05-06 12:20:54 -0700, Mike Stump <mikestump@comcast.net> wrote:
> > > On May 6, 2014, at 8:19 AM, Kenneth Zadeck <zadeck@naturalbridge.com> wrote:
> > > > please hold off on committing patches for the next couple of
> > > > hours as we have a very large merge to do.  thanks.
> > > All done…  It is in.
> > My build robot experiences errors like this:
[...]
> I’m pretty sure this:
[...]
> will fix it.  If someone can confirm that would be great.

I addad that patch to two (darkeye and gcc76) of the builders. Won't
probably take too long :)

MfG, JBG
Mike Stump May 6, 2014, 11:16 p.m. UTC | #2
On May 6, 2014, at 3:54 PM, Mike Stump <mikestump@comcast.net> wrote:
> 
> I’m pretty sure this:

> will fix it.  If someone can confirm that would be great.

I tried that on my p7 and on my x86_64 machines, they both build fine.
Mike Stump May 6, 2014, 11:52 p.m. UTC | #3
On May 6, 2014, at 3:54 PM, Mike Stump <mikestump@comcast.net> wrote:
> 
>> My build robot experiences errors like this:
>> 
>> g++ -c   -g -O2 -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE  -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -fno-common  -DHAVE_CONFIG_H -I. -I. -I/home/jbglaw/repos/gcc/gcc -I/home/jbglaw/repos/gcc/gcc/. -I/home/jbglaw/repos/gcc/gcc/../include -I/home/jbglaw/repos/gcc/gcc/../libcpp/include -I/opt/cfarm/gmp-latest/include -I/opt/cfarm/mpfr-latest/include -I/opt/cfarm/mpc-latest/include  -I/home/jbglaw/repos/gcc/gcc/../libdecnumber -I/home/jbglaw/repos/gcc/gcc/../libdecnumber/dpd -I../libdecnumber -I/home/jbglaw/repos/gcc/gcc/../libbacktrace    -o alias.o -MT alias.o -MMD -MP -MF ./.deps/alias.TPo /home/jbglaw/repos/gcc/gcc/alias.c
>> In file included from /home/jbglaw/repos/gcc/gcc/real.h:25:0,
>>                from /home/jbglaw/repos/gcc/gcc/rtl.h:27,
>>                from /home/jbglaw/repos/gcc/gcc/alias.c:25:
>> /home/jbglaw/repos/gcc/gcc/wide-int.h: In instantiation of 'bool wi::ltu_p(const T1&, const T2&) [with T1 = generic_wide_int<wi::extended_tree<96> >; T2 = long int]':
>> /home/jbglaw/repos/gcc/gcc/alias.c:346:28:   required from here
>> /home/jbglaw/repos/gcc/gcc/wide-int.h:1787:25: error: incomplete type 'wi::int_traits<long int>' used in nested name specifier
>>  WIDE_INT_REF_FOR (T2) yi (y, precision);
> 
> I’m pretty sure this:

I checked this in, sorry for the breakage.

	* wide-int.h (wi::int_traits <HOST_WIDE_INT>): Always define.

Committed revision 210128.
diff mbox

Patch

Index: gcc/wide-int.h
===================================================================
--- gcc/wide-int.h	(revision 210113)
+++ gcc/wide-int.h	(working copy)
@@ -1442,7 +1442,6 @@  namespace wi
   struct int_traits <unsigned int>
     : public primitive_int_traits <unsigned int, false> {};
 
-#if HOST_BITS_PER_INT != HOST_BITS_PER_WIDE_INT
   template <>
   struct int_traits <HOST_WIDE_INT>
     : public primitive_int_traits <HOST_WIDE_INT, true> {};
@@ -1450,7 +1449,6 @@  namespace wi
   template <>
   struct int_traits <unsigned HOST_WIDE_INT>
     : public primitive_int_traits <unsigned HOST_WIDE_INT, false> {};
-#endif
 }
 
 namespace wi