Skip to contentSkip to conversation

Uprev classpath-initial and jamvm-initial

PATCH In review Amy Fong 2 participants 2 messages Dec 9, 2013 – Dec 10, 2013

lore
Share & tools
lore

Amy Fong

author
#0 lore raw

PATCH 1/1 Uprev classpath-initial and jamvm-initial

Note:
1. the segfaults were regularly observed when using gcc versions 4.8.*
2. precompiled glibj.zip not attached to message (too big: 9.5M in size).

From 81f50c8b8873560a687510b91db43d81e135fca6 Mon Sep 17 00:00:00 2001
From: Amy Fong <[email protected]>
Date: Tue, 03 Dec 2013 20:05:22 +0000
Subject: Uprev classpath-initial and jamvm-initial

jamvm-1.4.5 has a lot of memory issues that results in segfaults happening when classpath-native gets configured. We uprev jamvm to 1.5.4, this also requires upreving classpath-initial to 0.98.

Since jikes cannot compile this version of classpath, we provide a precompiled version of glibj.zip. glibj.zip was built from classpath 0.98. using the configure line: ./configure --disable-plugin --disable-Werror config.log is included in recipes-core/classpath/classpath-0.98/

Note: Attempting to use classpath 0.99 resulted in the build hanging
at classpath-native with the following error mesage:

(on openSUSE 12.3)

0: classpath-native-0.99-r6.0 do_compile (pid 21173) *** Error in `jamvm-initial': free(): invalid next size (normal):

    0x000000000151e4d0 ***
*** Error in `jamvm-initial': malloc(): memory corruption:
    0x000000000151e580 ***

---

