current to 6-stable merge plans/policy

[Sam Leffler]

John Hay wrote:
> On Thu, Mar 22, 2007 at 07:43:05PM +0200, John Hay wrote:
>> On Thu, Mar 22, 2007 at 04:31:23PM +0100, Olivier Houchard wrote:
>>> On Thu, Mar 22, 2007 at 08:05:44AM -0700, Sam Leffler wrote:
>>>> John Hay wrote:
>>>>> Hi Guys,
>>>>>
>>>>> What are the ideas (policy) about merging the arm/ixp425/avila stuff
>>>>> to 6-stable? I see some arm stuff gets merged, but it does not look
>>>>> like everything? Is it just that people merge what they need?
>>>>>
>>>>> Just trying to get a feel for it. Up to now I have used 6-stable on
>>>>> our soekris and wrap boards, but we are probably going to use the
>>>>> Avila boards a bit more, so I was wondering if I should use -current
>>>>> or 6-stable on them. Up to now my Avila and ADI testing was done with
>>>>> -current, but I'm not sure if that is a good idea for boxes that will
>>>>> end up in rural areas far far away. Hmm. Not that I have seen a panic
>>>>> on the Avila boards, but they have gone through a lot less testing up
>>>>> to now.
>>>> Not sure what's been missed.  I see no reason not to MFC anything
>>>> arm-related unless it breaks code compatibility (and even there it's
>>>> unlikely there are 3rd party codes to worry about).
>>>>
>>>> 	Sam
>>> Hi John,
>>>
>>> Sorry for lack of answers, I really need to get back in the loop.
>>> Avila works fine in RELENG_6.
>> Maybe I should try it then. :-)
> 
> Well I cross-compiled 6-stable, installed it on an nfs server and booted
> an Avila from it. That worked. So then I wanted to compile some ports on
> it. For a start I wanted olsrd. That needed a lot of things amongst
> other libiconv. That died with a compiler error like this:
> 
> ##################
> /bin/sh /usr/local/bin/libtool --mode=compile cc -I. -I. -I../include -I./../include  -O2 -fno-strict-aliasing -pipe -mbig-endian -march=armv5te -D__XSCALE__ -DLIBDIR=\"/usr/local/lib\"  -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/local/lib\" -DNO_XMALLOC  -Dset_relocation_prefix=libiconv_set_relocation_prefix  -Drelocate=libiconv_relocate -DHAVE_CONFIG_H -c ./iconv.c
> mkdir .libs
>  cc -I. -I. -I../include -I./../include -O2 -fno-strict-aliasing -pipe -mbig-endian -march=armv5te -D__XSCALE__ -DLIBDIR=\"/usr/local/lib\" -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/local/lib\" -DNO_XMALLOC -Dset_relocation_prefix=libiconv_set_relocation_prefix -Drelocate=libiconv_relocate -DHAVE_CONFIG_H -c ./iconv.c  -fPIC -DPIC -o .libs/iconv.o
> In file included from ./cns11643.h:38,
>                  from ./converters.h:203,
>                  from ./iconv.c:67:
> ./cns11643_inv.h:13889: warning: useless keyword or type name in empty declaration
> ./cns11643_inv.h:13889: warning: empty declaration
> In file included from ./converters.h:204,
>                  from ./iconv.c:67:
> ./big5.h:4104: internal compiler error: Segmentation fault: 11
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See <URL:http://gcc.gnu.org/bugs.html> for instructions.
> *** Error code 1
> 
> Stop in /usr/ports/converters/libiconv/work/libiconv-1.9.2/lib.
> *** Error code 1
> 
> Stop in /usr/ports/converters/libiconv/work/libiconv-1.9.2.
> *** Error code 1
> 
> Stop in /usr/ports/converters/libiconv.
> ##################
> 
> Any ideas? I did compile it on -current Avila a few days ago.

I believe there was an arm/xscale-specific vm bug fixed not too long ago
in HEAD.  Might not have been MFC'd.

> 
> Is there a reason that fdisk is not build for the arm on 6-stable?

It wasn't needed originally so was just removed instead of dealing with
portability problems.

	Sam