./common/autoconf/jdk-options.m4

rev 656 : [mq]: zero-newbuild

*** 219,229 ****
--- 219,237 ----
  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
  fi
  
  if test "x$JVM_VARIANT_ZERO" = xtrue; then
+     PKG_CHECK_MODULES([LIBFFI], [libffi])
      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
+     case "${OPENJDK_TARGET_CPU_LEGACY_LIB}" in
+       i386)   ZERO_ARCHDEF=IA32  ;;
+       ppc*)   ZERO_ARCHDEF=PPC   ;;
+       s390*)  ZERO_ARCHDEF=S390  ;;
+       sparc*) ZERO_ARCHDEF=SPARC ;;
+       *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
+     esac
  fi
  
  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
  fi
*** 243,252 ****
--- 251,261 ----
  AC_SUBST(DEBUG_LEVEL)
  AC_SUBST(VARIANT)
  AC_SUBST(FASTDEBUG)
  AC_SUBST(DEBUG_CLASSFILES)
  AC_SUBST(BUILD_VARIANT_RELEASE)
+ AC_SUBST(ZERO_ARCHDEF)
  ])
  
  
  ###############################################################################
  #