[commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

commits-3
 
Author: eliot
Date: 2010-07-16 12:02:00 -0700 (Fri, 16 Jul 2010)
New Revision: 2239

Modified:
   branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
Log:
Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.


Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
===================================================================
--- branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2010-07-16 17:22:52 UTC (rev 2238)
+++ branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2010-07-16 19:02:00 UTC (rev 2239)
@@ -31,7 +31,7 @@
 void *getbaz() { return baz; }
 # endif
 #else
-# include <malloc.h> /* for valloc */
+# include <stdlib.h> /* for valloc */
 # include <sys/mman.h> /* for mprotect */
 #endif
 

Reply | Threaded
Open this post in threaded view
|

Re: [commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

Frank Shearar
 
On 2010/07/16 21:02, [hidden email] wrote:

>
> Author: eliot
> Date: 2010-07-16 12:02:00 -0700 (Fri, 16 Jul 2010)
> New Revision: 2239
>
> Modified:
>     branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
> Log:
> Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.
>
>
> Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
> ===================================================================
OK, with these changes we now hit an error on:

gcc -g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1
-DNO_VM_PROFILE=1 -DCOGMTVM=0 -msse -DLSB_FIRST=1     -export-dynamic -c
-o disabledPlugins.o disabledPlugins.c
disabledPlugins.c:20: error: redefinition of 'vm_sound_OSS_exports'
disabledPlugins.c:14: error: previous definition of
'vm_sound_OSS_exports' was here
disabledPlugins.c:21: error: redefinition of 'vm_display_fbdev_exports'
disabledPlugins.c:8: error: previous definition of
'vm_display_fbdev_exports' was here
*** Error code 1

I've attached the generated disabledPlugins.c.

configure.txt shows the output of configure, and make-install.txt the
output from running make install.

frank

disabledPlugins.c (1K) Download Attachment
configure.txt (15K) Download Attachment
make-install.txt (4K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

Frank Shearar
 
On 2010/07/16 21:49, Frank Shearar wrote:

>
>
>
>
> On 2010/07/16 21:02, [hidden email] wrote:
>>
>> Author: eliot
>> Date: 2010-07-16 12:02:00 -0700 (Fri, 16 Jul 2010)
>> New Revision: 2239
>>
>> Modified:
>> branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>> Log:
>> Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.
>>
>>
>> Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>> ===================================================================
>
> OK, with these changes we now hit an error on:
>
> gcc -g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1
> -DNO_VM_PROFILE=1 -DCOGMTVM=0 -msse -DLSB_FIRST=1 -export-dynamic -c -o
> disabledPlugins.o disabledPlugins.c
> disabledPlugins.c:20: error: redefinition of 'vm_sound_OSS_exports'
> disabledPlugins.c:14: error: previous definition of
> 'vm_sound_OSS_exports' was here
> disabledPlugins.c:21: error: redefinition of 'vm_display_fbdev_exports'
> disabledPlugins.c:8: error: previous definition of
> 'vm_display_fbdev_exports' was here
> *** Error code 1
>
> I've attached the generated disabledPlugins.c.
>
> configure.txt shows the output of configure, and make-install.txt the
> output from running make install.
Sorry, THESE attachments show the above.

frank

configure.txt (11K) Download Attachment
make-install.txt (112K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

Frank Shearar
 
On 2010/07/16 22:23, Frank Shearar wrote:

>
>
>
>
> On 2010/07/16 21:49, Frank Shearar wrote:
>>
>>
>>
>>
>> On 2010/07/16 21:02, [hidden email] wrote:
>>>
>>> Author: eliot
>>> Date: 2010-07-16 12:02:00 -0700 (Fri, 16 Jul 2010)
>>> New Revision: 2239
>>>
>>> Modified:
>>> branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>>> Log:
>>> Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.
>>>
>>>
>>> Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>>> ===================================================================
>>
>> OK, with these changes we now hit an error on:
>>
>> gcc -g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1
>> -DNO_VM_PROFILE=1 -DCOGMTVM=0 -msse -DLSB_FIRST=1 -export-dynamic -c -o
>> disabledPlugins.o disabledPlugins.c
>> disabledPlugins.c:20: error: redefinition of 'vm_sound_OSS_exports'
>> disabledPlugins.c:14: error: previous definition of
>> 'vm_sound_OSS_exports' was here
>> disabledPlugins.c:21: error: redefinition of 'vm_display_fbdev_exports'
>> disabledPlugins.c:8: error: previous definition of
>> 'vm_display_fbdev_exports' was here
>> *** Error code 1
>>
>> I've attached the generated disabledPlugins.c.
>>
>> configure.txt shows the output of configure, and make-install.txt the
>> output from running make install.
>
> Sorry, THESE attachments show the above.
I can't find which method generates disabledPlugins.c, so I edited the
file manually to remove the duplicates. Things seem quite happy after
that. I get lots of errors in the SqueakPlugin. Disabling that with
--without-npsqueak, and I have a successfully compiling Cog VM on FreeBSD!

Now I must just run something (headless) on the machine.

In the interests of completeness, I've attached the output of make
install. Since I have X11/Xlib.h (in /usr/local/include/X11/Xlib.h), I
imagine there's some include magic I'm missing. But that's OK for now,
because I didn't want to build the SqueakPlugin.

frank

make-install.txt (56K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [commit] r2239 - Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.

Frank Shearar
 
On 2010/07/18 23:22, Frank Shearar wrote:

>
>
>
>
> On 2010/07/16 22:23, Frank Shearar wrote:
>>
>>
>>
>>
>> On 2010/07/16 21:49, Frank Shearar wrote:
>>>
>>>
>>>
>>>
>>> On 2010/07/16 21:02, [hidden email] wrote:
>>>>
>>>> Author: eliot
>>>> Date: 2010-07-16 12:02:00 -0700 (Fri, 16 Jul 2010)
>>>> New Revision: 2239
>>>>
>>>> Modified:
>>>> branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>>>> Log:
>>>> Replace malloc.h with stdlib.h in IA32ABI for FreeBSD.
>>>>
>>>>
>>>> Modified: branches/Cog/platforms/Cross/plugins/IA32ABI/ia32abicc.c
>>>> ===================================================================
>>>
>>> OK, with these changes we now hit an error on:
>>>
>>> gcc -g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1
>>> -DNO_VM_PROFILE=1 -DCOGMTVM=0 -msse -DLSB_FIRST=1 -export-dynamic -c -o
>>> disabledPlugins.o disabledPlugins.c
>>> disabledPlugins.c:20: error: redefinition of 'vm_sound_OSS_exports'
>>> disabledPlugins.c:14: error: previous definition of
>>> 'vm_sound_OSS_exports' was here
>>> disabledPlugins.c:21: error: redefinition of 'vm_display_fbdev_exports'
>>> disabledPlugins.c:8: error: previous definition of
>>> 'vm_display_fbdev_exports' was here
>>> *** Error code 1
>>>
>>> I've attached the generated disabledPlugins.c.
>>>
>>> configure.txt shows the output of configure, and make-install.txt the
>>> output from running make install.
>>
>> Sorry, THESE attachments show the above.
>
> I can't find which method generates disabledPlugins.c, so I edited the
> file manually to remove the duplicates. Things seem quite happy after
> that. I get lots of errors in the SqueakPlugin. Disabling that with
> --without-npsqueak, and I have a successfully compiling Cog VM on FreeBSD!
>
> Now I must just run something (headless) on the machine.
>
> In the interests of completeness, I've attached the output of make
> install. Since I have X11/Xlib.h (in /usr/local/include/X11/Xlib.h), I
> imagine there's some include magic I'm missing. But that's OK for now,
> because I didn't want to build the SqueakPlugin.

I should have added this crowning glory:

frank@roke$ ./squeak -version
3.9-7 #1 Sun Jul 18 23:15:53 SAST 2010 gcc 4.2.1
Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.23]
FreeBSD roke.local 7.3-STABLE FreeBSD 7.3-STABLE #0: Wed Jul 14 22:38:13
SAST 2010     [hidden email]:/usr/obj/usr/src/sys/GENERIC  i386
plugin path: /usr/home/frank/temp/squeak/lib/squeak/3.9-7/ [default:
/usr/home/frank/temp/squeak/lib/squeak/3.9-7/]

Now to run an image on there!

Thanks so much for your help, Eliot!

frank