Skip to content

R
riscv-gcc-1
Commit 7e0c895f by Tom Tromey Committed by Tom Tromey
Options

configure: Rebuilt. 

	* configure: Rebuilt.
	* configure.in (GCJFLAGS): Subst.
	* Makefile.in: Rebuilt.
	* Makefile.am (jv_convert_LDFLAGS): Added -shared-libgcc.
	(gij_LDFLAGS): Likewise.
	(JC1FLAGS): Added GCJFLAGS and removed -g.

From-SVN: r40700
parent 9346c5a7
Showing with 51 additions and 28 deletions
libjava/ChangeLog
2001-03-21 Tom Tromey <tromey@redhat.com> 2001-03-21 Tom Tromey <tromey@redhat.com>
* configure: Rebuilt.
* configure.in (GCJFLAGS): Subst.
* Makefile.in: Rebuilt.
* Makefile.am (jv_convert_LDFLAGS): Added -shared-libgcc.
(gij_LDFLAGS): Likewise.
(JC1FLAGS): Added GCJFLAGS and removed -g.
* java/io/natFileDescriptorPosix.cc (open): Add O_CREAT in * java/io/natFileDescriptorPosix.cc (open): Add O_CREAT in
read/write case. Fixes PR libgcj/2338. read/write case. Fixes PR libgcj/2338.
......
libjava/Makefile.am
...@@ -106,7 +106,7 @@ AM_CFLAGS = @LIBGCJ_CFLAGS@ ...@@ -106,7 +106,7 @@ AM_CFLAGS = @LIBGCJ_CFLAGS@
endif endif
JCFLAGS = -g JCFLAGS = -g
JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
...@@ -416,7 +416,7 @@ EXTRA_jv_convert_SOURCES = $(convert_source_files) ...@@ -416,7 +416,7 @@ 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 $(toolexeclibdir) -rpath $(toolexeclibdir) -shared-libgcc
jv_convert_LINK = $(GCJLINK) jv_convert_LINK = $(GCJLINK)
## 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
...@@ -434,7 +434,7 @@ gij_SOURCES = gij.cc ...@@ -434,7 +434,7 @@ 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 $(toolexeclibdir) gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc
gij_LINK = $(GCJLINK) gij_LINK = $(GCJLINK)
## 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
......
libjava/Makefile.in
...@@ -119,29 +119,43 @@ here = @here@ ...@@ -119,29 +119,43 @@ here = @here@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo AUTOMAKE_OPTIONS = foreign no-installinfo
@TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_TRUE@SUBDIRS = \
@TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @TESTSUBDIR_FALSE@SUBDIRS = \
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @USE_LIBDIR_TRUE@toolexeclibdir = \
@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@XLIB_AWT_FALSE@cond_x_ltlibrary = @USE_LIBDIR_FALSE@toolexeclibdir = \
@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexecdir = \
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@XLIB_AWT_TRUE@cond_x_ltlibrary = \
@XLIB_AWT_TRUE@libgcjx.la
@XLIB_AWT_FALSE@cond_x_ltlibrary = \
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
toolexeclib_DATA = libgcj.spec toolexeclib_DATA = libgcj.spec
data_DATA = libgcj.jar data_DATA = libgcj.jar
@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = @NEEDS_DATA_START_TRUE@libgcjdata.a @NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = \
@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = @NEEDS_DATA_START_TRUE@libgcjdata.c @NEEDS_DATA_START_TRUE@libgcjdata.a
@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = \
@NEEDS_DATA_START_TRUE@libgcjdata.c
@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij @NATIVE_TRUE@bin_PROGRAMS = \
@NATIVE_TRUE@jv-convert gij
bin_SCRIPTS = addr2name.awk bin_SCRIPTS = addr2name.awk
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT) @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT) @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh @CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar
@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) @CANADIAN_FALSE@ZIP = \
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
@CANADIAN_TRUE@GCJH = \
@CANADIAN_TRUE@gcjh
@CANADIAN_FALSE@GCJH = \
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
...@@ -160,11 +174,13 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \ ...@@ -160,11 +174,13 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \
-fdollars-in-identifiers \ -fdollars-in-identifiers \
@LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE
@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @USING_GCC_TRUE@AM_CFLAGS = \
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_FALSE@AM_CFLAGS = \
@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
JCFLAGS = -g JCFLAGS = -g
JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
...@@ -233,14 +249,15 @@ extra_headers = java/lang/Object.h java/lang/Class.h ...@@ -233,14 +249,15 @@ extra_headers = java/lang/Object.h java/lang/Class.h
NM = nm NM = nm
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
CONVERT_DIR = gnu/gcj/convert 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 $(toolexeclibdir) -rpath $(toolexeclibdir) -shared-libgcc
jv_convert_LINK = $(GCJLINK) jv_convert_LINK = $(GCJLINK)
jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \ jv_convert_LDADD = $(convert_source_files:.java=.lo) libgcj.la \
...@@ -251,7 +268,7 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \ ...@@ -251,7 +268,7 @@ jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
gij_SOURCES = gij.cc gij_SOURCES = gij.cc
gij_LDFLAGS = -rpath $(toolexeclibdir) gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc
gij_LINK = $(GCJLINK) gij_LINK = $(GCJLINK)
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
...@@ -2102,7 +2119,7 @@ distdir: $(DISTFILES) ...@@ -2102,7 +2119,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \ cp -pr $$/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
......
libjava/configure.in
...@@ -779,6 +779,8 @@ AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) ...@@ -779,6 +779,8 @@ AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes)
here=`pwd` here=`pwd`
AC_SUBST(here) AC_SUBST(here)
# We get this from the environment.
AC_SUBST(GCJFLAGS)
AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile, AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gnu/classpath/Configuration.java gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then [if test -n "$CONFIG_FILES"; then
......
libjava/gcj/Makefile.in
...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@ ...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FORCELIBGCCSPEC = @FORCELIBGCCSPEC@
GCDEPS = @GCDEPS@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
......
libjava/include/Makefile.in
...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@ ...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FORCELIBGCCSPEC = @FORCELIBGCCSPEC@
GCDEPS = @GCDEPS@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
......
libjava/testsuite/Makefile.in
...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@ ...@@ -76,7 +76,6 @@ DLLTOOL = @DLLTOOL@
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FORCELIBGCCSPEC = @FORCELIBGCCSPEC@
GCDEPS = @GCDEPS@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
......
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