Skip to content

R
riscv-gcc-1
Commit 327f2480 by Tom Tromey Committed by Tom Tromey
Options

re GNATS libgcj/220 (build fails with "only absolute run-paths are allowed" error during linking) 

	Fix for PR libgcj/220:
	* Makefile.in: Rebuilt.
	* Makefile.am (gij_LDFLAGS): Don't use libstdc++.
	(jv_convert_LDFLAGS): Likewise.
	(libgcj_la_LDFLAGS): Likewise.
	(GCJLINK): New macro.
	(jv_convert_LINK): Use it.
	(gij_LINK): Likewise.
	(libgcj_la_LINK): New macro.
	(libgcjawt_la_LINK): Likewise.

From-SVN: r33706
parent ad3958e7
Showing with 78 additions and 33 deletions
libjava/ChangeLog
2000-05-05 Tom Tromey <tromey@cygnus.com>
Fix for PR libgcj/220:
* Makefile.in: Rebuilt.
* Makefile.am (gij_LDFLAGS): Don't use libstdc++.
(jv_convert_LDFLAGS): Likewise.
(libgcj_la_LDFLAGS): Likewise.
(GCJLINK): New macro.
(jv_convert_LINK): Use it.
(gij_LINK): Likewise.
(libgcj_la_LINK): New macro.
(libgcjawt_la_LINK): Likewise.
2000-05-04 Tom Tromey <tromey@cygnus.com> 2000-05-04 Tom Tromey <tromey@cygnus.com>
* gcj/field.h (JvFieldIsRef): Return false for gnu.gcj.RawData * gcj/field.h (JvFieldIsRef): Return false for gnu.gcj.RawData
......
libjava/Makefile.am
...@@ -72,6 +72,7 @@ ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) ...@@ -72,6 +72,7 @@ ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT)
endif # CANADIAN endif # CANADIAN
GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
JAVAC = $(GCJ) -C JAVAC = $(GCJ) -C
...@@ -128,9 +129,10 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ ...@@ -128,9 +129,10 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
$(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
$(THREADOBJS) $(libffi_files) $(LIBLTDL) $(THREADOBJS) $(libffi_files) $(LIBLTDL)
libgcj_la_LDFLAGS = -L../libstdc++ -rpath $(toolexeclibdir) \ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make. ## The mysterious backslash is consumed by make.
-version-info `grep -v '^\#' $(srcdir)/libtool-version` -version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LINK = $(GCJLINK)
libgcjawt_la_SOURCES = ## Nothing libgcjawt_la_SOURCES = ## Nothing
EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files) EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
...@@ -139,6 +141,7 @@ libgcjawt_la_LIBADD = $(awto_files) ...@@ -139,6 +141,7 @@ libgcjawt_la_LIBADD = $(awto_files)
libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \ libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make. ## The mysterious backslash is consumed by make.
-version-info `grep -v '^\#' $(srcdir)/libtool-version` -version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcjawt_la_LINK = $(GCJLINK)
## Make the .class files depend on the .zip file. This seems ## Make the .class files depend on the .zip file. This seems
## backwards, but is right. This doesn't catch all the .class files, ## backwards, but is right. This doesn't catch all the .class files,
...@@ -361,9 +364,8 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files) ...@@ -361,9 +364,8 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files)
## need this because we are explicitly using libtool to link using the ## need this because we are explicitly using libtool to link using the
## `.la' file. ## `.la' file.
jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) -rpath $(toolexeclibdir)
jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ jv_convert_LINK = $(GCJLINK)
-o jv-convert
## We explicitly link in the libraries we need. This way we don't ## We explicitly link in the libraries we need. This way we don't
## need -nodefaultlibs, so we can still rely on gcj picking up the ## need -nodefaultlibs, so we can still rely on gcj picking up the
## system libraries we need (via the specs file). ## system libraries we need (via the specs file).
...@@ -380,9 +382,8 @@ gij_SOURCES = gij.cc ...@@ -380,9 +382,8 @@ gij_SOURCES = gij.cc
## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We
## need this because we are explicitly using libtool to link using the ## need this because we are explicitly using libtool to link using the
## `.la' file. ## `.la' file.
gij_LDFLAGS = -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) gij_LDFLAGS = -rpath $(toolexeclibdir)
gij_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ gij_LINK = $(GCJLINK)
-o gij
## We explicitly link in the libraries we need. This way we don't ## We explicitly link in the libraries we need. This way we don't
## need -nodefaultlibs, so we can still rely on gcj picking up the ## need -nodefaultlibs, so we can still rely on gcj picking up the
## system libraries we need (via the specs file). ## system libraries we need (via the specs file).
......
libjava/Makefile.in
...@@ -158,6 +158,7 @@ data_DATA = libgcj.zip ...@@ -158,6 +158,7 @@ data_DATA = libgcj.zip
@CANADIAN_FALSE@`cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd` @CANADIAN_FALSE@`cd $(MULTIBUILDTOP)../$(COMPPATH)/gcc && pwd`
GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c
GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
JAVAC = $(GCJ) -C JAVAC = $(GCJ) -C
...@@ -204,9 +205,10 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ ...@@ -204,9 +205,10 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
$(THREADOBJS) $(libffi_files) $(LIBLTDL) $(THREADOBJS) $(libffi_files) $(LIBLTDL)
libgcj_la_LDFLAGS = -L../libstdc++ -rpath $(toolexeclibdir) \ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` -version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LINK = $(GCJLINK)
libgcjawt_la_SOURCES = ## Nothing libgcjawt_la_SOURCES = ## Nothing
EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files) EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files)
...@@ -215,6 +217,7 @@ libgcjawt_la_LIBADD = $(awto_files) ...@@ -215,6 +217,7 @@ libgcjawt_la_LIBADD = $(awto_files)
libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \ libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` -version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcjawt_la_LINK = $(GCJLINK)
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \ MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \
$(awto_files) $(awto_files)
...@@ -240,11 +243,9 @@ CONVERT_DIR = gnu/gcj/convert ...@@ -240,11 +243,9 @@ CONVERT_DIR = gnu/gcj/convert
jv_convert_SOURCES = jv_convert_SOURCES =
EXTRA_jv_convert_SOURCES = $(convert_source_files) EXTRA_jv_convert_SOURCES = $(convert_source_files)
jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) -rpath $(toolexeclibdir)
jv_convert_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \
-o jv-convert
jv_convert_LINK = $(GCJLINK)
jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
$(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
...@@ -253,10 +254,8 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ ...@@ -253,10 +254,8 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
gij_SOURCES = gij.cc gij_SOURCES = gij.cc
gij_LDFLAGS = -rpath `if test -d ../libstdc++; then cd ../libstdc++; pwd; fi` -rpath $(toolexeclibdir) gij_LDFLAGS = -rpath $(toolexeclibdir)
gij_LINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) \ gij_LINK = $(GCJLINK)
-o gij
gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs gij_LDADD = libgcj.la $(GCLIBS) $(THREADLIBS) $(ZLIBS) -L$(here)/.libs
gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec gij_DEPENDENCIES = $(GCDEPS) $(THREADDEPS) $(ZDEPS) libgcj.la libgcj.spec
...@@ -842,8 +841,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ...@@ -842,8 +841,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DATA = $(data_DATA) $(toolexeclib_DATA) DATA = $(data_DATA) $(toolexeclib_DATA)
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
THANKS acinclude.m4 aclocal.m4 configure configure.in \ THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
libgcj-test.spec.in libgcj.spec.in include/config.h.in include/stamp-h.in libgcj-test.spec.in \
libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
...@@ -1156,6 +1156,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ...@@ -1156,6 +1156,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
include/config.h: include/stamp-h
@if test ! -f $@; then \
rm -f include/stamp-h; \
$(MAKE) include/stamp-h; \
else :; fi
include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
$(SHELL) ./config.status
@echo timestamp > include/stamp-h 2> /dev/null
$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/include/stamp-h.in; \
$(MAKE) $(srcdir)/include/stamp-h.in; \
else :; fi
$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
mostlyclean-hdr:
clean-hdr:
distclean-hdr:
-rm -f include/config.h
maintainer-clean-hdr:
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in
...@@ -1256,10 +1284,10 @@ uninstall-toolexeclibLTLIBRARIES: ...@@ -1256,10 +1284,10 @@ uninstall-toolexeclibLTLIBRARIES:
done done
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
$(CXXLINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS) $(libgcj_la_LINK) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(libgcj_la_OBJECTS) $(libgcj_la_LIBADD) $(LIBS)
libgcjawt.la: $(libgcjawt_la_OBJECTS) $(libgcjawt_la_DEPENDENCIES) libgcjawt.la: $(libgcjawt_la_OBJECTS) $(libgcjawt_la_DEPENDENCIES)
$(LINK) -rpath $(toolexeclibdir) $(libgcjawt_la_LDFLAGS) $(libgcjawt_la_OBJECTS) $(libgcjawt_la_LIBADD) $(LIBS) $(libgcjawt_la_LINK) -rpath $(toolexeclibdir) $(libgcjawt_la_LDFLAGS) $(libgcjawt_la_OBJECTS) $(libgcjawt_la_LIBADD) $(LIBS)
mostlyclean-binPROGRAMS: mostlyclean-binPROGRAMS:
...@@ -1599,31 +1627,33 @@ distclean-generic: ...@@ -1599,31 +1627,33 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]* -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
mostlyclean-am: mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \ mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLIBRARIES \
mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \ mostlyclean-compile mostlyclean-libtool \
mostlyclean-toolexeclibLTLIBRARIES \
mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean-tags mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-recursive mostlyclean: mostlyclean-recursive
clean-am: clean-toolexeclibLIBRARIES clean-compile clean-libtool \ clean-am: clean-hdr clean-toolexeclibLIBRARIES clean-compile \
clean-toolexeclibLTLIBRARIES clean-binPROGRAMS \ clean-libtool clean-toolexeclibLTLIBRARIES \
clean-noinstPROGRAMS clean-tags clean-depend \ clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
clean-generic mostlyclean-am clean-local clean-depend clean-generic mostlyclean-am clean-local
clean: clean-recursive clean: clean-recursive
distclean-am: distclean-toolexeclibLIBRARIES distclean-compile \ distclean-am: distclean-hdr distclean-toolexeclibLIBRARIES \
distclean-libtool distclean-toolexeclibLTLIBRARIES \ distclean-compile distclean-libtool \
distclean-binPROGRAMS distclean-noinstPROGRAMS \ distclean-toolexeclibLTLIBRARIES distclean-binPROGRAMS \
distclean-tags distclean-depend distclean-generic \ distclean-noinstPROGRAMS distclean-tags \
clean-am distclean-depend distclean-generic clean-am
-rm -f libtool -rm -f libtool
distclean: distclean-recursive distclean: distclean-recursive
-rm -f config.status -rm -f config.status
maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ maintainer-clean-am: maintainer-clean-hdr \
maintainer-clean-toolexeclibLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-binPROGRAMS \ maintainer-clean-binPROGRAMS \
...@@ -1636,7 +1666,8 @@ maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ ...@@ -1636,7 +1666,8 @@ maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \
maintainer-clean: maintainer-clean-recursive maintainer-clean: maintainer-clean-recursive
-rm -f config.status -rm -f config.status
.PHONY: mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \ .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \
clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \ clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \
uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \ uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \ mostlyclean-compile distclean-compile clean-compile \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment