Skip to content

Commit 4d2d129

Browse files
liachMan Cao
authored and
Man Cao
committed
8355962: RISCV64 cross build fails after 8354996
Reviewed-by: erikj, manc
1 parent 56468c4 commit 4d2d129

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

make/GenerateLinkOptData.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ endif
6666
# default classlist is minimal, let's filter out the '@cp' lines until we can
6767
# find a proper solution.
6868
CLASSLIST_FILE_VM_OPTS = \
69-
-Duser.language=en -Duser.country=US --enable-native-access=ALL-UNNAMED
69+
-Duser.language=en -Duser.country=US
7070

7171
# Save the stderr output of the command and print it along with stdout in case
7272
# something goes wrong.

make/jdk/src/classes/build/tools/classlist/HelloClasslist.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
*/
3232
package build.tools.classlist;
3333

34-
import java.lang.foreign.FunctionDescriptor;
35-
import java.lang.foreign.Linker;
3634
import java.lang.invoke.MethodHandle;
3735
import java.lang.invoke.MethodHandles;
3836
import java.lang.invoke.MethodType;
@@ -174,10 +172,6 @@ record B(int b) { }
174172
// an inconsistency in the classlist between builds (see JDK-8295951).
175173
// To avoid the problem, load the class explicitly.
176174
Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
177-
178-
// Initialize FFM linkers
179-
var signature = FunctionDescriptor.ofVoid();
180-
Linker.nativeLinker().downcallHandle(signature);
181175
}
182176

183177
public HelloClasslist() {}

0 commit comments

Comments
 (0)