changeset 1920:d45442addd83

Explicitly compile sun.misc.Unsafe. 2010-02-17 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Remove dead JAXWS and JAXP sourcepaths. Add sun.misc.Unsafe explicitly to ensure it is compiled as a bootstrap class.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 18 Feb 2010 19:31:00 +0000
parents 76296a4bf985
children a47b53c08a6a
files ChangeLog Makefile.am
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 17 23:21:43 2010 +0000
+++ b/ChangeLog	Thu Feb 18 19:31:00 2010 +0000
@@ -1,3 +1,10 @@
+2010-02-17 Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Remove dead JAXWS and JAXP sourcepaths.
+	Add sun.misc.Unsafe explicitly to ensure
+	it is compiled as a bootstrap class.
+
 2010-02-17 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Feb 17 23:21:43 2010 +0000
+++ b/Makefile.am	Thu Feb 18 19:31:00 2010 +0000
@@ -66,7 +66,7 @@
 # FIXME (netx): NetX source directories go here
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA)
 
 ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
 
@@ -87,6 +87,9 @@
 	$(SHARE)/javax/security/auth/kerberos \
 	$(SHARE)/javax/security/sasl
 
+ICEDTEA_BOOTSTRAP_CLASSES = \
+	$(SHARE)/sun/misc/Unsafe.java
+
 # FIXME (javac): Settings for javac go here
 
 # Conditional defintions
@@ -2192,6 +2195,10 @@
 	do \
 	  $(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
 	done
+	for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
+	do \
+	  echo $$files >> $@ ; \
+	done
 
 stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
 	mkdir -p lib/rt