Skip to content

R
riscv-gcc-1
Commit a507baad by David Daney Committed by David Daney
Options

install.texi (disable-libgcj-bc): Document new option. 

2007-12-22  David Daney  <ddaney@avtrex.com>

	* doc/install.texi (disable-libgcj-bc): Document new option.

2007-12-22  David Daney  <ddaney@avtrex.com>

	* scripts/makemake.tcl (emit_bc_rule): Use $(LIBGCJ_BC_FLAGS)
	instead of -findirect-dispatch -fno-indirect-classes.
	* configure.ac (libgcj-bc): New AC_ARG_ENABLE.
	(SUPPRESS_LIBGCJ_BC): New AM_CONDITIONAL.
	* Makefile.am (LIBGCJ_BC_FLAGS): New variable.
	* Makefile.in: Regenerate.
	* include/Makefile.in: Same.
	* testsuite/Makefile.in: Same.
	* configure: Same.
	* gcj/Makefile.in: Same.
	* sources.am: Same.

From-SVN: r131135
parent 4569f0c1
Showing with 58 additions and 9 deletions
gcc/ChangeLog
2007-12-22 David Daney <ddaney@avtrex.com>
* doc/install.texi (disable-libgcj-bc): Document new option.
2007-12-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2007-12-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* pa.c (hppa_legitimize_address): Use INT14_OK_STRICT in mask selection. * pa.c (hppa_legitimize_address): Use INT14_OK_STRICT in mask selection.
gcc/doc/install.texi
...@@ -1554,6 +1554,16 @@ using non-functional stubs for native method implementations. ...@@ -1554,6 +1554,16 @@ using non-functional stubs for native method implementations.
@item --disable-jvmpi @item --disable-jvmpi
Disable JVMPI support. Disable JVMPI support.
@item --disable-libgcj-bc
Disable BC ABI compilation of certain parts of libgcj. By default,
some portions of libgcj are compiled with @option{-findirect-dispatch}
@option{-fno-indirect-classes}. This allows them to be overridden at
runtime.
If @option{--disable-libgcj-bc} is specified, libgcj is built without
these options. This makes it impossible to override portions of
libgcj at runtime, but can make it easier to statically link to libgcj.
@item --with-ecos @item --with-ecos
Enable runtime eCos target support. Enable runtime eCos target support.
......
libjava/ChangeLog
2007-12-22 David Daney <ddaney@avtrex.com>
* scripts/makemake.tcl (emit_bc_rule): Use $(LIBGCJ_BC_FLAGS)
instead of -findirect-dispatch -fno-indirect-classes.
* configure.ac (libgcj-bc): New AC_ARG_ENABLE.
(SUPPRESS_LIBGCJ_BC): New AM_CONDITIONAL.
* Makefile.am (LIBGCJ_BC_FLAGS): New variable.
* Makefile.in: Regenerate.
* include/Makefile.in: Same.
* testsuite/Makefile.in: Same.
* configure: Same.
* gcj/Makefile.in: Same.
* sources.am: Same.
2007-12-17 Jakub Jelinek <jakub@redhat.com> 2007-12-17 Jakub Jelinek <jakub@redhat.com>
* testsuite/Makefile.am (compile-tests): Build * testsuite/Makefile.am (compile-tests): Build
......
libjava/Makefile.am
...@@ -155,6 +155,12 @@ if USING_GCC ...@@ -155,6 +155,12 @@ if USING_GCC
AM_CFLAGS += $(WARNINGS) AM_CFLAGS += $(WARNINGS)
endif endif
if SUPPRESS_LIBGCJ_BC
LIBGCJ_BC_FLAGS =
else
LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
endif
## Extra CFLAGS used for JNI C sources shared with GNU Classpath. ## Extra CFLAGS used for JNI C sources shared with GNU Classpath.
PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
......
libjava/configure.ac
...@@ -514,6 +514,15 @@ AC_ARG_WITH(java-home, ...@@ -514,6 +514,15 @@ AC_ARG_WITH(java-home,
AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME") AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME")
AC_SUBST(JAVA_HOME) AC_SUBST(JAVA_HOME)
suppress_libgcj_bc=no
AC_ARG_ENABLE(libgcj-bc,
AS_HELP_STRING([--enable-libgcj-bc],
[enable(default) or disable BC ABI for portions of libgcj]),
[if test "$enable_libgcj_bc" = "no"; then
suppress_libgcj_bc=yes
fi])
AM_CONDITIONAL(SUPPRESS_LIBGCJ_BC, test "$suppress_libgcj_bc" = "yes")
# What is the native OS API for MinGW? # What is the native OS API for MinGW?
AC_ARG_WITH(win32-nlsapi, AC_ARG_WITH(win32-nlsapi,
AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode], AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode],
......
libjava/gcj/Makefile.in
...@@ -212,6 +212,8 @@ SED = @SED@ ...@@ -212,6 +212,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
SUPPRESS_LIBGCJ_BC_FALSE = @SUPPRESS_LIBGCJ_BC_FALSE@
SUPPRESS_LIBGCJ_BC_TRUE = @SUPPRESS_LIBGCJ_BC_TRUE@
SYSDEP_SOURCES = @SYSDEP_SOURCES@ SYSDEP_SOURCES = @SYSDEP_SOURCES@
SYSTEMSPEC = @SYSTEMSPEC@ SYSTEMSPEC = @SYSTEMSPEC@
SYS_ZLIBS = @SYS_ZLIBS@ SYS_ZLIBS = @SYS_ZLIBS@
......
libjava/include/Makefile.in
...@@ -211,6 +211,8 @@ SED = @SED@ ...@@ -211,6 +211,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
SUPPRESS_LIBGCJ_BC_FALSE = @SUPPRESS_LIBGCJ_BC_FALSE@
SUPPRESS_LIBGCJ_BC_TRUE = @SUPPRESS_LIBGCJ_BC_TRUE@
SYSDEP_SOURCES = @SYSDEP_SOURCES@ SYSDEP_SOURCES = @SYSDEP_SOURCES@
SYSTEMSPEC = @SYSTEMSPEC@ SYSTEMSPEC = @SYSTEMSPEC@
SYS_ZLIBS = @SYS_ZLIBS@ SYS_ZLIBS = @SYS_ZLIBS@
......
libjava/scripts/makemake.tcl
...@@ -317,7 +317,9 @@ proc emit_bc_rule {package} { ...@@ -317,7 +317,9 @@ proc emit_bc_rule {package} {
if {$package_map($package) == "bc"} { if {$package_map($package) == "bc"} {
puts -nonewline "-fjni " puts -nonewline "-fjni "
} }
puts "-findirect-dispatch -fno-indirect-classes -c -o $loname @$tname" # Unless bc is disabled with --disable-libgcj-bc, $(LIBGCJ_BC_FLAGS) is:
# -findirect-dispatch -fno-indirect-classes
puts "\$(LIBGCJ_BC_FLAGS) -c -o $loname @$tname"
puts "\t@rm -f $tname" puts "\t@rm -f $tname"
puts "" puts ""
......
libjava/testsuite/Makefile.in
...@@ -200,6 +200,8 @@ SED = @SED@ ...@@ -200,6 +200,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRIP = @STRIP@ STRIP = @STRIP@
SUPPRESS_LIBGCJ_BC_FALSE = @SUPPRESS_LIBGCJ_BC_FALSE@
SUPPRESS_LIBGCJ_BC_TRUE = @SUPPRESS_LIBGCJ_BC_TRUE@
SYSDEP_SOURCES = @SYSDEP_SOURCES@ SYSDEP_SOURCES = @SYSDEP_SOURCES@
SYSTEMSPEC = @SYSTEMSPEC@ SYSTEMSPEC = @SYSTEMSPEC@
SYS_ZLIBS = @SYS_ZLIBS@ SYS_ZLIBS = @SYS_ZLIBS@
...@@ -237,7 +239,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -237,7 +239,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_AWT_FALSE = @X_AWT_FALSE@ X_AWT_FALSE = @X_AWT_FALSE@
X_AWT_TRUE = @X_AWT_TRUE@ X_AWT_TRUE = @X_AWT_TRUE@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
...@@ -249,9 +250,14 @@ ZIP = @ZIP@ ...@@ -249,9 +250,14 @@ ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -272,11 +278,9 @@ build_os = @build_os@ ...@@ -272,11 +278,9 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_gij_ldflags = @extra_gij_ldflags@
extra_ldflags = @extra_ldflags@ extra_ldflags = @extra_ldflags@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -288,14 +292,12 @@ host_exeext = @host_exeext@ ...@@ -288,14 +292,12 @@ host_exeext = @host_exeext@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@ lt_ECHO = @lt_ECHO@
mandir = @mandir@ mandir = @mandir@
...@@ -303,10 +305,8 @@ mkdir_p = @mkdir_p@ ...@@ -303,10 +305,8 @@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
multi_basedir = @multi_basedir@ multi_basedir = @multi_basedir@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
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