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 /libgomp | |
| 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 'libgomp')
| -rw-r--r-- | libgomp/Makefile.am | 8 | ||||
| -rw-r--r-- | libgomp/Makefile.in | 8 | ||||
| -rwxr-xr-x | libgomp/configure | 7 | ||||
| -rw-r--r-- | libgomp/configure.ac | 7 |
4 files changed, 28 insertions, 2 deletions
diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index c0c91678b..e02db181c 100644 --- a/libgomp/Makefile.am +++ b/libgomp/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@ + + ACLOCAL_AMFLAGS = -I .. -I ../config SUBDIRS = testsuite @@ -68,7 +74,7 @@ if USE_FORTRAN nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod endif -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) $(cbb_ldflags_for_target) LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index b81936ac5..839905cc5 100644 --- a/libgomp/Makefile.in +++ b/libgomp/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@ @@ -320,7 +326,7 @@ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ nodist_noinst_HEADERS = libgomp_f.h nodist_libsubinclude_HEADERS = omp.h @USE_FORTRAN_TRUE@nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) $(cbb_ldflags_for_target) LINK = $(LIBTOOL) --tag CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ diff --git a/libgomp/configure b/libgomp/configure index 6f25c6f5e..fe90917d3 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -19318,3 +19318,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/libgomp/configure.ac b/libgomp/configure.ac index d87ed2932..db0ff8ccc 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -348,3 +348,10 @@ CFLAGS="$save_CFLAGS" AC_CONFIG_FILES(omp.h omp_lib.h omp_lib.f90 libgomp_f.h) AC_CONFIG_FILES(Makefile testsuite/Makefile libgomp.spec) 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 |