cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix a series of datatype assumptions in i486/hotspot (intptr_t != int

Browse Source 
on OpenBSD)
- fix implicit declaration's by adding headers or prototypes as needed.
This commit is contained in:
kurt 2006-01-22 22:46:30 +00:00
parent 5402377615
commit 88736cd656
24 changed files with 569 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/jdk/1.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2006/01/02 03:48:40 kurt Exp $
# $OpenBSD: Makefile,v 1.11 2006/01/22 22:46:30 kurt Exp $
ONLY_FOR_ARCHS= i386
@ -6,8 +6,8 @@ COMMENT= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.5.0
DISTNAME= jdk-1_5_0
PKGNAME= jdk-${V}p6
PKGNAME-jre= jre-${V}p6
PKGNAME= jdk-${V}p7
PKGNAME-jre= jre-${V}p7
CATEGORIES= devel/jdk java

28
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_c1_Runtime1_i486_cpp Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_c1_Runtime1_i486_cpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/c1_Runtime1_i486.cpp.orig Thu Jan 19 22:38:12 2006
+++ hotspot/src/cpu/i486/vm/c1_Runtime1_i486.cpp Thu Jan 19 21:57:14 2006
@@ -1415,21 +1415,21 @@ void GC_Support::preserve_callee_argumen
}
-jint* GC_Support::get_argument_addr_at(const frame fr, ArgumentLocation location) {
+intptr_t* GC_Support::get_argument_addr_at(const frame fr, ArgumentLocation location) {
// not used for i486
Unimplemented();
return NULL;
}
-jint* GC_Support::get_stack_argument_addr_at(const frame fr, int offset_from_sp_in_words) {
+intptr_t* GC_Support::get_stack_argument_addr_at(const frame fr, int offset_from_sp_in_words) {
// not used for i486
Unimplemented();
return NULL;
}
-jint* GC_Support::get_register_argument_addr_at(const frame fr, Register r) {
+intptr_t* GC_Support::get_register_argument_addr_at(const frame fr, Register r) {
// not used for i486
Unimplemented();
return NULL;

12
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_c2_init_i486_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_c2_init_i486_cpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/c2_init_i486.cpp.orig Thu Jan 19 22:39:17 2006
+++ hotspot/src/cpu/i486/vm/c2_init_i486.cpp Thu Jan 19 21:58:28 2006
@@ -22,7 +22,7 @@ void Compile::pd_compiler2_init() {
if( UseSSE > 2 ) UseSSE=2;
if( UseSSE < 0 ) UseSSE=0;
if( !VM_Version::supports_sse2() ) // Drop to 1 if no SSE2 support
- UseSSE = MIN2(1,UseSSE);
+ UseSSE = MIN2((intx)1,UseSSE);
if( !VM_Version::supports_sse () ) // Drop to 0 if no SSE support
UseSSE = 0;
#ifndef PRODUCT

118
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_frame_i486_cpp Normal file
View File

@ -0,0 +1,118 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_frame_i486_cpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/frame_i486.cpp.orig Thu Jan 19 22:40:01 2006
+++ hotspot/src/cpu/i486/vm/frame_i486.cpp Thu Jan 19 22:14:37 2006
@@ -13,8 +13,8 @@
// Profiling/safepoint support
bool JavaThread::get_top_frame(frame* _fr, ExtendedPC* _addr, bool for_profile_only) {
- jint* sp;
- jint* fp;
+ intptr_t* sp;
+ intptr_t* fp;
ExtendedPC addr = os::fetch_top_frame(this, &sp, &fp);
@@ -70,14 +70,14 @@ bool frame::is_entry_frame() const {
// sender_sp
-jint* frame::interpreter_frame_sender_sp() const {
+intptr_t* frame::interpreter_frame_sender_sp() const {
assert(is_interpreted_frame(), "interpreted frame expected");
- return (jint*) at(interpreter_frame_sender_sp_offset);
+ return (intptr_t*) at(interpreter_frame_sender_sp_offset);
}
-void frame::set_interpreter_frame_sender_sp(jint* sender_sp) {
+void frame::set_interpreter_frame_sender_sp(intptr_t* sender_sp) {
assert(is_interpreted_frame(), "interpreted frame expected");
- int_at_put(interpreter_frame_sender_sp_offset, (jint) sender_sp);
+ int_at_put(interpreter_frame_sender_sp_offset, (intptr_t) sender_sp);
}
@@ -117,7 +117,7 @@ frame frame::sender_for_interpreter_fram
// This basically makes sp in a frame the original sp before the interpreter
// adjusted it. This is handled by _interpreter_sp_adjustment handling on
// sparc. This is much less visible.
- jint* sp = (jint*) at(interpreter_frame_sender_sp_offset);
+ intptr_t* sp = (intptr_t*) at(interpreter_frame_sender_sp_offset);
// We do not need to update the callee-save register mapping because above
// us is either another interpreter frame or a converter-frame, but never
// directly a compiled frame.
@@ -173,7 +173,7 @@ frame frame::sender_for_compiled_frame(R
assert(map != NULL, "map must be set");
// frame owned by optimizing compiler
- jint* sender_sp = NULL;
+ intptr_t* sender_sp = NULL;
#ifdef COMPILER1
sender_sp = fp() + frame::sender_sp_offset;
assert(sender_sp == sp() + cb->frame_size() || cb->frame_size() == -1, "must match");
@@ -183,7 +183,7 @@ frame frame::sender_for_compiled_frame(R
sender_sp = sp() + cb->frame_size();
if( cb->is_i2c_adapter()) {
// Sender's SP is stored at the end of the frame
- sender_sp = (jint*)*(sender_sp-1)+1;
+ sender_sp = (intptr_t*)*(sender_sp-1)+1;
}
#endif
@@ -197,16 +197,16 @@ frame frame::sender_for_compiled_frame(R
// Move this here for C1 and collecting oops in arguments (According to Rene)
COMPILER1_ONLY(map->set_include_argument_oops(cb->caller_must_gc_arguments(map->thread()));)
- jint *saved_fp = (jint*)*(sender_sp - frame::sender_sp_offset);
+ intptr_t *saved_fp = (intptr_t*)*(sender_sp - frame::sender_sp_offset);
#ifdef COMPILER1
- assert(saved_fp == (jint*) (*fp()), "should match");
+ assert(saved_fp == (intptr_t*) (*fp()), "should match");
#endif
#ifdef COMPILER2
if (!cb->is_osr_adapter()) {
int llink_offset = cb->link_offset();
if (llink_offset >= 0) {
// Restore base-pointer, since next frame might be an interpreter frame.
- jint* fp_addr = sp() + llink_offset;
+ intptr_t* fp_addr = sp() + llink_offset;
#ifdef ASSERT
// Check to see if regmap has same info
if (map->update_map()) {
@@ -214,7 +214,7 @@ frame frame::sender_for_compiled_frame(R
assert(fp2_addr == NULL || fp2_addr == (address)fp_addr, "inconsistent framepointer info.");
}
#endif
- saved_fp = (jint*)*fp_addr;
+ saved_fp = (intptr_t*)*fp_addr;
}
}
#endif // COMPILER2
@@ -227,8 +227,8 @@ frame frame::sender_for_compiled_frame(R
// This is different from normal, because the current interpreter frame
// (which has been mangled into an OSR-adapter) pushed a bunch of space
// on the caller's frame to make space for Java locals.
- jint* sp_addr = (sender_sp - frame::sender_sp_offset) + frame::interpreter_frame_sender_sp_offset;
- sender_sp = (jint*)*sp_addr;
+ intptr_t* sp_addr = (sender_sp - frame::sender_sp_offset) + frame::interpreter_frame_sender_sp_offset;
+ sender_sp = (intptr_t*)*sp_addr;
}
#ifndef CORE
@@ -269,7 +269,7 @@ frame frame::sender(RegisterMap* map, Co
}
-bool frame::interpreter_frame_equals_unpacked_fp(jint* fp) {
+bool frame::interpreter_frame_equals_unpacked_fp(intptr_t* fp) {
assert(is_interpreted_frame(), "must be interpreter frame");
methodOop method = interpreter_frame_method();
// When unpacking an optimized frame the frame pointer is
@@ -329,7 +329,7 @@ int frame::pd_compute_variable_size(int
// This is different from normal, because the current interpreter frame
// (which has been mangled into an OSR-adapter) pushed a bunch of space
// on the caller's frame to make space for Java locals.
- jint* sp_addr = (sender_sp - frame::sender_sp_offset) + frame::interpreter_frame_sender_sp_offset;
+ intptr_t* sp_addr = (sender_sp - frame::sender_sp_offset) + frame::interpreter_frame_sender_sp_offset;
intptr_t* new_sp = (intptr_t*)*sp_addr;
frame_size_in_words = new_sp - sp();
}

33
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_frame_i486_hpp Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_frame_i486_hpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/frame_i486.hpp.orig Thu Jan 19 22:41:49 2006
+++ hotspot/src/cpu/i486/vm/frame_i486.hpp Thu Jan 19 22:16:54 2006
@@ -66,17 +66,17 @@
private:
// an additional field beyond _sp and _pc:
- jint* _fp; // frame pointer
+ intptr_t* _fp; // frame pointer
public:
// Constructors
- frame(jint* sp, jint* fp, address pc) {
+ frame(intptr_t* sp, intptr_t* fp, address pc) {
_sp = sp;
_fp = fp;
_pc = pc;
}
- frame(jint* sp, jint* fp) {
+ frame(intptr_t* sp, intptr_t* fp) {
_sp = sp;
_fp = fp;
_pc = (address)(sp[-1]);
@@ -86,7 +86,7 @@
}
// accessors for the instance variables
- jint* fp() const { return _fp; }
+ intptr_t* fp() const { return _fp; }
void patch_pc(Thread* thread, address pc);

74
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_frame_i486_inline_hpp Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_frame_i486_inline_hpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/frame_i486.inline.hpp.orig Tue Oct 19 14:41:30 2004
+++ hotspot/src/cpu/i486/vm/frame_i486.inline.hpp Thu Jan 19 23:13:07 2006
@@ -67,30 +67,30 @@ inline address frame::sender_pc()
// return address of param, zero origin index.
inline address* frame::native_param_addr(int idx) const { return (address*) addr_at( native_frame_initial_param_offset+idx); }
-inline jint* frame::sender_sp() const { return addr_at( sender_sp_offset); }
+inline intptr_t* frame::sender_sp() const { return addr_at( sender_sp_offset); }
inline int frame::pd_oop_map_offset_adjustment() const {
return 0;
}
-inline jint** frame::interpreter_frame_locals_addr() const {
- return (jint**)addr_at(interpreter_frame_locals_offset);
+inline intptr_t** frame::interpreter_frame_locals_addr() const {
+ return (intptr_t**)addr_at(interpreter_frame_locals_offset);
}
-inline jint* frame::interpreter_frame_bcx_addr() const {
- return (jint*)addr_at(interpreter_frame_bcx_offset);
+inline intptr_t* frame::interpreter_frame_bcx_addr() const {
+ return (intptr_t*)addr_at(interpreter_frame_bcx_offset);
}
#ifndef CORE
-inline jint* frame::interpreter_frame_mdx_addr() const {
- return (jint*)addr_at(interpreter_frame_mdx_offset);
+inline intptr_t* frame::interpreter_frame_mdx_addr() const {
+ return (intptr_t*)addr_at(interpreter_frame_mdx_offset);
}
#endif // !CORE
-inline jint& frame::interpreter_frame_local_at(int index) const {
+inline intptr_t& frame::interpreter_frame_local_at(int index) const {
return (*interpreter_frame_locals_addr()) [ -index];
}
@@ -103,13 +103,13 @@ inline int frame::interpreter_frame_moni
// expression stack
// (the max_stack arguments are used by the GC; see class FrameClosure)
-inline jint* frame::interpreter_frame_expression_stack() const {
- jint* monitor_end = (jint*) interpreter_frame_monitor_end();
+inline intptr_t* frame::interpreter_frame_expression_stack() const {
+ intptr_t* monitor_end = (intptr_t*) interpreter_frame_monitor_end();
return monitor_end-1;
}
-inline jint& frame::interpreter_frame_expression_stack_at(jint offset) const {
+inline intptr_t& frame::interpreter_frame_expression_stack_at(jint offset) const {
return interpreter_frame_expression_stack()[-offset];
}
@@ -117,12 +117,12 @@ inline jint& frame::interpreter_frame_ex
inline jint frame::interpreter_frame_expression_stack_direction() { return -1; }
// top of expression stack
-inline jint* frame::interpreter_frame_tos_address() const {
+inline intptr_t* frame::interpreter_frame_tos_address() const {
return sp();
}
-inline jint& frame::interpreter_frame_tos_at(jint offset) const {
+inline intptr_t& frame::interpreter_frame_tos_at(jint offset) const {
return interpreter_frame_tos_address()[offset];
}

12
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_interpreter_i486_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_interpreter_i486_cpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/interpreter_i486.cpp.orig Thu Jan 19 22:52:19 2006
+++ hotspot/src/cpu/i486/vm/interpreter_i486.cpp Thu Jan 19 22:23:57 2006
@@ -1529,7 +1529,7 @@ int AbstractInterpreter::layout_activati
// NOTE the difference in using sender_sp and interpreter_frame_sender_sp
// interpreter_frame_sender_sp is the original sp of the caller (the unextended_sp)
// and sender_sp is fp+8
- jint* locals = interpreter_frame->sender_sp() + max_locals - 1;
+ intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1;
interpreter_frame->interpreter_frame_set_locals(locals);
BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();

24
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_javaFrameAnchor_i486_hpp Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_javaFrameAnchor_i486_hpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/javaFrameAnchor_i486.hpp.orig Thu Jan 19 22:42:17 2006
+++ hotspot/src/cpu/i486/vm/javaFrameAnchor_i486.hpp Thu Jan 19 22:24:33 2006
@@ -9,7 +9,7 @@
private:
// FP value associated with _last_Java_sp:
- jint* volatile _last_Java_fp; // pointer is volatile not what it points to
+ intptr_t* volatile _last_Java_fp; // pointer is volatile not what it points to
public:
// Each arch must define reset, save, restore
@@ -63,9 +63,9 @@ private:
public:
- jint* last_Java_fp(void) { return _last_Java_fp; }
+ intptr_t* last_Java_fp(void) { return _last_Java_fp; }
// Assert (last_Java_sp == NULL || fp == NULL)
- void set_last_Java_fp(jint* fp) { _last_Java_fp = fp; }
+ void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; }

12
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_runtime_i486_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_runtime_i486_cpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/runtime_i486.cpp.orig Fri Jan 20 09:37:03 2006
+++ hotspot/src/cpu/i486/vm/runtime_i486.cpp Fri Jan 20 09:37:15 2006
@@ -333,7 +333,7 @@ void SharedRuntime::generate_deopt_blob(
{ Label L;
__ cmpl(Address(ecx,
JavaThread::last_Java_fp_offset()),
- (intptr_t) 0);
+ (int) 0);
__ jcc(Assembler::equal, L);
__ stop("OptoRuntime::generate_deopt_blob: last_Java_fp not cleared");
__ bind(L);

12
devel/jdk/1.5/patches/patch-hotspot_src_cpu_i486_vm_vmStructs_i486_hpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_i486_vm_vmStructs_i486_hpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/cpu/i486/vm/vmStructs_i486.hpp.orig Thu Jan 19 22:42:45 2006
+++ hotspot/src/cpu/i486/vm/vmStructs_i486.hpp Thu Jan 19 22:25:03 2006
@@ -18,7 +18,7 @@
/******************************/ \
/* JavaFrameAnchor */ \
/******************************/ \
- volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, jint*) \
+ volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) \
\
/* NOTE that we do not use the last_entry() macro here; it is used */

20
devel/jdk/1.5/patches/patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp
View File

@ -1,6 +1,20 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.3 2005/11/30 02:21:32 kurt Exp $
--- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig Tue Nov 29 09:54:02 2005
+++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp Tue Nov 29 09:55:00 2005
$OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_os_bsd_i486_cpp,v 1.4 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig Thu Jan 19 21:50:33 2006
+++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp Thu Jan 19 22:28:26 2006
@@ -292,10 +292,10 @@ void GetThreadPC_Callback::execute(OSThr
// This is a "fast" implementation of fetch_top_frame that relies on the
// new libthread APIs to get pc for a suspended thread
// XXXBSD: This is Solaris specific. Get rid or implement...
-ExtendedPC os::Bsd::fetch_top_frame_fast(Thread* thread, jint** sp, jint** fp) {
+ExtendedPC os::Bsd::fetch_top_frame_fast(Thread* thread, intptr_t** sp, intptr_t** fp) {
ExtendedPC new_addr(NULL);
- *sp = (jint*)0;
- *fp = (jint*)0;
+ *sp = (intptr_t*)0;
+ *fp = (intptr_t*)0;
return new_addr; // bail out
}
@@ -350,9 +350,12 @@ bool os::supports_sse() {
bool os::is_allocatable(size_t bytes) {

30
devel/jdk/1.5/patches/patch-hotspot_src_os_cpu_bsd_i486_vm_thread_bsd_i486_hpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_i486_vm_thread_bsd_i486_hpp,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/os_cpu/bsd_i486/vm/thread_bsd_i486.hpp.orig Thu Jan 19 22:46:01 2006
+++ hotspot/src/os_cpu/bsd_i486/vm/thread_bsd_i486.hpp Thu Jan 19 22:29:18 2006
@@ -21,21 +21,21 @@
public:
// Mutators are highly dangerous....
- jint* last_Java_fp() { return _anchor.last_Java_fp(); }
- void set_last_Java_fp(jint* fp) { _anchor.set_last_Java_fp(fp); }
+ intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
+ void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
- void set_base_of_stack_pointer(jint* base_sp) {}
+ void set_base_of_stack_pointer(intptr_t* base_sp) {}
static ByteSize last_Java_fp_offset() {
return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
}
- jint* base_of_stack_pointer() { return NULL; }
+ intptr_t* base_of_stack_pointer() { return NULL; }
void record_base_of_stack_pointer() {}
// debugging support
static frame current_frame_guess() {
- jint* fp = (*CAST_TO_FN_PTR( jint* (*)(void), StubRoutines::i486::get_previous_fp_entry()))();
+ intptr_t* fp = (*CAST_TO_FN_PTR( intptr_t* (*)(void), StubRoutines::i486::get_previous_fp_entry()))();
// fp points to the frame of the ps stub routine
frame f(NULL, fp, (address)NULL);
RegisterMap map(JavaThread::current(), false);

30
devel/jdk/1.5/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2006/01/22 22:46:31 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig Thu Jan 19 22:57:17 2006
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Thu Jan 19 23:09:39 2006
@@ -42,24 +42,14 @@
# include <sys/procfs.h>
# endif
-#ifdef __OpenBSD__
-// XXX Fix hotspot datatype problems later and remove this hack
-// #include <inttypes.h>
-#define _INTTYPES_H_
-
-/* Machine type dependent parameters. */
-#include <machine/types.h>
-
-typedef int intptr_t;
-typedef unsigned int uintptr_t;
-#else
#if defined(LINUX) || defined(_ALLBSD_SOURCE)
#include <inttypes.h>
#include <signal.h>
+#ifndef __OpenBSD__
#include <ucontext.h>
+#endif
#include <sys/time.h>
#endif // LINUX || _ALLBSD_SOURCE
-#endif
// 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
// When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in

13
devel/jdk/1.5/patches/patch-j2se_src_share_classes_sun_jdbc_odbc_JdbcOdbc_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-j2se_src_share_classes_sun_jdbc_odbc_JdbcOdbc_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/share/classes/sun/jdbc/odbc/JdbcOdbc.c.orig Sat Jan 21 12:06:14 2006
+++ j2se/src/share/classes/sun/jdbc/odbc/JdbcOdbc.c Sat Jan 21 12:07:27 2006
@@ -86,6 +86,9 @@
#include "stdio.h"
#include "sun_jdbc_odbc_JdbcOdbc.h"
+#ifdef _ALLBSD_SOURCE
+#include <string.h>
+#endif
static double buf = 0;
//SDWORD lenValue = SQL_NULL_DATA;

25
devel/jdk/1.5/patches/patch-j2se_src_share_hpi_include_hpi_impl_h Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-j2se_src_share_hpi_include_hpi_impl_h,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/share/hpi/include/hpi_impl.h.orig Fri Jan 20 11:36:05 2006
+++ j2se/src/share/hpi/include/hpi_impl.h Fri Jan 20 11:38:33 2006
@@ -120,21 +120,12 @@ int sysConnect(int fd, struct sockaddr *
int sysBind(int fd, struct sockaddr *him, int len);
int sysAccept(int fd, struct sockaddr *him, int *len);
int sysGetSockName(int fd, struct sockaddr *him, int *len);
-#ifdef _LP64
ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
int tolen);
ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
struct sockaddr *from, int *fromlen);
ssize_t sysRecv(int fd, char *buf, int nBytes, int flags);
ssize_t sysSend(int fd, char *buf, int nBytes, int flags);
-#else
-int sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
- int tolen);
-int sysRecvFrom(int fd, char *buf, int nbytes, int flags,
- struct sockaddr *from, int *fromlen);
-int sysRecv(int fd, char *buf, int nBytes, int flags);
-int sysSend(int fd, char *buf, int nBytes, int flags);
-#endif
int sysListen(int fd, int count);
int sysTimeout(int fd, long timeout);
int sysGetHostName(char* name, int namelen);

11
devel/jdk/1.5/patches/patch-j2se_src_share_native_sun_font_t2k_glyph_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-j2se_src_share_native_sun_font_t2k_glyph_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/share/native/sun/font/t2k/glyph.c.orig Sat Jan 21 12:01:28 2006
+++ j2se/src/share/native/sun/font/t2k/glyph.c Sat Jan 21 12:01:55 2006
@@ -31,6 +31,7 @@
#include "orion.h"
#endif
+#include "util.h"

11
devel/jdk/1.5/patches/patch-j2se_src_solaris_bin_java_md_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-j2se_src_solaris_bin_java_md_h,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/bin/java_md.h.orig Sat Jan 21 10:33:37 2006
+++ j2se/src/solaris/bin/java_md.h Sat Jan 21 10:34:23 2006
@@ -40,6 +40,7 @@
#define Counter2Micros(counts) (counts)
#elif defined(_ALLBSD_SOURCE)
/* CounterGet() is implemented in java_md.c */
+jlong CounterGet(void);
#define Counter2Micros(counts) (counts)
#else
#define CounterGet() (0)

14
devel/jdk/1.5/patches/patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-j2se_src_solaris_hpi_native_threads_src_sys_api_td_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/hpi/native_threads/src/sys_api_td.c.orig Sat Jan 21 09:21:01 2006
+++ j2se/src/solaris/hpi/native_threads/src/sys_api_td.c Sat Jan 21 09:26:52 2006
@@ -21,6 +21,10 @@
#include <sys/ioctl.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/ioctl.h>
+#endif
+
#include <sys/socket.h>
#include <setjmp.h>
#include <signal.h>

16
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-j2se_src_solaris_native_com_sun_security_auth_module_Unix_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/com/sun/security/auth/module/Unix.c.orig Sat Jan 21 12:10:19 2006
+++ j2se/src/solaris/native/com/sun/security/auth/module/Unix.c Sat Jan 21 22:26:46 2006
@@ -18,6 +18,12 @@
#include <stdlib.h>
#include <string.h>
+// hack in the non-thread safe version and fix later.
+#ifdef __OpenBSD__
+#define getpwuid_r(uid, res_buf, pwd_buf, bufsize, result) \
+ (*result = getpwuid(uid))
+#endif
+
JNIEXPORT void JNICALL
Java_com_sun_security_auth_module_UnixSystem_getUnixInfo
(JNIEnv *env, jobject obj) {

11
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_MToolkit_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/sun/awt/awt_MToolkit.c.orig Sat Jan 21 11:58:50 2006
+++ j2se/src/solaris/native/sun/awt/awt_MToolkit.c Sat Jan 21 13:06:02 2006
@@ -47,6 +47,7 @@ extern JavaVM *jvm;
#ifndef HEADLESS
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
extern void statusWindowEventHandler(XEvent event);
+Boolean awt_dnd_process_event(XEvent* event);
#endif
#endif /* !HEADLESS */

21
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_util_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/sun/awt/awt_util.c.orig Sat Jan 21 10:59:00 2006
+++ j2se/src/solaris/native/sun/awt/awt_util.c Sat Jan 21 10:59:06 2006
@@ -585,7 +585,7 @@ awt_WidgetAtXY(Widget root, Position poi
return answer;
}
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#ifdef __linux__
#define MAXARGS 10
@@ -656,7 +656,7 @@ awt_util_getXICStatusAreaWindow(Widget w
return w;
}
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#ifdef __linux__
static XRectangle geometryRect;
XVaNestedList awt_util_getXICStatusAreaList(Widget w)
{

18
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_sun_awt_awt_util_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_util_h,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/sun/awt/awt_util.h.orig Sat Jan 21 11:02:13 2006
+++ j2se/src/solaris/native/sun/awt/awt_util.h Sat Jan 21 11:02:44 2006
@@ -167,9 +167,14 @@ JNU_GetCharField(JNIEnv *env, jobject se
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
#else
+#if defined(_ALLBSD_SOURCE)
int32_t awt_util_getIMStatusHeight(Widget vw);
+Widget awt_util_getXICStatusAreaWindow(Widget w);
+#else
+int32_t awt_util_getIMStatusHeight(Widget vw);
XVaNestedList awt_util_getXICStatusAreaList(Widget w);
Widget awt_util_getXICStatusAreaWindow(Widget w);
+#endif
#endif

12
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_sun_awt_multi_font_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_multi_font_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/sun/awt/multi_font.c.orig Sat Jan 21 11:25:12 2006
+++ j2se/src/solaris/native/sun/awt/multi_font.c Sat Jan 21 11:25:39 2006
@@ -330,7 +330,7 @@ awtJNI_IsMultiFontMetrics(JNIEnv * env,
return JNI_TRUE;
}
#ifndef XAWT
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+#ifdef __linux__
XmString
unicodeXmStringCreate(char* text, char* tag, int len) {
XmString ret_val;

12
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_net_dns_ResolverConfigurationImpl_c,v 1.1 2006/01/22 22:46:31 kurt Exp $
--- j2se/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.orig Sat Jan 21 10:36:15 2006
+++ j2se/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c Sat Jan 21 10:36:46 2006
@@ -15,7 +15,7 @@
#include <strings.h>
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <string.h>
#endif