From 65fb89da57cd43a1752eb87bdb97a1571ffaf99e Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 6 Nov 2023 19:45:53 +0300 Subject: [PATCH] Reduce analysis surface --- java-17-openjdk.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index af39a6f..54a3acf 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -354,7 +354,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 7 -%global rpmrelease 2 +%global rpmrelease 3 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1844,6 +1844,22 @@ done # Setup nss.cfg sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg +# Remove not used code, including assembler code, +# so that it does not get counted as code written in assembler +# during analysis in laboratory (FSTEK) +rm -fvr \ +openjdk/src/hotspot/os_cpu/aix* \ +openjdk/src/hotspot/os_cpu/bsd* \ +%ifnarch aarch64 +openjdk/src/hotspot/os_cpu/linux_aarch64 \ +%endif +openjdk/src/hotspot/os_cpu/linux_ppc \ +openjdk/src/hotspot/os_cpu/linux_sparc \ +openjdk/src/hotspot/os_cpu/solaris* \ +openjdk/src/hotspot/os_cpu/windows* \ +openjdk/src/jdk.incubator.vector/windows +# TODO: openjdk/src/jdk.incubator.vector/linux/native/libjsvml, ~200K lines of asm code + %build # How many CPU's do we have?