On 2013-09-11 18:45, Volker Simonis wrote:
Argh! It conflicts with 8020411 (http://cr.openjdk.java.net/~erikj/8020411/webrev.root.01/) from your last jdk8->stage synchronisation.@Magnus, Erik : it seems that '8020411' needed a similar 'feature' to my actual change but did it without abstracting over the name of the "compilers target bits" flag name vs. its actual value. Unfortunately all the users of the change 8020411 are in the closed sources. I'd really like to stay with my solution (because I think that's the most general one) and resolve the merge conflicts with 8020411 by eliminating TARGET_BITS_FLAG which can now be replaced by "${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}.
I see. When looking more closely in the fix for JDK-8020411, it turned out that it could do with some improvements: a) since it really only applies to the closed sources, it could (and should) be done only in the closed sources. b) it was actually incorrect, since it removed the ADDED_*FLAGS variables, which are needed for later use to check for incorrect additions to *FLAGS.
I am sorry your patch has become caught in this messiness. :( Nevertheless, I think the best way forward is that I create a new patch, that reverts the JDK-8020411 in the open sources and re-implements them in the closed sources. I agree that your solution is better, and what we should have in the open sources. You shouldn't have to care about the TARGET_BITS_FLAG, it is an internal hack.
I'll start working on it immediately. /Magnus
