Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update configure scripts for RISC-V (closed) #219

Merged
merged 1 commit into from
Nov 22, 2019
Merged

Update configure scripts for RISC-V (closed) #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion closed/OpenJ9.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ $(call openj9_add_jdk_shlibs, java.base, \
j9gc29 \
j9gcchk29 \
j9hookable29 \
j9jit29 \
j9jnichk29 \
j9jvmti29 \
j9prt29 \
Expand All @@ -211,6 +210,10 @@ $(call openj9_add_jdk_shlibs, java.base, \
omrsig \
)

ifneq (riscv64, $(OPENJDK_TARGET_CPU))
$(call openj9_add_jdk_shlibs, java.base, j9jit29)
endif

ifeq (windows,$(OPENJDK_TARGET_OS))
$(call openj9_add_jdk_lib, java.base, lib/$(call STATIC_LIBRARY,jsig))
$(eval $(call openj9_add_jdk_rules, \
Expand Down
26 changes: 25 additions & 1 deletion closed/autoconf/custom-hook.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ AC_DEFUN([OPENJ9_CONFIGURE_DDR],
OPENJ9_ENABLE_DDR=false
elif test "x$enable_ddr" = x ; then
case "$OPENJ9_PLATFORM_CODE" in
ap64|oa64|wa64|xa64|xl64|xz64)
ap64|oa64|rv64|wa64|xa64|xl64|xz64)
AC_MSG_RESULT([yes (default for $OPENJ9_PLATFORM_CODE)])
OPENJ9_ENABLE_DDR=true
;;
Expand Down Expand Up @@ -264,6 +264,9 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
aarch64)
OPENJ9_CPU=aarch64
;;
riscv64)
OPENJ9_CPU=riscv64
;;
*)
AC_MSG_ERROR([unsupported OpenJ9 cpu $1])
;;
Expand Down Expand Up @@ -328,6 +331,11 @@ AC_DEFUN_ONCE([OPENJ9_PLATFORM_SETUP],
if test "x$COMPILE_TYPE" = xcross ; then
OPENJ9_BUILDSPEC="${OPENJ9_BUILDSPEC}_cross"
fi
elif test "x$OPENJ9_CPU" = xriscv64 ; then
OPENJ9_PLATFORM_CODE=rv64
if test "x$COMPILE_TYPE" = xcross ; then
OPENJ9_BUILDSPEC="${OPENJ9_BUILDSPEC}_cross"
fi
else
AC_MSG_ERROR([Unsupported OpenJ9 cpu ${OPENJ9_CPU}!])
fi
Expand Down Expand Up @@ -551,6 +559,22 @@ AC_DEFUN([CONFIGURE_OPENSSL],
OPENSSL_BUNDLE_LIB_PATH="${OPENSSL_DIR}/lib"
fi
fi
elif test -s "$OPENSSL_DIR/lib64/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}" ; then
OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
if test "x$BUNDLE_OPENSSL" = xyes ; then
# On Mac OSX, create local copy of the crypto library to update @rpath
# as the default is /usr/local/lib.
if test "x$OPENJDK_BUILD_OS" = xmacosx ; then
LOCAL_CRYPTO="$TOPDIR/openssl"
$MKDIR -p "${LOCAL_CRYPTO}"
$CP "${OPENSSL_DIR}/lib64/libcrypto.1.1.dylib" "${LOCAL_CRYPTO}"
$CP "${OPENSSL_DIR}/lib64/libcrypto.1.0.0.dylib" "${LOCAL_CRYPTO}"
$CP -a "${OPENSSL_DIR}/lib64/libcrypto.dylib" "${LOCAL_CRYPTO}"
OPENSSL_BUNDLE_LIB_PATH="${LOCAL_CRYPTO}"
else
OPENSSL_BUNDLE_LIB_PATH="${OPENSSL_DIR}/lib64"
fi
fi
elif test -s "$OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}" ; then
OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
if test "x$BUNDLE_OPENSSL" = xyes ; then
Expand Down
8 changes: 8 additions & 0 deletions closed/autoconf/custom-spec.gmk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,11 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
else
OPENJ9_VM_BUILD_DIR := $(OUTPUTDIR)/vm
endif

ifeq (riscv64,$(OPENJDK_TARGET_CPU))
ifeq (cross,$(COMPILE_TYPE))
export SYSROOT_CFLAGS
else
JAVA_FLAGS += -DserverStartupTimeout=36000
endif
endif