Mercurial > hg > release > icedtea6-1.9

changeset 2054:c4d1a639219e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Sat, 10 Apr 2010 00:49:57 +0100
parents 6761bd85e3b7 (current diff) 1af407faae6d (diff)
children 79cc1edfadb1
files ChangeLog Makefile.am patches/zero/cppInterpreter-fast-bytecodes.patch
diffstat 6 files changed, 96 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Apr 10 00:45:51 2010 +0100
+++ b/ChangeLog	Sat Apr 10 00:49:57 2010 +0100
@@ -1,3 +1,12 @@
+2010-04-09  Xerxes Rånby  <xerxes@zafena.se>
+
+	* Makefile.am (ICEDTEA_PATCHES):
+	Replaced cppInterpreter-fast-bytecodes.patch with
+	6939845.patch from OpenJDK upstream.
+	The new patch are conditionalized for ZERO builds.
+	* patches/zero/6939845.patch: added from upstream.
+	* patches/zero/cppInterpreter-fast-bytecodes.patch: removed.
+
 2010-04-09  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/zero/6903453.patch,
@@ -7,6 +16,29 @@
 	* Makefile.am:
 	Remove patches applied upstream.
 
+2010-04-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	* configure.ac: Move NSS detection to macros
+	in acinclude.m4.
+	* acinclude.m4:
+	(IT_OBTAIN_DEFAULT_LIBDIR): Attempts to discover the
+	system library directory (e.g /usr/lib64)
+	(IT_LOCATE_NSS): Always try and detect NSS
+	and only resort to using the system library directory
+	detection if NSS is not detected.
+
+2010-04-08  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
+	Always install nss.cfg.
+	* configure.ac: Always make nss.cfg a config file, always
+	substitute NSS_LIBDIR.
+
+2010-04-08  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Remove remaining references to
+	rt source directory.
+
 2010-04-07  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/openjdk/6879689-hotspot_warning_fix.patch,
--- a/Makefile.am	Sat Apr 10 00:45:51 2010 +0100
+++ b/Makefile.am	Sat Apr 10 00:49:57 2010 +0100
@@ -224,7 +224,7 @@
 ICEDTEA_FSG_PATCHES =
 
 ICEDTEA_PATCHES = \
-	patches/zero/cppInterpreter-fast-bytecodes.patch \
+	patches/zero/6939845.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
@@ -503,7 +503,7 @@
 # FIXME (distclean): Add jtreg sources
 # FIXME (distclean): Add pulseaudio sources
 
