Problems with sync from jdk8/jdk8 to ppc-aix-port/stage

[Volker Simonis]

Hi Vladimir,

thank you for starting syncing again!

Please see my comments inline:

On Wed, Nov 6, 2013 at 3:15 AM, Vladimir Kozlov
<vladimir.kozlov at oracle.com> wrote:
> I was not able to resolve all conflicts. AIX build is definitely broken.
>
> I have to manually resolve a lot of .m4 and .gmk files (mostly changed
> indention).
>
> I had problem with common/autoconf/platform.m4 when resolving conflicts at
> the end of file (below "Make compilation sanity check"). And for
> ADDED_*FLGAS settings I resolved it as in ppc64 repo:
>
> ppc64 repo:
>
>   ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
>   ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
>   ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
>

Yes, this is the right way how it should be done now that we have
${COMPILER_TARGET_BITS_FLAG}

> jdk8 repo:
>
>   ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
>   ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
>   ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
>
>
> Merging toolchain.m4 was even more painful.
>
> An other one was jdk/makefiles/CompileLaunchers.gmk
>
> But the main problem was jdk/makefiles/CompileNativeLibraries.gmk. Code from
> it was moved into jdk/makefiles/lib files:
>
> http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/a5b57fca66da
>
> I was not able to do anything there. It definitely broke AIX build so you
> need to implement it again. Sorry.

Well, works as expected:(

I know no good way how we could solve these problems (apart from
integration shared changes more early into the main repositories of
course).

I could of course offer to do the merge such that all the AIX changes
would still be good. But how could I share a merge change with you?
Would you like to get only the files which I had to resolve manually?
Or better all the files which are changed by the merge? You could then
merge, copy my files over the sources and do the remaining resolving
in the closed directories.

What do you think, should we try it this way next time?

>
> I started JDK and Hotspot JPRT test runs. If they passed I will push what I
> have and then you need to fix it for AIX.
>

I'm ready to start...

> Regards,
> Vladimir
>