Browse Source

add mips64el stuff

Waldemar Brodkorb 12 years ago
parent
commit
b7d17c687b
3 changed files with 23 additions and 3 deletions
  1. 3 0
      mk/vars.mk
  2. 5 3
      package/openjdk7/Makefile
  3. 15 0
      package/openjdk7/patches/mips64el.patch

+ 3 - 0
mk/vars.mk

@@ -59,6 +59,9 @@ endif
 ifeq ($(CPU_ARCH),mipsel)
 QEMU:=			qemu-mipsel
 endif
+ifeq ($(CPU_ARCH),mips64el)
+QEMU:=			qemu-mipsel
+endif
 ifeq ($(CPU_ARCH),mips)
 QEMU:=			qemu-mips
 endif

+ 5 - 3
package/openjdk7/Makefile

@@ -38,10 +38,12 @@ TARGET_CFLAGS:=		$(subst march=atom,march=i686,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
 BOOTSTRAPJDK:=		${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
 
+JDKARCH:=		$(ARCH)
 ifeq ($(ARCH),x86)
 JDKARCH:=		i386
-else
-JDKARCH:=		$(ARCH)
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+JDKARCH:=		mipsel
 endif
 
 ifeq ($(ADK_PACKAGE_OPENJDK7_ZERO),y)
@@ -87,7 +89,7 @@ MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
 			OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
 			OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
-			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH)
+			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU)
 
 ALL_TARGET:=		icedtea
 

+ 15 - 0
package/openjdk7/patches/mips64el.patch

@@ -0,0 +1,15 @@
+diff -Nur icedtea-2.3.9.orig/configure icedtea-2.3.9/configure
+--- icedtea-2.3.9.orig/configure	2013-04-21 22:48:30.000000000 +0200
++++ icedtea-2.3.9/configure	2013-05-13 12:43:02.000000000 +0200
+@@ -7159,6 +7159,11 @@
+       INSTALL_ARCH_DIR=mipsel
+       JRE_ARCH_DIR=mipsel
+        ;;
++    mips64el)
++      BUILD_ARCH_DIR=mipsel
++      INSTALL_ARCH_DIR=mipsel
++      JRE_ARCH_DIR=mipsel
++       ;;
+     powerpc)
+       BUILD_ARCH_DIR=ppc
+       INSTALL_ARCH_DIR=ppc