changeset in /hg/icedtea6: 2008-06-10 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 7f5d247e2da8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f5d247e2da8
description:
	2008-06-10  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-no-bcopy.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add patch.
	        * Makefile.in: Regenerate.

diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                      |    6 ++++++
Makefile.am                    |    1 +
Makefile.in                    |    3 ++-
patches/icedtea-no-bcopy.patch |   20 ++++++++++++++++++++

diffs (61 lines):

diff -r 931f7730ecf9 -r 7f5d247e2da8 ChangeLog
--- a/ChangeLog	Tue Jun 10 10:13:20 2008 +0200
+++ b/ChangeLog	Tue Jun 10 10:39:13 2008 +0200
@@ -1,3 +1,9 @@ 2008-06-10  Tom Callaway <tcallawa at redha
+2008-06-10  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-no-bcopy.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add patch.
+	* Makefile.in: Regenerate.
+
 2008-06-10  Tom Callaway <tcallawa at redhat.com>
 	    Dennis Gilmore <dennis at ausil.us>
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.am
--- a/Makefile.am	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.am	Tue Jun 10 10:39:13 2008 +0200
@@ -322,6 +322,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch \
 	$(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 931f7730ecf9 -r 7f5d247e2da8 Makefile.in
--- a/Makefile.in	Tue Jun 10 10:13:20 2008 +0200
+++ b/Makefile.in	Tue Jun 10 10:39:13 2008 +0200
@@ -425,7 +425,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-sparc.patch patches/icedtea-sparc64.patch \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
-	patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+	patches/icedtea-override-redirect-metacity.patch \
+	patches/icedtea-no-bcopy.patch $(GCC_PATCH) \
 	$(DISTRIBUTION_PATCHES) $(am__append_7)
 
 # Patch OpenJDK for plug replacements and ecj.
diff -r 931f7730ecf9 -r 7f5d247e2da8 patches/icedtea-no-bcopy.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch	Tue Jun 10 10:39:13 2008 +0200
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~	2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+ 
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro