From 856a1a48424e02fd6ae36386dc208e772dcdca292c4fc0e6e829e7754c860736 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 11 Jun 2021 14:44:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-17-openjdk?expand=0&rev=14 --- java-17-openjdk.spec | 42 +------- s390-java-opts.patch | 28 ------ s390-size_t.patch | 232 ------------------------------------------- 3 files changed, 2 insertions(+), 300 deletions(-) delete mode 100644 s390-java-opts.patch delete mode 100644 s390-size_t.patch diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 3a0dd5f..2d42380 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -16,7 +16,6 @@ # -%define _lto_cflags %{nil} %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %{!?arm6:%global arm6 armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl} %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm} s390x @@ -207,9 +206,6 @@ Patch20: loadAssistiveTechnologies.patch # # OpenJDK specific patches # -Patch100: s390-java-opts.patch -Patch101: s390-size_t.patch -# Patch200: ppc_stack_overflow_fix.patch Patch201: fix_armv6_build.patch # @@ -483,13 +479,6 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2* %patch20 -p1 -# s390 build fixes - -%ifarch s390 -%patch100 -p1 -%patch101 -p1 -%endif - %patch200 -p1 %ifarch %{arm6} @@ -542,22 +531,6 @@ done export ARCH_DATA_MODEL=64 %endif -%ifarch alpha -export CFLAGS="$CFLAGS -mieee" -%endif - -EXTRA_CFLAGS="-Wno-error" -EXTRA_CPP_FLAGS="-Wno-error" - -%ifarch ppc64 ppc64le ppc -EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" -%endif - -%if 0%{?suse_version} >= 1330 -EXTRA_CFLAGS="$EXTRA_CFLAGS -std=c++14 -fno-delete-null-pointer-checks -fno-lifetime-dse -fpermissive" -EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -std=c++14 -fno-delete-null-pointer-checks -fno-lifetime-dse" -%endif - mkdir -p %{buildoutputdir} pushd %{buildoutputdir} @@ -579,7 +552,6 @@ bash ../configure \ --with-version-pre="" \ %endif --with-version-opt="suse-%{release}-%{_arch}" \ - --disable-warnings-as-errors \ %if %{with zero} --with-jvm-variants=zero \ %else @@ -599,21 +571,11 @@ bash ../configure \ --with-pcsclite=system \ %endif --with-stdc++lib=dynamic \ - --with-boot-jdk-jvmargs="-Xms256M -Xmx768M" \ - --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ - --with-extra-cflags="$EXTRA_CFLAGS" \ - --disable-javac-server - -# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist -# disables FDS for all build configs and reverts to pre-FDS make %{?_smp_mflags} logic. -# STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says -# ignore all the other logic about which debug options and just do '-g'. + --disable-javac-server \ + --disable-warnings-as-errors make --no-print-directory \ - JAVAC_FLAGS=-g \ LOG=trace \ - WARNINGS_ARE_ERRORS="-Wno-error" \ - CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \ %{imagestarget} # remove redundant *diz and *debuginfo files diff --git a/s390-java-opts.patch b/s390-java-opts.patch deleted file mode 100644 index 8f88b16..0000000 --- a/s390-java-opts.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- jdk9/make/autoconf/boot-jdk.m4 2017-01-23 20:49:50.000000000 +0100 -+++ jdk9/make/autoconf/boot-jdk.m4 2017-02-02 07:37:15.384455529 +0100 -@@ -360,11 +360,11 @@ - AC_MSG_CHECKING([flags for boot jdk java command for big workloads]) - - # Starting amount of heap memory. -- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA]) -- BOOTCYCLE_JVM_ARGS_BIG=-Xms64M -+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_big,[$JAVA]) -+ BOOTCYCLE_JVM_ARGS_BIG=-Xms256M - - # Maximum amount of heap memory and stack size. -- JVM_HEAP_LIMIT_32="1024" -+ JVM_HEAP_LIMIT_32="768" - # Running a 64 bit JVM allows for and requires a bigger heap - JVM_HEAP_LIMIT_64="1600" - STACK_SIZE_32=768 -@@ -417,8 +417,8 @@ - - # Use serial gc for small short lived tools if possible - ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA]) -- ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA]) -- ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA]) -+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs_small,[$JAVA]) -+ ADD_JVM_ARG_IF_OK([-Xmx768M],boot_jdk_jvmargs_small,[$JAVA]) - ADD_JVM_ARG_IF_OK([-XX:TieredStopAtLevel=1],boot_jdk_jvmargs_small,[$JAVA]) - - AC_MSG_RESULT([$boot_jdk_jvmargs_small]) diff --git a/s390-size_t.patch b/s390-size_t.patch deleted file mode 100644 index 45f9d06..0000000 --- a/s390-size_t.patch +++ /dev/null @@ -1,232 +0,0 @@ ---- jdk10/src/share/vm/code/codeCache.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/code/codeCache.cpp 2017-01-25 10:28:19.880008325 +0100 -@@ -403,7 +403,7 @@ - add_heap(heap); - - // Reserve Space -- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size()); -+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size()); - size_initial = round_to(size_initial, os::vm_page_size()); - if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) { - vm_exit_during_initialization("Could not reserve enough space for code cache"); ---- jdk10/src/share/vm/gc/cms/compactibleFreeListSpace.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/cms/compactibleFreeListSpace.cpp 2017-01-25 10:28:19.880008325 +0100 -@@ -2506,7 +2506,7 @@ - // - size_t multiple = (size_t) (_num_blocks[word_sz]/(((double)CMSOldPLABToleranceFactor)*CMSOldPLABNumRefills*n_blks)); - n_blks += CMSOldPLABReactivityFactor*multiple*n_blks; -- n_blks = MIN2(n_blks, CMSOldPLABMax); -+ n_blks = MIN2(n_blks, (size_t)CMSOldPLABMax); - } - assert(n_blks > 0, "Error"); - _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl); ---- jdk10/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp 2017-01-25 10:28:19.884008234 +0100 -@@ -753,7 +753,7 @@ - if (free_percentage < desired_free_percentage) { - size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); - assert(desired_capacity >= capacity(), "invalid expansion size"); -- size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes); -+ size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t)MinHeapDeltaBytes); - Log(gc) log; - if (log.is_trace()) { - size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); -@@ -5510,7 +5510,7 @@ - HeapWord* curAddr = _markBitMap.startWord(); - while (curAddr < _markBitMap.endWord()) { - size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); -- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining)); -+ MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum, remaining)); - _markBitMap.clear_large_range(chunk); - if (ConcurrentMarkSweepThread::should_yield() && - !foregroundGCIsActive() && -@@ -5791,7 +5791,7 @@ - return; - } - // Double capacity if possible -- size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax); -+ size_t new_capacity = MIN2(_capacity*2, (size_t)MarkStackSizeMax); - // Do not give up existing stack until we have managed to - // get the double capacity that we desired. - ReservedSpace rs(ReservedSpace::allocation_align_size_up( ---- jdk10/src/share/vm/gc/cms/parNewGeneration.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/cms/parNewGeneration.cpp 2017-01-25 10:28:19.884008234 +0100 -@@ -197,7 +197,7 @@ - const size_t num_overflow_elems = of_stack->size(); - const size_t space_available = queue->max_elems() - queue->size(); - const size_t num_take_elems = MIN3(space_available / 4, -- ParGCDesiredObjsFromOverflowList, -+ (size_t)ParGCDesiredObjsFromOverflowList, - num_overflow_elems); - // Transfer the most recent num_take_elems from the overflow - // stack to our work queue. ---- jdk10/src/share/vm/gc/g1/g1CollectedHeap.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/g1/g1CollectedHeap.cpp 2017-01-25 10:28:19.884008234 +0100 -@@ -1595,7 +1595,7 @@ - - _verifier->verify_region_sets_optional(); - -- size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes); -+ size_t expand_bytes = MAX2(word_size * HeapWordSize, (size_t)MinHeapDeltaBytes); - log_debug(gc, ergo, heap)("Attempt heap expansion (allocation request failed). Allocation request: " SIZE_FORMAT "B", - word_size * HeapWordSize); - ---- jdk10/src/share/vm/gc/g1/g1ConcurrentMark.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/g1/g1ConcurrentMark.cpp 2017-01-25 10:28:19.884008234 +0100 -@@ -2458,7 +2458,7 @@ - // of things to do) or totally (at the very end). - size_t target_size; - if (partially) { -- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize); -+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize); - } else { - target_size = 0; - } ---- jdk10/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp 2017-01-25 10:30:27.289082074 +0100 -@@ -41,7 +41,7 @@ - } - - size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) { -- size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride); -+ size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride); - - if (remaining > ObjArrayMarkingStride) { - push_array_slice(start_from + ObjArrayMarkingStride); ---- jdk10/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/g1/g1PageBasedVirtualSpace.hpp 2017-01-25 10:28:19.884008234 +0100 -@@ -91,7 +91,7 @@ - void pretouch_internal(size_t start_page, size_t end_page); - - // Returns the index of the page which contains the given address. -- uintptr_t addr_to_page_index(char* addr) const; -+ size_t addr_to_page_index(char* addr) const; - // Returns the address of the given page index. - char* page_start(size_t index) const; - ---- jdk10/src/share/vm/gc/parallel/psCompactionManager.inline.hpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/parallel/psCompactionManager.inline.hpp 2017-01-25 10:28:19.888008143 +0100 -@@ -119,7 +119,7 @@ - const size_t beg_index = size_t(index); - assert(beg_index < len || len == 0, "index too large"); - -- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride); -+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride); - const size_t end_index = beg_index + stride; - T* const base = (T*)obj->base(); - T* const beg = base + beg_index; ---- jdk10/src/share/vm/gc/parallel/psParallelCompact.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/parallel/psParallelCompact.cpp 2017-01-25 10:28:19.888008143 +0100 -@@ -905,8 +905,8 @@ - void PSParallelCompact::initialize_dead_wood_limiter() - { - const size_t max = 100; -- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0; -- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; -+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0; -+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0; - _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); - DEBUG_ONLY(_dwl_initialized = true;) - _dwl_adjustment = normal_distribution(1.0); ---- jdk10/src/share/vm/gc/shared/collectorPolicy.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/shared/collectorPolicy.cpp 2017-01-25 10:28:19.888008143 +0100 -@@ -450,7 +450,7 @@ - // yield a size that is too small) and bound it by MaxNewSize above. - // Ergonomics plays here by previously calculating the desired - // NewSize and MaxNewSize. -- _max_young_size = MIN2(MAX2(_max_young_size, _initial_young_size), MaxNewSize); -+ _max_young_size = MIN2(MAX2(_max_young_size, _initial_young_size), (size_t)MaxNewSize); - } - - // Given the maximum young size, determine the initial and -@@ -480,7 +480,7 @@ - // NewSize as the floor, because if NewRatio is overly large, the resulting - // size can be too small. - _initial_young_size = -- MIN2(_max_young_size, MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize)); -+ MIN2(_max_young_size, MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize)); - } - } - ---- jdk10/src/share/vm/gc/shared/plab.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/gc/shared/plab.cpp 2017-01-25 10:28:19.888008143 +0100 -@@ -32,7 +32,7 @@ - - size_t PLAB::min_size() { - // Make sure that we return something that is larger than AlignmentReserve -- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve; -+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve; - } - - size_t PLAB::max_size() { ---- jdk10/src/share/vm/memory/metaspace.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/memory/metaspace.cpp 2017-01-25 10:28:19.888008143 +0100 -@@ -1542,7 +1542,7 @@ - - void MetaspaceGC::post_initialize() { - // Reset the high-water mark once the VM initialization is done. -- _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize); -+ _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t)MetaspaceSize); - } - - bool MetaspaceGC::can_expand(size_t word_size, bool is_class) { -@@ -1602,7 +1602,7 @@ - (size_t)MIN2(min_tmp, double(max_uintx)); - // Don't shrink less than the initial generation size - minimum_desired_capacity = MAX2(minimum_desired_capacity, -- MetaspaceSize); -+ (size_t)MetaspaceSize); - - log_trace(gc, metaspace)("MetaspaceGC::compute_new_size: "); - log_trace(gc, metaspace)(" minimum_free_percentage: %6.2f maximum_used_percentage: %6.2f", -@@ -1648,7 +1648,7 @@ - const double max_tmp = used_after_gc / minimum_used_percentage; - size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx)); - maximum_desired_capacity = MAX2(maximum_desired_capacity, -- MetaspaceSize); -+ (size_t)MetaspaceSize); - log_trace(gc, metaspace)(" maximum_free_percentage: %6.2f minimum_used_percentage: %6.2f", - maximum_free_percentage, minimum_used_percentage); - log_trace(gc, metaspace)(" minimum_desired_capacity: %6.1fKB maximum_desired_capacity: %6.1fKB", -@@ -3352,7 +3352,7 @@ - // on the medium chunk list. The next chunk will be small and progress - // from there. This size calculated by -version. - _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6, -- (CompressedClassSpaceSize/BytesPerWord)*2); -+ (size_t)(CompressedClassSpaceSize/BytesPerWord)*2); - _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size); - // Arbitrarily set the initial virtual space to a multiple - // of the boot class loader size. ---- jdk10/src/share/vm/prims/whitebox.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/prims/whitebox.cpp 2017-01-25 10:28:19.888008143 +0100 -@@ -1017,7 +1017,7 @@ - WB_END - - WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name)) -- uintx result; -+ size_t result; - if (GetVMFlag (thread, env, name, &result, &CommandLineFlags::size_tAt)) { - ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI - return longBox(thread, env, result); ---- jdk10/src/share/vm/runtime/arguments.cpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/runtime/arguments.cpp 2017-01-25 10:28:19.892008051 +0100 -@@ -1488,7 +1488,7 @@ - // Increase the code cache size - tiered compiles a lot more. - if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) { - FLAG_SET_ERGO(uintx, ReservedCodeCacheSize, -- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5)); -+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5))); - } - // Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M - if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) { ---- jdk10/src/share/vm/runtime/arguments.hpp 2017-01-13 00:41:16.000000000 +0100 -+++ jdk10/src/share/vm/runtime/arguments.hpp 2017-01-25 10:28:19.892008051 +0100 -@@ -416,7 +416,7 @@ - // Value of the conservative maximum heap alignment needed - static size_t _conservative_max_heap_alignment; - -- static uintx _min_heap_size; -+ static size_t _min_heap_size; - - // -Xrun arguments - static AgentLibraryList _libraryList;