PatchSet 7687 Date: 2008/01/18 03:34:11 Author: robilad Branch: HEAD Tag: (none) Log: fixed small discrepancy between boehm-gc and kaffe-gc
2008-01-18 Dalibor Topic <[EMAIL PROTECTED]> * kaffe/kaffevm/boehm-gc/Makefile.am: Make libkaffegc.la a convenience library. Members: ChangeLog:1.5189->1.5190 kaffe/kaffevm/boehm-gc/Makefile.am:1.12->1.13 kaffe/kaffevm/boehm-gc/Makefile.in:1.88->1.89 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5189 kaffe/ChangeLog:1.5190 --- kaffe/ChangeLog:1.5189 Fri Jan 18 03:17:13 2008 +++ kaffe/ChangeLog Fri Jan 18 03:34:11 2008 @@ -1,5 +1,9 @@ 2008-01-18 Dalibor Topic <[EMAIL PROTECTED]> + * kaffe/kaffevm/boehm-gc/Makefile.am: Make libkaffegc.la a convenience library. + +2008-01-18 Dalibor Topic <[EMAIL PROTECTED]> + * config/i386/jit-i386.def: Removed unused nop and unimplemented instructions. Removed ifdef-ed out code. Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.am diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.12 kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.13 --- kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.12 Mon Oct 1 14:51:19 2007 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am Fri Jan 18 03:34:13 2008 @@ -20,12 +20,11 @@ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) -native_LTLIBRARIES = libkaffegc.la +noinst_LTLIBRARIES = libkaffegc.la libkaffegc_la_LDFLAGS = \ $(KVMLIBFLAGS) \ - -export-dynamic \ - -release $(PACKAGE_VERSION) + -export-dynamic libkaffegc_la_SOURCES= \ gc2.c \ Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.88 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.89 --- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.88 Sun Jan 6 19:05:22 2008 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Fri Jan 18 03:34:13 2008 @@ -68,15 +68,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(nativedir)" -nativeLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(native_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) libkaffegc_la_LIBADD = am_libkaffegc_la_OBJECTS = gc2.lo gc-refs.lo gc-kaffe.lo libkaffegc_la_OBJECTS = $(am_libkaffegc_la_OBJECTS) @@ -312,11 +304,10 @@ -I$(top_srcdir)/config/$(Khost_cpu) \ -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) -native_LTLIBRARIES = libkaffegc.la +noinst_LTLIBRARIES = libkaffegc.la libkaffegc_la_LDFLAGS = \ $(KVMLIBFLAGS) \ - -export-dynamic \ - -release $(PACKAGE_VERSION) + -export-dynamic libkaffegc_la_SOURCES = \ gc2.c \ @@ -362,35 +353,17 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-nativeLTLIBRARIES: $(native_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(nativedir)" || $(MKDIR_P) "$(DESTDIR)$(nativedir)" - @list='$(native_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativedir)/$$f'"; \ - $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativedir)/$$f"; \ - else :; fi; \ - done - -uninstall-nativeLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(native_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nativedir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nativedir)/$$p"; \ - done -clean-nativeLTLIBRARIES: - -test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES) - @list='$(native_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done libkaffegc.la: $(libkaffegc_la_OBJECTS) $(libkaffegc_la_DEPENDENCIES) - $(libkaffegc_la_LINK) -rpath $(nativedir) $(libkaffegc_la_OBJECTS) $(libkaffegc_la_LIBADD) $(LIBS) + $(libkaffegc_la_LINK) $(libkaffegc_la_OBJECTS) $(libkaffegc_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -507,9 +480,6 @@ check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(nativedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -536,7 +506,7 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -555,7 +525,7 @@ info-am: -install-data-am: install-nativeLTLIBRARIES +install-data-am: install-dvi: install-dvi-am @@ -591,23 +561,22 @@ ps-am: -uninstall-am: uninstall-nativeLTLIBRARIES +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-nativeLTLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-nativeLTLIBRARIES install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-nativeLTLIBRARIES + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe