Skip to content

Commit

Permalink
8331541: [i386] linking with libjvm.so fails after JDK-8283326
Browse files Browse the repository at this point in the history
Reviewed-by: djelinski, ihse
  • Loading branch information
Vladimir Petko authored and magicus committed May 8, 2024
1 parent 588e314 commit 2d62215
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion make/autoconf/flags-ldflags.m4
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
# Setup LDFLAGS for linking executables
if test "x$TOOLCHAIN_TYPE" = xgcc; then
EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined"
# Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
# java heap.
if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# 8(%esp) : default value
# 4(%esp) : crash address
# 0(%esp) : return pc
.type _SafeFetch32_impl,@function
.type SafeFetch32_impl,@function
SafeFetch32_impl:
movl 4(%esp),%ecx # load address from stack
_SafeFetch32_fault:
Expand Down

1 comment on commit 2d62215

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.