From 8a4dc79e1a40e7115e2971af81623b6b0368f41c Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Mon, 8 Jan 2024 20:17:29 +0000 Subject: [PATCH] 8274300: Address dsymutil warning by excluding platform specific files Reviewed-by: erikj --- make/test/BuildTestLibNative.gmk | 6 +++++- make/test/JtregNativeHotspot.gmk | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/make/test/BuildTestLibNative.gmk b/make/test/BuildTestLibNative.gmk index 00c7607913b..455936d163f 100644 --- a/make/test/BuildTestLibNative.gmk +++ b/make/test/BuildTestLibNative.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -45,6 +45,10 @@ BUILD_LIBTEST_OUTPUT_DIR := $(OUTPUTDIR)/support/test/lib/native BUILD_LIBTEST_IMAGE_DIR := $(TEST_IMAGE_DIR)/lib +ifeq ($(call isTargetOs, windows), false) + BUILD_LIBTEST_LIBRARIES_EXCLUDE += libFileUtils.c +endif + # This evaluation is expensive and should only be done if this target was # explicitly called. ifneq ($(filter build-test-lib-native, $(MAKECMDGOALS)), ) diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk index 98101ee1e86..d8edb8743d7 100644 --- a/make/test/JtregNativeHotspot.gmk +++ b/make/test/JtregNativeHotspot.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -857,6 +857,11 @@ else exeinvoke.c exestack-gap.c exestack-tls.c libAsyncGetCallTraceTest.cpp endif +ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), false) + BUILD_HOTSPOT_JTREG_EXCLUDE += libTestSVEWithJNI.c +endif + + BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm ifeq ($(call isTargetOs, windows), true)