In preparation for the new Hotspot build, there are a few changes to the old build that needs to happen first. These changes should be harmless, but do impact the generated binaries some. These include things like correcting sort order for objects on link command line and working around usage of the __FILE__ macro.

By making these changes first and separate from introducing the new build we reduce the potential impact of when we do introduce the new build.