llvm: Accept ppc64
PATCH 1/2 llvm: Accept ppc64
--- recipes-core/llvm/llvm.inc | 2 +- recipes-core/openjdk/openjdk-6-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-core/llvm/llvm.inc +1 -1
@@ -203,7 +203,7 @@ def get_llvm_arch(d): arch = "ARM" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "PowerPC" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
recipes-core/openjdk/openjdk-6-common.inc +1 -1
@@ -151,7 +151,7 @@ def get_llvm_configure_arch(d): arch = "arm" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "powerpc" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
Signature · 1 line
1.7.5.4
PATCH 2/2 openjdk-6: Fix cross compilation for e5500 machines
This is only way for compile for now since qemu can not run the sizers binary for e5500 machines. It segfaults so we disable generating sizes and also xawt and jawt which depends on sizers, this lets jre to cross compile for ppc/e5500
--- .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b24.inc | 13 ++++- 2 files changed, 73 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch
recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch new file +61 -0
@@ -0,0 +1,61 @@ +Disable xawt and jawt along with sizes generation which does not work well if +you cant generated sizes in cross env. So for architectures which dont have +working qemu this is an option + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Inappropriate [Cross-compile specific hack] + +--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 ++++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 +@@ -245,18 +245,19 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 ++++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 +@@ -50,7 +50,7 @@ + MOTIF_SUBDIRS = motif12 motif21 + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -65,7 +65,7 @@ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ +- jawt text nio launcher management $(ORG_SUBDIR) \ ++ text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + + all build clean clobber::
recipes-core/openjdk/openjdk-6-release-6b24.inc +12 -1
@@ -83,7 +83,12 @@ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " - +ICEDTEAPATCHES_append_e5500-64b = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " +ICEDTEAPATCHES_append_e5500 = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \
@@ -119,5 +124,11 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-jdk-unpack-uclibc.patch \ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_e5500-64b = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " +DISTRIBUTION_PATCHES_append_e5500 = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " export DISTRIBUTION_PATCHES
Signature · 1 line
1.7.5.4
Re: [meta-java][PATCH 2/2] openjdk-6: Fix cross compilation for e5500 machines
Quoted 113 lines · Khem Raj
This is only way for compile for now since qemu can not run the sizers binary for e5500 machines. It segfaults so we disable generating sizes and also xawt and jawt which depends on sizers, this lets jre to cross compile for ppc/e5500
Signed-off-by Khem Raj <[email protected]>--- .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b24.inc | 13 ++++- 2 files changed, 73 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patchrecipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch new file +61
-0@@ -0,0 +1,61 @@ +Disable xawt and jawt along with sizes generation which does not work well if +you cant generated sizes in cross env. So for architectures which dont have +working qemu this is an option + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Inappropriate [Cross-compile specific hack] + +--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 ++++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 +@@ -245,18 +245,19 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 ++++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 +@@ -50,7 +50,7 @@ + MOTIF_SUBDIRS = motif12 motif21 + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -65,7 +65,7 @@ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ +- jawt text nio launcher management $(ORG_SUBDIR) \ ++ text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + + all build clean clobber::recipes-core/openjdk/openjdk-6-release-6b24.inc +12
-1@@ -83,7 +83,12 @@ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " - +ICEDTEAPATCHES_append_e5500-64b = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " +ICEDTEAPATCHES_append_e5500 = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \@@ -119,5 +124,11 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-jdk-unpack-uclibc.patch \ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_e5500-64b = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " +DISTRIBUTION_PATCHES_append_e5500 = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " export DISTRIBUTION_PATCHESSignature · 1 line
1.7.5.4
Hi Khem,
did you make a runtime test?
Bye henning
Re: [meta-java][PATCH 2/2] openjdk-6: Fix cross compilation for e5500 machines
Quoted 117 lines · Henning Heinold
Quoted 111 lines · Khem Raj
This is only way for compile for now since qemu can not run the sizers binary for e5500 machines. It segfaults so we disable generating sizes and also xawt and jawt which depends on sizers, this lets jre to cross compile for ppc/e5500
Signed-off-by Khem Raj <[email protected]>--- .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b24.inc | 13 ++++- 2 files changed, 73 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patchrecipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch new file +61
-0@@ -0,0 +1,61 @@ +Disable xawt and jawt along with sizes generation which does not work well if +you cant generated sizes in cross env. So for architectures which dont have +working qemu this is an option + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Inappropriate [Cross-compile specific hack] + +--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 ++++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 +@@ -245,18 +245,19 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 ++++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 +@@ -50,7 +50,7 @@ + MOTIF_SUBDIRS = motif12 motif21 + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -65,7 +65,7 @@ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ +- jawt text nio launcher management $(ORG_SUBDIR) \ ++ text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + + all build clean clobber::recipes-core/openjdk/openjdk-6-release-6b24.inc +12
-2@@ -83,7 +83,12 @@ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " - +ICEDTEAPATCHES_append_e5500-64b = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " +ICEDTEAPATCHES_append_e5500 = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \@@ -119,5 +124,11 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-jdk-unpack-uclibc.patch \ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_e5500-64b = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " +DISTRIBUTION_PATCHES_append_e5500 = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " export DISTRIBUTION_PATCHES --Quoted 2 lines
1.7.5.4
Hi Khem,
Quoted 2 lines
did you make a runtime test?
yes trivial tests show that its working on both 32 and 64bit
Quoted 6 lines
Bye henning
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel