70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
# DP: Add support for zero architectures alpha, m68k, mips*, sh4
|
|
|
|
Sourced from https://bazaar.launchpad.net/~openjdk/openjdk/openjdk8/view/head:/debian/patches/zero-architectures.diff
|
|
|
|
--- openjdk/common/autoconf/platform.m4
|
|
+++ openjdk/common/autoconf/platform.m4
|
|
@@ -54,6 +60,42 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
|
|
VAR_CPU_BITS=64
|
|
VAR_CPU_ENDIAN=little
|
|
;;
|
|
+ mips)
|
|
+ VAR_CPU=mips
|
|
+ VAR_CPU_ARCH=mips
|
|
+ VAR_CPU_BITS=32
|
|
+ VAR_CPU_ENDIAN=big
|
|
+ ;;
|
|
+ mipsel)
|
|
+ VAR_CPU=mipsel
|
|
+ VAR_CPU_ARCH=mipsel
|
|
+ VAR_CPU_BITS=32
|
|
+ VAR_CPU_ENDIAN=little
|
|
+ ;;
|
|
+ mipsn32)
|
|
+ VAR_CPU=mipsn32
|
|
+ VAR_CPU_ARCH=mipsn32
|
|
+ VAR_CPU_BITS=32
|
|
+ VAR_CPU_ENDIAN=big
|
|
+ ;;
|
|
+ mipsn32el)
|
|
+ VAR_CPU=mipsn32el
|
|
+ VAR_CPU_ARCH=mipsn32el
|
|
+ VAR_CPU_BITS=32
|
|
+ VAR_CPU_ENDIAN=little
|
|
+ ;;
|
|
+ mips64)
|
|
+ VAR_CPU=mips64
|
|
+ VAR_CPU_ARCH=mips64
|
|
+ VAR_CPU_BITS=64
|
|
+ VAR_CPU_ENDIAN=big
|
|
+ ;;
|
|
+ mips64el)
|
|
+ VAR_CPU=mips64el
|
|
+ VAR_CPU_ARCH=mips64el
|
|
+ VAR_CPU_BITS=64
|
|
+ VAR_CPU_ENDIAN=little
|
|
+ ;;
|
|
powerpc)
|
|
VAR_CPU=ppc
|
|
VAR_CPU_ARCH=ppc
|
|
@@ -373,6 +433,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
|
|
|
|
# ZERO_ARCHDEF is used to enable architecture-specific code
|
|
case "${OPENJDK_TARGET_CPU}" in
|
|
+ mips|mipsn32|mips64) ZERO_ARCHDEF=MIPS ;;
|
|
+ mipsel|mipsn32el|mips64el) ZERO_ARCHDEF=MIPSEL ;;
|
|
ppc) ZERO_ARCHDEF=PPC32 ;;
|
|
ppc64) ZERO_ARCHDEF=PPC64 ;;
|
|
s390*) ZERO_ARCHDEF=S390 ;;
|
|
--- openjdk/common/autoconf/flags.m4
|
|
+++ openjdk/common/autoconf/flags.m4
|
|
@@ -827,6 +827,8 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAG
|
|
*)
|
|
ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
|
|
esac
|
|
+ # use the default for the package builds
|
|
+ ZERO_ARCHFLAG=""
|
|
FLAGS_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
|
|
AC_SUBST(ZERO_ARCHFLAG)
|
|
|