Updates for docker based ARM build #2057
Conversation
| @@ -27,36 +27,54 @@ else | |||
| TEMP_TARGET_DATASIZE:=32 | |||
| endif | |||
|
|
|||
| ifeq ($(OPENJ9_DOCKER_CC_ARM),1) | |||
| TMP_HOST = $$(OPENJ9_CC_PREFIX) | |||
There was a problem hiding this comment.
Can you change the name of the environment variable to remove the OpenJ9 from it? The OMR project is / can be used for many downstream projects so we should not be adding any new OpenJ9 specific options. I am assuming this would be useful for other projects as well if it had a different name. Thanks.
There was a problem hiding this comment.
Hi @charliegracie ,
In this case OMR is the consumer of the variable which is defined in the Docker file added to openJ9 in eclipse-openj9/openj9#622. The variable is named for consistency with other variables defined in that file. OPENJ9_DOCKER_CC_ARM specifically is destined to be removed as soon as resources permit, as it is something of a quick fix to allow rapid prototyping of builds for armhf.
There was a problem hiding this comment.
If I understand the interaction between OpenJ9 and OMR correctly, openj9/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk is the actual mk used by openj9 when omr configure is invoked, and the omr/glue is what is used for compiling OMR alone. omr/example/glue being a set of examples to work from. If this is the case, then these changes need to happen in the openj9 repository. Can you confirm or deny that @charliegracie?
There was a problem hiding this comment.
Ah, that's interesting. Changes to openj9/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk were contributed in eclipse-openj9/openj9#686.
If the files changed in this PR are not actually needed for building OpenJDK then we can scrap them and avoid the whole issue of what to call the env vars.
There was a problem hiding this comment.
Something in this PR is needed as the build fails if I revert to the original branch.
There was a problem hiding this comment.
It's the change to omrmakefiles/rules.linux.mk that is needed in order to get the -marm option to the new compiler, so I can reduce this PR to just that change.
| else | ||
| TMP_HOST = arm-bcm2708hardfp-linux-gnueabi | ||
| endif | ||
|
|
||
| ifeq (linux_arm, $(SPEC)) |
There was a problem hiding this comment.
This looks like the wrong test, it should be
ifneq (,$(findstring linux_arm,$(SPEC)))
to also accept linux_arm_docker.
|
@charliegracie I removed the unnecessary changes containing the OPENJ9 variables. |
rules.linux.mk is updated to pass -marm to the compiler. I also moved the architecture defining options out of OPTIMIZATION_FLAGS as the current setup doesn't work for a debug build. Signed-off-by: James Kingdon <jkingdon@ca.ibm.com>
|
Squashed the commits. |
|
@charliegracie any more changes needed? |
configure_linux_arm.mk and rules.linux.mk are updated to make
use of the environment variables provided by the docker file
(eclipse-openj9/openj9#622).
This allows the names of the toolchain executables to be passed
from the docker file and also avoids the need to hard-code the
location of the global include files.
Signed-off-by: James Kingdon jkingdon@ca.ibm.com