diff options
| author | midipix <writeonce@midipix.org> | 2015-03-15 20:46:36 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2015-03-15 20:46:36 -0400 |
| commit | 607827292053aa25d0f0300add0798dd085a9131 (patch) | |
| tree | e73ffbc6e610091dcc7dc9a5f0379f996d98025c /libjava | |
| parent | 4cdf4f4f006da014238394af84268dad91f6a79d (diff) | |
| download | cbb-gcc-4.6.4-607827292053aa25d0f0300add0798dd085a9131.tar.bz2 cbb-gcc-4.6.4-607827292053aa25d0f0300add0798dd085a9131.tar.xz | |
compiler building blocks: add support for custom build variables.
feature detection: set a fallback value of 'yes' to modern assembler
presence, PE dward support, libc-provided stack protector, and
dynamic-loader header iteration.
signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/Makefile.am | 8 | ||||
| -rw-r--r-- | libjava/Makefile.in | 8 | ||||
| -rwxr-xr-x | libjava/configure | 7 | ||||
| -rw-r--r-- | libjava/configure.ac | 7 |
4 files changed, 28 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 52d099556..5f37b408a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1,5 +1,11 @@ ## Process this file with automake to produce Makefile.in. + +# Compiler Building Blocks variables +cbb_xgcc_for_specs = @cbb_xgcc_for_specs@ +cbb_ldflags_for_target = @cbb_ldflags_for_target@ + + AUTOMAKE_OPTIONS = foreign subdir-objects ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl @@ -332,7 +338,7 @@ lib_gnu_awt_xlib_la_version_dep = $(version_dep) libgcj_bc_la_version_dep = $(version_dep) endif -LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) $(cbb_ldflags_for_target) GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \ $(JC1FLAGS) $(LTLDFLAGS) -o $@ GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index bf5ab9dcd..a87eb7e5a 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -13,6 +13,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + +# Compiler Building Blocks variables +cbb_xgcc_for_specs = @cbb_xgcc_for_specs@ +cbb_ldflags_for_target = @cbb_ldflags_for_target@ + + @SET_MAKE@ @@ -985,7 +991,7 @@ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated @ANONVERSCRIPT_FALSE@libgcj_bc_la_version_dep = $(version_dep) @ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_dep = $(version_dep) @ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_dep = libgcj_bc.ver-sun -LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) $(cbb_ldflags_for_target) GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \ $(JC1FLAGS) $(LTLDFLAGS) -o $@ diff --git a/libjava/configure b/libjava/configure index d66056180..9d5c49dfc 100755 --- a/libjava/configure +++ b/libjava/configure @@ -28151,3 +28151,10 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +# Compiler Building Blocks variables +sed -i -e 's#@cbb_xgcc_for_specs@#'"$cbb_xgcc_for_specs"'#g' \ + -e 's#@cbb_ldflags_for_target@#'"$cbb_ldflags_for_target"'#g' \ + -e 's#@cbb_sysroot_for_libgcc@#'"$cbb_sysroot_for_libgcc"'#g' \ + Makefile || exit 2 + diff --git a/libjava/configure.ac b/libjava/configure.ac index 20dbe9695..22829f232 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -2079,3 +2079,10 @@ fi AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar]) AC_OUTPUT + + +# Compiler Building Blocks variables +sed -i -e 's#@cbb_xgcc_for_specs@#'"$cbb_xgcc_for_specs"'#g' \ + -e 's#@cbb_ldflags_for_target@#'"$cbb_ldflags_for_target"'#g' \ + -e 's#@cbb_sysroot_for_libgcc@#'"$cbb_sysroot_for_libgcc"'#g' \ + Makefile || exit 2 |