head	1.5;
access;
symbols
	pkgsrc-2020Q1:1.4.0.36
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.58
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.54
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2019Q2:1.4.0.52
	pkgsrc-2019Q2-base:1.4
	pkgsrc-2019Q1:1.4.0.50
	pkgsrc-2019Q1-base:1.4
	pkgsrc-2018Q4:1.4.0.48
	pkgsrc-2018Q4-base:1.4
	pkgsrc-2018Q3:1.4.0.46
	pkgsrc-2018Q3-base:1.4
	pkgsrc-2018Q2:1.4.0.44
	pkgsrc-2018Q2-base:1.4
	pkgsrc-2018Q1:1.4.0.42
	pkgsrc-2018Q1-base:1.4
	pkgsrc-2017Q4:1.4.0.40
	pkgsrc-2017Q4-base:1.4
	pkgsrc-2017Q3:1.4.0.38
	pkgsrc-2017Q3-base:1.4
	pkgsrc-2017Q2:1.4.0.34
	pkgsrc-2017Q2-base:1.4
	pkgsrc-2017Q1:1.4.0.32
	pkgsrc-2017Q1-base:1.4
	pkgsrc-2016Q4:1.4.0.30
	pkgsrc-2016Q4-base:1.4
	pkgsrc-2016Q3:1.4.0.28
	pkgsrc-2016Q3-base:1.4
	pkgsrc-2016Q2:1.4.0.26
	pkgsrc-2016Q2-base:1.4
	pkgsrc-2016Q1:1.4.0.24
	pkgsrc-2016Q1-base:1.4
	pkgsrc-2015Q4:1.4.0.22
	pkgsrc-2015Q4-base:1.4
	pkgsrc-2015Q3:1.4.0.20
	pkgsrc-2015Q3-base:1.4
	pkgsrc-2015Q2:1.4.0.18
	pkgsrc-2015Q2-base:1.4
	pkgsrc-2015Q1:1.4.0.16
	pkgsrc-2015Q1-base:1.4
	pkgsrc-2014Q4:1.4.0.14
	pkgsrc-2014Q4-base:1.4
	pkgsrc-2014Q3:1.4.0.12
	pkgsrc-2014Q3-base:1.4
	pkgsrc-2014Q2:1.4.0.10
	pkgsrc-2014Q2-base:1.4
	pkgsrc-2014Q1:1.4.0.8
	pkgsrc-2014Q1-base:1.4
	pkgsrc-2013Q4:1.4.0.6
	pkgsrc-2013Q4-base:1.4
	pkgsrc-2013Q3:1.4.0.4
	pkgsrc-2013Q3-base:1.4
	pkgsrc-2013Q2:1.4.0.2
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2013Q1:1.2.0.4
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.1.0.24
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.22
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.20
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.18
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.16
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.14
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.12
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.10
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.8
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.6
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.4
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2020.05.17.00.47.06;	author tnn;	state dead;
branches;
next	1.4;
commitid	by06jUrXKAUzQw8C;

1.4
date	2013.06.15.09.31.05;	author jperkin;	state Exp;
branches;
next	1.3;
commitid	gr72iqj6cRdUZGTw;

1.3
date	2013.06.02.06.12.28;	author ryoon;	state Exp;
branches;
next	1.2;
commitid	j8SPqZax02Hdk0Sw;

1.2
date	2012.10.24.15.36.47;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2009.10.18.10.21.01;	author tnn;	state Exp;
branches;
next	;


desc
@@


1.5
log
@retire lang/openjdk7
@
text
@$NetBSD: patch-bi,v 1.4 2013/06/15 09:31:05 jperkin Exp $

DragonFly support.

--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2012-08-10 16:24:31.000000000 +0000
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@@@ -94,7 +94,7 @@@@
 #define SPELL_REG_FP "ebp"
 #endif // AMD64
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 # define context_trapno uc_mcontext.mc_trapno
 # ifdef AMD64
 #  define context_pc uc_mcontext.mc_rip
@@@@ -279,13 +279,8 @@@@ address os::current_stack_pointer() {
   register void *esp;
   __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
   return (address) esp;
-#elif defined(SPARC_WORKS)
-  register void *esp;
-  __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
-  return (address) ((char*)esp + sizeof(long)*2);
 #else
-  register void *esp __asm__ (SPELL_REG_SP);
-  return (address) esp;
+  return (address)__builtin_frame_address(0);
 #endif
 }
 
@@@@ -362,13 +357,7 @@@@ frame os::get_sender_for_C_frame(frame* 
 }
 
 intptr_t* _get_previous_fp() {
-#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
-  register intptr_t **ebp;
-  __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
-#else
-  register intptr_t **ebp __asm__ (SPELL_REG_FP);
-#endif
-  return (intptr_t*) *ebp;   // we want what it points to.
+  return (intptr_t *)__builtin_frame_address(1);
 }
 
 
@


1.4
log
@Add SunOS/GCC support.  With huge thanks to "jesse" from #SmartOS who did the
bulk of the porting work.  Tested on SmartOS 32-bit.  64-bit builds currently
fail, they should hopefully be fixed soon.
@
text
@d1 1
a1 1
$NetBSD: patch-bi,v 1.3 2013/06/02 06:12:28 ryoon Exp $
@


1.3
log
@Update to 1.7.21 (7u21)

* Update with FreeBSD ports' patch-set file.
* Add patches from icedtea's rhino.patch file.
* Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1,
  and DragonFly/i386 3.2.2.

Changelog:
* Unknown because I do not know previous version, 1.7.0.147.20110811.
* Many bugs and security bugs should be fixed.
@
text
@d1 3
a3 1
$NetBSD: patch-bi,v 1.2 2012/10/24 15:36:47 joerg Exp $
@


1.2
log
@Fix the clang build by using the proper compiler builtins instead of
touching the stack and frame pointer directly. Especially the latter is
problematic, since the compiler is not really required to use it.
@
text
@d1 1
a1 1
$NetBSD: patch-bi,v 1.1 2009/10/18 10:21:01 tnn Exp $
d3 1
a3 1
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2009-10-17 16:49:37.000000000 +0200
d5 1
a5 1
@@@@ -60,7 +60,7 @@@@
d14 5
a18 5
@@@@ -275,14 +275,7 @@@@
 #endif
 
 address os::current_stack_pointer() {
-#ifdef SPARC_WORKS
d22 1
a22 1
-#else
a24 1
-#endif
d26 1
d29 1
a29 2
 char* os::non_memory_address_word() {
@@@@ -358,13 +351,7 @@@@ frame os::get_sender_for_C_frame(frame* 
d33 1
a33 1
-#ifdef SPARC_WORKS
@


1.1
log
@Add initial support for DragonFly/i386 2.4. (only build tested)
@
text
@d1 1
a1 1
$NetBSD$
d14 31
@