CVS commit: pkgsrc/lang/openjdk8

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Tue Jul 18 19:53:11 UTC 2017

Modified Files:
        pkgsrc/lang/openjdk8: distinfo
        pkgsrc/lang/openjdk8/patches:
            patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp

Log Message:
Fix build on arm by satisfying -Werror=return-local-addr


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.47 pkgsrc/lang/openjdk8/distinfo:1.48
--- pkgsrc/lang/openjdk8/distinfo:1.47  Wed May 10 14:01:58 2017
+++ pkgsrc/lang/openjdk8/distinfo       Tue Jul 18 19:53:11 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2017/05/10 14:01:58 ryoon Exp $
+$NetBSD: distinfo,v 1.48 2017/07/18 19:53:11 jmcneill Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -81,7 +81,7 @@ SHA1 (patch-hotspot_src_cpu_zero_vm_meth
 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
-SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2
+SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = cea10db5bf4ee4b939543b66340bfd59474ca5e0
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d

Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
diff -u pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.1 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.2
--- pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.1   Tue Mar 24 14:24:38 2015
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp       Tue Jul 18 19:53:11 2017
@@ -1,10 +1,22 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.1 2015/03/24 14:24:38 joerg Exp $
+$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.2 2017/07/18 19:53:11 jmcneill Exp $
+
+Fix -Werror=return-local-addr with gcc.
 
 clang objects to redefining builtins.
 
---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig        2015-03-22 20:58:57.000000000 +0000
+--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig        2017-04-27 09:45:07.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -446,21 +446,6 @@ extern "C" {
+@@ -60,8 +60,7 @@
+ #include "utilities/vmError.hpp"
+ 
+ address os::current_stack_pointer() {
+-  address dummy = (address) &dummy;
+-  return dummy;
++  return (address) __builtin_frame_address(0);
+ }
+ 
+ frame os::get_sender_for_C_frame(frame* fr) {
+@@ -446,21 +445,6 @@ extern "C" {
    }
  };