-EXTRA_DIST = rt generated \
+EXTRA_DIST = generated \
 	$(abs_top_srcdir)/patches/* \
 	contrib ports \
 	extra overlays \
@@ -540,7 +540,6 @@
 	rm -rf extra-lib
 	rm -rf openjdk-ecj
 	rm -rf openjdk
-	rm -rf rt/netscape
 	rm -rf visualvm
 	rm -rf netbeans
 
@@ -1299,10 +1298,8 @@
 	cp $(abs_top_builddir)/tapset/jstack.stp \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
 endif
-if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-endif
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
@@ -1391,10 +1388,8 @@
 	cp $(abs_top_builddir)/tapset/jstack.stp \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
 endif
-if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
-endif
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
--- a/acinclude.m4	Sat Apr 10 00:45:51 2010 +0100
+++ b/acinclude.m4	Sat Apr 10 00:49:57 2010 +0100
@@ -1533,3 +1533,43 @@
 fi
 ])
 
+AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR],
+[
+dnl find the system library directory
+AC_CACHE_CHECK([for system library directory], [it_cv_default_libdir],
+[
+if test "x$LDD" = x; then
+  it_cv_default_libdir=/usr/lib
+else
+  AC_LANG_CONFTEST([AC_LANG_PROGRAM([[]], [[]])])
+  $CC conftest.c
+  syslibdir=`$LDD a.out | sed -n '/libc\.so./s,.*=> */\(@<:@^/@:>@*\)/.*,\1,p'`
+  rm -f a.out
+  case x${syslibdir} in
+    xlib|xlib64|xlib32|xlibn32) NSS_LIBDIR=/usr/${syslibdir};;
+    *) it_cv_default_libdir=/usr/lib
+  esac
+fi
+])
+AC_SUBST([DEFAULT_LIBDIR], $it_cv_default_libdir)
+])
+
+AC_DEFUN_ONCE([IT_LOCATE_NSS],
+[
+AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR])
+PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no])
+if test "x${NSS_FOUND}" = xno
+then
+  if test "x${ENABLE_NSS}" = "xyes"
+  then
+    AC_MSG_ERROR([Could not find NSS.  Either install it or configure using --disable-nss.])
+  else
+    AC_MSG_WARN([Could not find NSS; using $DEFAULT_LIBDIR as its location.])
+    NSS_LIBDIR=$DEFAULT_LIBDIR
+  fi
+else
+  NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss`
+fi
+AC_SUBST(NSS_LIBDIR)
+AC_CONFIG_FILES([nss.cfg])
+])
--- a/configure.ac	Sat Apr 10 00:45:51 2010 +0100
+++ b/configure.ac	Sat Apr 10 00:49:57 2010 +0100
@@ -37,6 +37,7 @@
 	AC_MSG_ERROR([Can't find fastjar or jar])
 fi
 AC_SUBST([FASTJAR])
+AC_CHECK_TOOL([LDD], [ldd])
 dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
 dnl check for it explicitly rather than using AC_PROG_AWK.
 FIND_TOOL([GAWK], [gawk])
@@ -407,17 +408,7 @@
   AC_SUBST(LIBPULSE_LIBS)
 fi
 
-if test "x${ENABLE_NSS}" = "xyes"
-then
-  PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no])
-  if test "x${NSS_FOUND}" = xno
-  then
-    AC_MSG_ERROR([Could not find NSS.  Either install it or configure using --disable-nss.])
-  fi
-  NSS_LIBDIR=`$PKG_CONFIG --variable=libdir nss`
-  AC_SUBST(NSS_LIBDIR)
-  AC_CONFIG_FILES([nss.cfg])
-fi
+IT_LOCATE_NSS
 
 if test "x${ZERO_BUILD_TRUE}" = x || test "x${ADD_ZERO_BUILD_TRUE}" = x; then
   dnl Check for libffi headers and libraries.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6939845.patch	Sat Apr 10 00:49:57 2010 +0100
@@ -0,0 +1,20 @@
+--- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Mar 31 11:55:22 2010
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Wed Mar 31 11:55:22 2010
+@@ -2328,6 +2328,17 @@
+       }
+ 
+       DEFAULT:
++#ifdef ZERO
++          // Some zero configurations use the C++ interpreter as a
++          // fallback interpreter and have support for platform
++          // specific fast bytecodes which aren't supported here, so
++          // redispatch to the equivalent non-fast bytecode when they
++          // are encountered.
++          if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
++              opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
++              goto opcode_switch;
++          }
++#endif
+           fatal2("\t*** Unimplemented opcode: %d = %s\n",
+                  opcode, Bytecodes::name((Bytecodes::Code)opcode));
+           goto finish;
--- a/patches/zero/cppInterpreter-fast-bytecodes.patch	Sat Apr 10 00:45:51 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Index: openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
-===================================================================
---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2010-03-19 10:35:14.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2010-03-19 10:39:01.000000000 +0100
-@@ -2328,6 +2328,10 @@
-       }
- 
-       DEFAULT:
-+         if (Bytecodes::is_defined((Bytecodes::Code)opcode)) {
-+           opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode);
-+           goto opcode_switch;
-+         }
-           fatal2("\t*** Unimplemented opcode: %d = %s\n",
-                  opcode, Bytecodes::name((Bytecodes::Code)opcode));
-           goto finish;