Mercurial > hg > icedtea8
view patches/hotspot/shenandoah/8143245-pr3548.patch @ 2986:2ba4051a8442
Bump shenandoah to aarch64-shenandoah-jdk8u282-b08.
2021-02-03 Andrew John Hughes <gnu_andrew@member.fsf.org>
Bump shenandoah to aarch64-shenandoah-jdk8u282-b08.
* patches/hotspot/shenandoah/8062808-pr3548.patch,
* patches/hotspot/shenandoah/8197981-pr3548.patch,
* patches/hotspot/shenandoah/pr1869.patch,
* patches/hotspot/shenandoah/pr3519-return_value-02.patch,
* patches/hotspot/shenandoah/pr3601.patch:
Remove patches included upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Make PR1869, 8062808/PR3548,
8197981/PR3548 and PR3601 patches AArch32 only
as they are now upstream in the new Shenandoah
bundle. Remove Shenandoah-only PR3519 altogether.
* NEWS: Updated.
* hotspot.map.in: Bump shenandoah to
aarch64-shenandoah-jdk8u282-b08.
* patches/hotspot/aarch32/8062808-pr3548.patch:
Replace symlink to Shenandoah version with a
regenerated version that does not assume PR1748
is applied first.
* patches/hotspot/aarch32/8143245-pr3548.patch,
* patches/hotspot/aarch32/8197981-pr3548.patch:
Replace symlinks to Shenandoah versions with copies,
as the Shenandoah versions have been removed.
* patches/hotspot/aarch32/pr1748.patch:
Replace symlink to Shenandoah version with a
regenerated version that applies after JDK-8062808,
but without JDK-8036122 being applied as in
the Shenandoah version.
* patches/hotspot/aarch32/pr1869.patch,
* patches/hotspot/aarch32/pr3601.patch,
* patches/hotspot/aarch32/werror.patch:
Replace symlinks to Shenandoah versions with copies,
as the Shenandoah versions are either removed or
modified to apply against 8u282-b08.
* patches/hotspot/shenandoah/8143245-pr3548.patch:
Regenerated against new context in cppInterpreter_zero.cpp
due to JDK-8254166.
* patches/hotspot/shenandoah/pr1748.patch:
Regenerated against new context in linux/makefiles/gcc.make
due to JDK-8062808 being upstreamed.
* patches/hotspot/shenandoah/werror.patch:
Regenerated against new context in solaris/makefiles/gcc.make
due to JDK-8036122.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Thu, 04 Feb 2021 06:19:03 +0000 |
parents | 2c02d50412c9 |
children |
line wrap: on
line source
# HG changeset patch # User sgehwolf # Date 1525714161 -3600 # Mon May 07 18:29:21 2018 +0100 # Node ID afb31413c73cbc06420fdb447aa90a7a38258904 # Parent bcbc64dfb629c5f188bbf59b8f986ad95963ed60 8143245, PR3548: Zero build requires disabled warnings Reviewed-by: dholmes, coleenp diff -Nru openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make --- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2021-01-15 17:21:13.000000000 +0000 +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2021-02-03 18:32:04.493467003 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright 2007, 2008 Red Hat, Inc. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -29,11 +29,6 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true) WARNING_FLAGS += -Wno-undef endif -# Suppress some warning flags that are normally turned on for hotspot, -# because some of the zero code has not been updated accordingly. -WARNING_FLAGS += -Wno-return-type \ - -Wno-format-nonliteral -Wno-format-security \ - -Wno-maybe-uninitialized # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2021-01-15 17:21:13.000000000 +0000 +++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2021-02-03 18:32:45.508953742 +0000 @@ -102,7 +102,7 @@ return result; default: ShouldNotReachHere(); - return result; // silence compiler warnings + return NULL_WORD; // silence compiler warnings } } diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp --- openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2021-01-15 17:21:13.000000000 +0000 +++ openjdk/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp 2021-02-03 18:32:04.493467003 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -62,7 +62,7 @@ } void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) { - ffi_type *ftype; + ffi_type *ftype = NULL; switch (type) { case T_VOID: ftype = &ffi_type_void; diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2021-01-15 17:21:13.000000000 +0000 +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2021-02-03 18:32:04.493467003 +0000 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2016 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,6 +61,7 @@ frame os::get_sender_for_C_frame(frame* fr) { ShouldNotCallThis(); + return frame(NULL, NULL); // silence compile warning. } frame os::current_frame() { @@ -98,16 +99,19 @@ address os::Linux::ucontext_get_pc(ucontext_t* uc) { ShouldNotCallThis(); + return NULL; // silence compile warnings } ExtendedPC os::fetch_frame_from_context(void* ucVoid, intptr_t** ret_sp, intptr_t** ret_fp) { ShouldNotCallThis(); + return NULL; // silence compile warnings } frame os::fetch_frame_from_context(void* ucVoid) { ShouldNotCallThis(); + return frame(NULL, NULL); // silence compile warnings } extern "C" JNIEXPORT int @@ -247,11 +251,16 @@ } #endif // !PRODUCT - const char *fmt = "caught unhandled signal %d"; char buf[64]; - sprintf(buf, fmt, sig); + sprintf(buf, "caught unhandled signal %d", sig); + +// Silence -Wformat-security warning for fatal() +PRAGMA_DIAG_PUSH +PRAGMA_FORMAT_NONLITERAL_IGNORED fatal(buf); +PRAGMA_DIAG_POP + return true; // silence compiler warnings } void os::Linux::init_thread_fpu_state(void) { @@ -260,6 +269,7 @@ int os::Linux::get_fpu_control_word() { ShouldNotCallThis(); + return -1; // silence compile warnings } void os::Linux::set_fpu_control_word(int fpu) { diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp --- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2021-01-15 17:21:13.000000000 +0000 +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2021-02-03 18:32:04.494467015 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -110,6 +110,7 @@ void* ucontext, bool isInJava) { ShouldNotCallThis(); + return false; // silence compile warning } bool pd_get_top_frame_for_profiling(frame* fr_addr,