[Midnightbsd-cvs] mports [21882] trunk/java/openjdk6/files: add additional patches

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 3 20:10:41 EDT 2016


Revision: 21882
          http://svnweb.midnightbsd.org/mports/?rev=21882
Author:   laffer1
Date:     2016-09-03 20:10:41 -0400 (Sat, 03 Sep 2016)
Log Message:
-----------
add additional patches

Added Paths:
-----------
    trunk/java/openjdk6/files/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
    trunk/java/openjdk6/files/patch-hotspot_make_bsd_makefiles_saproc.make
    trunk/java/openjdk6/files/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86.cpp
    trunk/java/openjdk6/files/patch-jdk_src_share_native_sun_java2d_cmm_lcms.h
    trunk/java/openjdk6/files/patch-zzz_hotspot_agent_src_os_bsd_ps_proc.c
    trunk/java/openjdk6/files/patch-zzz_hotspot_src-share_vm_utilities_macros.hpp
    trunk/java/openjdk6/files/patch-zzz_hotspot_src_os_bsd_vm_os_bsd.cpp

Added: trunk/java/openjdk6/files/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
===================================================================
--- trunk/java/openjdk6/files/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,11 @@
+--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.orig	2016-09-03 19:07:44.165158185 -0400
++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	2016-09-03 19:07:58.968158308 -0400
+@@ -37,7 +37,7 @@
+       return "solaris";
+     } else if (os.equals("Linux")) {
+       return "linux";
+-    } else if (os.equals("FreeBSD")) {
++    } else if (os.equals("MidnightBSD")) {
+       return "bsd";
+     } else if (os.equals("NetBSD")) {
+       return "bsd";


Property changes on: trunk/java/openjdk6/files/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-hotspot_make_bsd_makefiles_saproc.make
===================================================================
--- trunk/java/openjdk6/files/patch-hotspot_make_bsd_makefiles_saproc.make	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-hotspot_make_bsd_makefiles_saproc.make	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,11 @@
+--- hotspot/make/bsd/makefiles/saproc.make.orig	2016-09-03 19:01:43.787158206 -0400
++++ hotspot/make/bsd/makefiles/saproc.make	2016-09-03 19:02:03.386158156 -0400
+@@ -47,7 +47,7 @@
+                       $(SASRCDIR)/ps_core.c           \
+                       $(SASRCDIR)/BsdDebuggerLocal.c
+ 
+-ifeq ($(OS_VENDOR), FreeBSD)
++ifeq ($(OS_VENDOR), MidnightBSD)
+   SASRCFILES = $(NON_STUB_SASRCFILES)
+   SALIBS = -lutil -lthread_db
+   SAARCH = $(ARCHFLAG)


Property changes on: trunk/java/openjdk6/files/patch-hotspot_make_bsd_makefiles_saproc.make
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86.cpp
===================================================================
--- trunk/java/openjdk6/files/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86.cpp	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86.cpp	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,11 @@
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2016-09-03 19:12:16.574158549 -0400
++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2016-09-03 19:12:32.133158958 -0400
+@@ -94,7 +94,7 @@
+ #define SPELL_REG_FP "ebp"
+ #endif // AMD64
+ 
+-#ifdef __FreeBSD__
++#ifdef __MidnightBSD__
+ # define context_trapno uc_mcontext.mc_trapno
+ # ifdef AMD64
+ #  define context_pc uc_mcontext.mc_rip


Property changes on: trunk/java/openjdk6/files/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-jdk_src_share_native_sun_java2d_cmm_lcms.h
===================================================================
--- trunk/java/openjdk6/files/patch-jdk_src_share_native_sun_java2d_cmm_lcms.h	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-jdk_src_share_native_sun_java2d_cmm_lcms.h	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,29 @@
+--- jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h.orig	2016-09-03 19:16:46.240159711 -0400
++++ jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h	2016-09-03 19:17:23.909158095 -0400
+@@ -71,7 +71,7 @@
+ // #define LCMS_DLL_BUILD   1
+ 
+ // Uncomment if you are trying the engine in a non-windows environment
+-// like linux, SGI, VAX, FreeBSD, BeOS, etc.
++// like linux, SGI, VAX, MidnightBSD, FreeBSD, BeOS, etc.
+ #define NON_WINDOWS  1
+ 
+ // Uncomment this one if you are using big endian machines (only meaningful
+@@ -190,7 +190,7 @@
+ #   define USE_BIG_ENDIAN      1
+ #endif
+ 
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #  include <sys/types.h>
+ #  define USE_INT64           1
+ #  define LCMSSLONGLONG       int64_t
+@@ -210,7 +210,7 @@
+ 
+ #include <string.h>
+ 
+-#if defined(__GNUC__) || defined(__FreeBSD__)
++#if defined(__GNUC__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
+ #   include <unistd.h>
+ #endif
+ 


Property changes on: trunk/java/openjdk6/files/patch-jdk_src_share_native_sun_java2d_cmm_lcms.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-zzz_hotspot_agent_src_os_bsd_ps_proc.c
===================================================================
--- trunk/java/openjdk6/files/patch-zzz_hotspot_agent_src_os_bsd_ps_proc.c	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-zzz_hotspot_agent_src_os_bsd_ps_proc.c	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,11 @@
+--- hotspot/agent/src/os/bsd/ps_proc.c.orig	2016-08-22 10:01:50.000000000 -0400
++++ hotspot/agent/src/os/bsd/ps_proc.c	2016-09-03 19:05:18.668158852 -0400
+@@ -293,7 +299,7 @@
+ #endif // __FreeBSD__ && __FreeBSD_version < 701000
+ 
+ static bool read_lib_info(struct ps_prochandle* ph) {
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 701000
++#if defined(__MidnightBSD__) 
+   struct kinfo_vmentry *freep, *kve;
+   int i, cnt;
+ 


Property changes on: trunk/java/openjdk6/files/patch-zzz_hotspot_agent_src_os_bsd_ps_proc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-zzz_hotspot_src-share_vm_utilities_macros.hpp
===================================================================
--- trunk/java/openjdk6/files/patch-zzz_hotspot_src-share_vm_utilities_macros.hpp	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-zzz_hotspot_src-share_vm_utilities_macros.hpp	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,11 @@
+--- hotspot/src/share/vm/utilities/macros.hpp.orig2	2016-09-03 19:14:09.604158508 -0400
++++ hotspot/src/share/vm/utilities/macros.hpp	2016-09-03 19:14:32.286158836 -0400
+@@ -162,7 +162,7 @@
+ #define NOT_WINDOWS(code) code
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++#if defined(__MidnightBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+ #define BSD_ONLY(code) code
+ #define NOT_BSD(code)
+ #else


Property changes on: trunk/java/openjdk6/files/patch-zzz_hotspot_src-share_vm_utilities_macros.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/java/openjdk6/files/patch-zzz_hotspot_src_os_bsd_vm_os_bsd.cpp
===================================================================
--- trunk/java/openjdk6/files/patch-zzz_hotspot_src_os_bsd_vm_os_bsd.cpp	                        (rev 0)
+++ trunk/java/openjdk6/files/patch-zzz_hotspot_src_os_bsd_vm_os_bsd.cpp	2016-09-04 00:10:41 UTC (rev 21882)
@@ -0,0 +1,20 @@
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig2	2016-09-03 19:10:08.781158978 -0400
++++ hotspot/src/os/bsd/vm/os_bsd.cpp	2016-09-03 19:10:47.951158808 -0400
+@@ -3771,7 +3771,7 @@
+ #ifdef __OpenBSD__
+   // OpenBSD pthread_setprio starves low priority threads
+   return OS_OK;
+-#elif defined(__FreeBSD__)
++#elif defined(__MidnightBSD__)
+   int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
+ #elif defined(__APPLE__) || defined(__NetBSD__)
+   struct sched_param sp;
+@@ -3799,7 +3799,7 @@
+   }
+ 
+   errno = 0;
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__MidnightBSD__)
+   *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
+ #elif defined(__APPLE__) || defined(__NetBSD__)
+   int policy;


Property changes on: trunk/java/openjdk6/files/patch-zzz_hotspot_src_os_bsd_vm_os_bsd.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list