[OpenSmalltalk/opensmalltalk-vm] Fix include order (#562)

 

This enables the linux builds again, while preserving windows and macos builds.
That is a fix for #560

If this is compatible with TERF VM, then it should be merged ASAP, the builds are red for too long.
(we'll have to inquire next point of failure...)

---

You can view, comment on, or merge this pull request online at:

  https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562

Commit Summary

• always include <stdio.h> **BEFORE** defining fseeko/ftello
• Discard the EXPORT from sqAssert.h for declaring VM functions
• Make sure that config.h is included first
• Generate source with VMMaker.oscog-nice.2957 so as to restore sqConfig.h inclusion at top
• try and omit HAVE_CONFIG_H for compiling getVersion

File Changes

• M platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c (3)
• M platforms/Cross/plugins/IA32ABI/xabicc.c (5)
• M platforms/Cross/plugins/SoundCodecPrims/sqSoundCodecPluginBasicPrims.c (4)
• M platforms/Cross/plugins/Squeak3D/b3dInit.c (3)
• M platforms/Cross/plugins/Squeak3D/b3dMain.c (3)
• M platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c (4)
• M platforms/Cross/vm/sqAssert.h (11)
• M platforms/Cross/vm/sqHeapMap.c (4)
• M platforms/Cross/vm/sqSCCSVersion.h (2)
• M platforms/Cross/vm/sqVirtualMachine.c (3)
• M platforms/unix/config/getversion.c (1)
• M platforms/unix/plugins/FileAttributesPlugin/faSupport.c (3)
• M platforms/unix/vm/aio.c (12)
• M platforms/unix/vm/sqUnixVMProfile.c (5)
• M platforms/win32/vm/sqPlatformSpecific.h (1)
• M spur64src/vm/cogit.h (2)
• M spur64src/vm/cogitARMv8.c (8)
• M spur64src/vm/cogitX64SysV.c (8)
• M spur64src/vm/cogitX64WIN64.c (8)
• M spur64src/vm/cointerp.c (49)
• M spur64src/vm/cointerp.h (4)
• M spur64src/vm/cointerpmt.c (31)
• M spur64src/vm/cointerpmt.h (3)
• M spur64src/vm/gcc3x-cointerp.c (49)
• M spur64src/vm/gcc3x-cointerpmt.c (31)
• M spurlowcode64src/vm/cogit.h (3)
• M spurlowcode64src/vm/cogitARMv8.c (16)
• M spurlowcode64src/vm/cogitX64SysV.c (12)
• M spurlowcode64src/vm/cogitX64WIN64.c (12)
• M spurlowcode64src/vm/cointerp.c (53)
• M spurlowcode64src/vm/cointerp.h (5)
• M spurlowcode64src/vm/gcc3x-cointerp.c (53)
• M spurlowcodesrc/vm/cogit.h (3)
• M spurlowcodesrc/vm/cogitARMv5.c (12)
• M spurlowcodesrc/vm/cogitIA32.c (12)
• M spurlowcodesrc/vm/cogitMIPSEL.c (16)
• M spurlowcodesrc/vm/cointerp.c (57)
• M spurlowcodesrc/vm/cointerp.h (5)
• M spurlowcodesrc/vm/gcc3x-cointerp.c (57)
• M spurlowcodestack64src/vm/gcc3x-interp.c (25)
• M spurlowcodestack64src/vm/interp.c (25)
• M spurlowcodestacksrc/vm/gcc3x-interp.c (25)
• M spurlowcodestacksrc/vm/interp.c (25)
• M spursista64src/vm/cogit.h (2)
• M spursista64src/vm/cogitARMv8.c (12)
• M spursista64src/vm/cogitX64SysV.c (8)
• M spursista64src/vm/cogitX64WIN64.c (8)
• M spursista64src/vm/cointerp.c (49)
• M spursista64src/vm/cointerp.h (4)
• M spursista64src/vm/gcc3x-cointerp.c (49)
• M spursistasrc/vm/cogit.h (2)
• M spursistasrc/vm/cogitARMv5.c (8)
• M spursistasrc/vm/cogitIA32.c (8)
• M spursistasrc/vm/cogitMIPSEL.c (14)
• M spursistasrc/vm/cointerp.c (49)
• M spursistasrc/vm/cointerp.h (2)
• M spursistasrc/vm/gcc3x-cointerp.c (49)
• M spursrc/vm/cogit.h (2)
• M spursrc/vm/cogitARMv5.c (8)
• M spursrc/vm/cogitIA32.c (8)
• M spursrc/vm/cogitMIPSEL.c (10)
• M spursrc/vm/cointerp.c (57)
• M spursrc/vm/cointerp.h (4)
• M spursrc/vm/cointerpmt.c (81)
• M spursrc/vm/cointerpmt.h (5)
• M spursrc/vm/gcc3x-cointerp.c (57)
• M spursrc/vm/gcc3x-cointerpmt.c (81)
• M spurstack64src/vm/gcc3x-interp.c (25)
• M spurstack64src/vm/interp.c (25)
• M spurstack64src/vm/validImage.c (17)
• M spurstacksrc/vm/gcc3x-interp.c (25)
• M spurstacksrc/vm/interp.c (25)
• M spurstacksrc/vm/validImage.c (17)
• M src/plugins/Squeak3D/Squeak3D.c (8)
• M src/vm/cogit.h (2)
• M src/vm/cogitARMv5.c (8)
• M src/vm/cogitIA32.c (8)
• M src/vm/cogitMIPSEL.c (12)
• M src/vm/cointerp.c (10)
• M src/vm/cointerp.h (2)
• M src/vm/gcc3x-cointerp.c (10)
• M stacksrc/vm/gcc3x-interp.c (12)
• M stacksrc/vm/interp.c (12)

Patch Links:

• https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562.patch
• https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562.diff

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

<script type="application/ld+json">[ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562", "url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]</script>

 

@fniephaus approved this pull request.

LGTM, don't know about TERF. Thanks, @nicolas-cellier-aka-nice!

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

<script type="application/ld+json">[ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#pullrequestreview-645999910", "url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#pullrequestreview-645999910", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]</script>

 

@marceltaeumel approved this pull request.

Maybe merge the current upstream again. Please make the Linux builds work again. Thanks Nicolas!

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

<script type="application/ld+json">[ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#pullrequestreview-663499978", "url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#pullrequestreview-663499978", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]</script>

 
On Mon, Apr 26, 2021 at 11:54:16AM -0700, Nicolas Cellier wrote:
Builds for the opensmalltalk-vm for Unix/Linux have been broken since
February 8, 2001. The commit that caused the initial breakage is:

    commit aafcb78371c7e576073a8dbf2f1f32667568e05e
    Author: Eliot Miranda <[hidden email]>
    Date:   Mon Feb 8 20:49:07 2021 -0800

All subsequent versions remain broken, and it has not been possible to
build a VM for Linux since that time.

The commit notice includes the following request:

    I ask anyone wishing to alter the system here to please contact me and discuss
    before making changes.  It is extraordinarily expensive and frustrating to have
    to make changes of this kind to make sure that a signfiicantly more complex VM
    such as Terf's builds correctly.

In April 2021, Nicolas worked through the issues necessary to resolve
this problem.  He provided platforms and src fixes on GitHub in the
fix_include_order branch, along with VMMaker.oscog-nice.2957 in the
VMMaker inbox to provide the necessary code generation fix.

Technically, what we need next is:
  1) Merge Nicolas' VMMaker fix into VMMaker.oscog, regenerate sources, commit to GitHub
  2) Merge the fix_include_order branch into Cog

But we would also like to honor Eliot's request to review such changes
before committing.

Eliot, could you please take a look at this and comment?

References:
  http://source.squeak.org/VMMakerInbox/VMMaker.oscog-nice.2957.mcz
  https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order
  https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562
  https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/560

Thanks,
Dave

 

This issue apparently affects (some?) Windows builds in addition to unix, see issue #568

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

<script type="application/ld+json">[ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#issuecomment-860247919", "url": "https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/562#issuecomment-860247919", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]</script>