recipes-core/classpath/classpath-0.98/autotools.patch renamed from dev/null +121 -0
new file mode 100644
index 0000000..7261ecf
@@ -0,0 +1,121 @@
+Backported from classpath-native uprev to 0.99 commit
+ea76b80108b4c292379e37e01cdbb9d984d74759
+
+Signed-off-by: Amy Fong <[email protected]>
+---
+ configure.ac         |    4 ++++
+ examples/Makefile.am |    4 ++--
+ lib/Makefile.am      |   10 +++++-----
+ tools/Makefile.am    |    8 ++++----
+ 4 files changed, 15 insertions(+), 11 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,6 +41,9 @@
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/classpath)
+ 
++AC_PROG_MKDIR_P
++AM_ICONV_LINK
++
+ dnl -----------------------------------------------------------
+ dnl Enable collections.jar (disabled by default)
+ dnl -----------------------------------------------------------
+@@ -381,6 +384,7 @@
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
++AM_PROG_CC_C_O
+ 
+ # Handle -Werror default case.
+ if test "$ENABLE_WERROR" = default; then
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -96,9 +96,9 @@
+ endif
+ 
+ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES)
+-	@mkdir_p@ classes/gnu/classpath/examples/icons
++	$(MKDIR_P) classes/gnu/classpath/examples/icons
+ 	cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
+-	@mkdir_p@ classes/gnu/classpath/examples/swing
++	$(MKDIR_P) classes/gnu/classpath/examples/swing
+ 	cp $(EXAMPLE_HTML) classes/gnu/classpath/examples/swing
+ 	$(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES) 
+ 	(cd classes; \
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -83,18 +83,18 @@
+ resources: copy-vmresources.sh
+ 	@list=`cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print -o -name \*\.css -print`; for p in $$list; do \
+           dirname=`dirname $$p`; \
+-          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
++          if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
+ 	  cp $(top_srcdir)/resource/$$p $$p; \
+ 	done
+ 	@list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \
+           dirname=`dirname $$p`; \
+-          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
++          if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
+ 	  cp $(top_srcdir)/resource/$$p $$p; \
+ 	done
+ 	@$(SHELL) ./copy-vmresources.sh
+ 	@list=`cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print`; for p in $$list; do \
+           dirname=`dirname $$p`; \
+-          if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
++          if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
+ 	  cp $(top_srcdir)/$$p $$p; \
+ 	done
+ 	touch resources
+@@ -102,7 +102,7 @@
+ classes: genclasses
+ 
+ $(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh 
+-	@mkdir_p@ $(top_builddir)/gnu/java/locale
++	$(MKDIR_P) $(top_builddir)/gnu/java/locale
+ 	$(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java
+ 
+ genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser
+@@ -160,7 +160,7 @@
+ 	-rm -rf lists
+ 
+ dist-hook:
+-	@mkdir_p@ $(distdir)
++	$(MKDIR_P) $(distdir)
+ 	cp -pdfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/sun $(top_srcdir)/vm $(top_srcdir)/resource $(distdir)/..
+ # Delete not wanted files.
+ 	$(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../sun $(distdir)/../vm $(distdir)/../resource -name CVS -print | xargs rm -fr
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -312,11 +312,11 @@
+ # so they get also included.
+ $(TOOLS_ZIP): $(ALL_TOOLS_FILES)
+ 	@rm -rf classes asm
+-	@mkdir_p@ classes asm 
++	$(MKDIR_P) classes asm
+ if CREATE_GJDOC
+ if CREATE_GJDOC_PARSER
+ ## Generate antlr sources.
+-	@mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
++	$(MKDIR_P) $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
+ 	$(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr/ \
+ 	  $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
+ endif
+@@ -346,7 +346,7 @@
+ 	       sun/rmi/rmic $(GJDOC_EX) -name \*.properties -print -o -name \*.jav -print`; \
+ 	for p in $$list; do \
+ 	  dirname=classes/`dirname $$p`; \
+-	  if ! test -d "$$dirname"; then @mkdir_p@ "$$dirname"; fi; \
++	  if ! test -d "$$dirname"; then $(MKDIR_P) "$$dirname"; fi; \
+ 	  echo "  cp $(srcdir)/resource/$$p classes/$$p"; \
+ 	  cp $(srcdir)/resource/$$p classes/$$p; \
+ 	done
+@@ -354,7 +354,7 @@
+ ## Copy over gjdoc resource files.
+ 	for res in $(gjdoc_resources); do \
+ 	  dir=classes/`dirname $$res`; \
+-	  if ! test -d "$$dir"; then @mkdir_p@ "$$dir"; fi; \
++	  if ! test -d "$$dir"; then $(MKDIR_P) "$$dir"; fi; \
+ 	  echo "  cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res"; \
+ 	  cp $(srcdir)/resource/gnu/classpath/tools/gjdoc/$$res classes/$$res; \
+ 	done 
recipes-core/classpath/classpath-0.98/config.log renamed from dev/null +3975 -0

2,879 lines not on this page · raw message

recipes-core/classpath/classpath-0.98/fix-gmp.patch renamed from dev/null +23 -0
new file mode 100644
index 0000000..83da24c

Lines of this file are not shown. View the raw message.

recipes-core/classpath/classpath-0.98/glibj.zip renamed from dev/null +0 -0
new file mode 100644
index 0000000..6bf816c

The rest of this diff is not shown. View the raw message.

Binary files differ

recipes-core/classpath/classpath-0.98/miscompilation.patch renamed from dev/null +19 -0
new file mode 100644
index 0000000..7086de3

Lines of this file are not shown. View the raw message.

recipes-core/classpath/classpath-0.98/use_libdir.patch renamed from dev/null +22 -0
new file mode 100644
index 0000000..b8ac3c9

Lines of this file are not shown. View the raw message.

recipes-core/classpath/classpath-initial_0.98.bb renamed from dev/null +47 -0

47 lines not on this page · raw message

recipes-core/jamvm/files/jamvm_1.5.4-initial.patch renamed from dev/null +79 -0

79 lines not on this page · raw message

recipes-core/jamvm/jamvm-initial_1.5.4.bb renamed from dev/null +39 -0
new file mode 100644
index 0000000..d662781

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

--
cgit v0.8.3.5

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 3 lines · Amy Fong

Note:
1. the segfaults were regularly observed when using gcc versions 4.8.*
2. precompiled glibj.zip not attached to message (too big: 9.5M in size).

...

recipes-core/classpath/classpath-0.98/glibj.zip

Quoted 1 line
recipes-core/classpath/classpath-0.98/glibj.zip +0 -0

...

NACK! Store this file somewhere else, not in the repository. This is not need and will make it bigger for no good reason.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750