configure: Regenerated.
2010-11-29 Kai Tietz <kai.tietz@onevision.com>
* configure: Regenerated.
* Makefile.in: Regenerated.
* configure.ac (ACX_NONCANONICAL_TARGET): Call it.
(target_alias): Use AC_SUBST for it.
(GCC_NO_EXECUTABLES): Call it.
(AC_PROG_CC): Improve multilib handling.
Check that gcc is used for compilation.
Use pattern from libssp for symbol versioning checking.
* Makefile.am (LTLDFLAGS): Removed.
(libquadmath_la_LDFLAGS): Add -no-undefined.
(libquadmath_la_LINK): Commented out.
(libquadmath_la_DEPENDENCIES): Add libquadmath_la_LIBADD.
(AM_MAKEFLAGS): Add hack for argument passing by top-level.
(MAKEOVERRIDES): New.
* aclocal.m4: Regenerated.
From-SVN: r167259
This commit is contained in:
Kai Tietz
Kai Tietz
parent
eab1da69ad
commit
fabfcf5e03
|
|
@ -1,3 +1,21 @@
|
|||
2010-11-29 Kai Tietz <kai.tietz@onevision.com>
|
||||
|
||||
* configure: Regenerated.
|
||||
* Makefile.in: Regenerated.
|
||||
* configure.ac (ACX_NONCANONICAL_TARGET): Call it.
|
||||
(target_alias): Use AC_SUBST for it.
|
||||
(GCC_NO_EXECUTABLES): Call it.
|
||||
(AC_PROG_CC): Improve multilib handling.
|
||||
Check that gcc is used for compilation.
|
||||
Use pattern from libssp for symbol versioning checking.
|
||||
* Makefile.am (LTLDFLAGS): Removed.
|
||||
(libquadmath_la_LDFLAGS): Add -no-undefined.
|
||||
(libquadmath_la_LINK): Commented out.
|
||||
(libquadmath_la_DEPENDENCIES): Add libquadmath_la_LIBADD.
|
||||
(AM_MAKEFLAGS): Add hack for argument passing by top-level.
|
||||
(MAKEOVERRIDES): New.
|
||||
* aclocal.m4: Regenerated.
|
||||
|
||||
2010-11-19 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||
|
||||
* Makefile.am (libquadmath_la_LIBADD): Move -lm ...
|
||||
|
|
|
|||
|
|
@ -33,15 +33,11 @@ version_arg =
|
|||
version_dep =
|
||||
endif
|
||||
|
||||
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
|
||||
-no-undefined
|
||||
|
||||
|
||||
toolexeclib_LTLIBRARIES = libquadmath.la
|
||||
libquadmath_la_LIBADD =
|
||||
libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm
|
||||
libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
|
||||
libquadmath_la_DEPENDENCIES = $(version_dep)
|
||||
libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
||||
$(version_arg) -no-undefined -bindir "$(bindir)" -lm
|
||||
libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD)
|
||||
|
||||
include_HEADERS = quadmath.h quadmath_weak.h
|
||||
|
||||
|
|
@ -66,4 +62,46 @@ libquadmath_la_SOURCES = \
|
|||
math/nanq.c math/tgammaq.c math/finiteq.c math/nextafterq.c \
|
||||
math/truncq.c math/floorq.c math/powq.c
|
||||
|
||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
# friends when we are called from the top level Makefile.
|
||||
AM_MAKEFLAGS = \
|
||||
"AR_FLAGS=$(AR_FLAGS)" \
|
||||
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||
"CFLAGS=$(CFLAGS)" \
|
||||
"CXXFLAGS=$(CXXFLAGS)" \
|
||||
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
||||
"INSTALL=$(INSTALL)" \
|
||||
"INSTALL_DATA=$(INSTALL_DATA)" \
|
||||
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||
"JC1FLAGS=$(JC1FLAGS)" \
|
||||
"LDFLAGS=$(LDFLAGS)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||
"MAKE=$(MAKE)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"includedir=$(includedir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"CC=$(CC)" \
|
||||
"CXX=$(CXX)" \
|
||||
"LD=$(LD)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"NM=$(NM)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"RANLIB=$(RANLIB)" \
|
||||
"DESTDIR=$(DESTDIR)"
|
||||
|
||||
MAKEOVERRIDES=
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -43,14 +43,15 @@ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
|||
$(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
|
||||
$(srcdir)/../depcomp $(am__include_HEADERS_DIST)
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/depstand.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
|
|
@ -122,6 +123,9 @@ am__dirstamp = $(am__leading_dot)dirstamp
|
|||
@BUILD_LIBQUADMATH_TRUE@ math/truncq.lo math/floorq.lo \
|
||||
@BUILD_LIBQUADMATH_TRUE@ math/powq.lo
|
||||
libquadmath_la_OBJECTS = $(am_libquadmath_la_OBJECTS)
|
||||
libquadmath_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(libquadmath_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@BUILD_LIBQUADMATH_TRUE@am_libquadmath_la_rpath = -rpath \
|
||||
@BUILD_LIBQUADMATH_TRUE@ $(toolexeclibdir)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||
|
|
@ -261,6 +265,7 @@ sysconfdir = @sysconfdir@
|
|||
target = @target@
|
||||
target_alias = @target_alias@
|
||||
target_cpu = @target_cpu@
|
||||
target_noncanonical = @target_noncanonical@
|
||||
target_os = @target_os@
|
||||
target_vendor = @target_vendor@
|
||||
toolexecdir = @toolexecdir@
|
||||
|
|
@ -277,14 +282,12 @@ AUTOMAKE_OPTIONS = 1.8 foreign
|
|||
@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_FALSE@version_dep =
|
||||
@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_GNU_TRUE@@LIBQUAD_USE_SYMVER_TRUE@version_dep = $(srcdir)/quadmath.map
|
||||
@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@version_dep = quadmath.map-sun
|
||||
@BUILD_LIBQUADMATH_TRUE@LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \
|
||||
@BUILD_LIBQUADMATH_TRUE@ -no-undefined
|
||||
|
||||
@BUILD_LIBQUADMATH_TRUE@toolexeclib_LTLIBRARIES = libquadmath.la
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LIBADD =
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep)
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
|
||||
@BUILD_LIBQUADMATH_TRUE@ $(version_arg) -no-undefined -bindir "$(bindir)" -lm
|
||||
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD)
|
||||
@BUILD_LIBQUADMATH_TRUE@include_HEADERS = quadmath.h quadmath_weak.h
|
||||
@BUILD_LIBQUADMATH_TRUE@libquadmath_la_SOURCES = \
|
||||
@BUILD_LIBQUADMATH_TRUE@ gdtoa/arith.h gdtoa/gdtoa_fltrnds.h gdtoa/gd_qnan.h gdtoa/gdtoaimp.h \
|
||||
|
|
@ -307,6 +310,48 @@ AUTOMAKE_OPTIONS = 1.8 foreign
|
|||
@BUILD_LIBQUADMATH_TRUE@ math/nanq.c math/tgammaq.c math/finiteq.c math/nextafterq.c \
|
||||
@BUILD_LIBQUADMATH_TRUE@ math/truncq.c math/floorq.c math/powq.c
|
||||
|
||||
|
||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
# friends when we are called from the top level Makefile.
|
||||
@BUILD_LIBQUADMATH_TRUE@AM_MAKEFLAGS = \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "AR_FLAGS=$(AR_FLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CFLAGS=$(CFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CXXFLAGS=$(CXXFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "INSTALL=$(INSTALL)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "INSTALL_DATA=$(INSTALL_DATA)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "JC1FLAGS=$(JC1FLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "LDFLAGS=$(LDFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "MAKE=$(MAKE)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "PICFLAG=$(PICFLAG)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "SHELL=$(SHELL)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "exec_prefix=$(exec_prefix)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "infodir=$(infodir)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "libdir=$(libdir)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "prefix=$(prefix)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "includedir=$(includedir)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "AR=$(AR)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "AS=$(AS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CC=$(CC)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "CXX=$(CXX)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "LD=$(LD)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "NM=$(NM)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "PICFLAG=$(PICFLAG)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "RANLIB=$(RANLIB)" \
|
||||
@BUILD_LIBQUADMATH_TRUE@ "DESTDIR=$(DESTDIR)"
|
||||
|
||||
@BUILD_LIBQUADMATH_TRUE@MAKEOVERRIDES =
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
|
|
|
|||
|
|
@ -1003,12 +1003,14 @@ AC_SUBST([am__tar])
|
|||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
m4_include([../config/depstand.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
m4_include([../ltversion.m4])
|
||||
m4_include([../lt~obsolete.m4])
|
||||
m4_include([../config/acx.m4])
|
||||
m4_include([../config/depstand.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/no-executables.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([acinclude.m4])
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -21,13 +21,13 @@ AC_CONFIG_HEADER(config.h)
|
|||
# Do not delete or change the following two lines. For why, see
|
||||
# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html
|
||||
AC_CANONICAL_SYSTEM
|
||||
ACX_NONCANONICAL_TARGET
|
||||
|
||||
target_alias=${target_alias-$host_alias}
|
||||
AC_SUBST(target_alias)
|
||||
|
||||
AM_INIT_AUTOMAKE([1.9.0 foreign subdir-objects no-dist -Wall -Werror])
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
|
||||
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
||||
AC_ARG_ENABLE(version-specific-runtime-libs,
|
||||
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
|
||||
|
|
@ -39,6 +39,7 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
|
|||
[version_specific_libs=no])
|
||||
AC_MSG_RESULT($version_specific_libs)
|
||||
|
||||
GCC_NO_EXECUTABLES
|
||||
|
||||
# Configure libtool
|
||||
AM_PROG_LIBTOOL
|
||||
|
|
@ -48,6 +49,26 @@ AC_SUBST(enable_static)
|
|||
AM_MAINTAINER_MODE
|
||||
AM_ENABLE_MULTILIB(, ..)
|
||||
|
||||
AC_LANG_C
|
||||
# The same as in boehm-gc and libstdc++. Have to borrow it from there.
|
||||
# We must force CC to /not/ be precious variables; otherwise
|
||||
# the wrong, non-multilib-adjusted value will be used in multilibs.
|
||||
# As a side effect, we have to subst CFLAGS ourselves.
|
||||
|
||||
m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
|
||||
m4_define([_AC_ARG_VAR_PRECIOUS],[])
|
||||
AC_PROG_CC
|
||||
m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
|
||||
AM_PROG_CC_C_O
|
||||
|
||||
if test "x$GCC" != "xyes"; then
|
||||
AC_MSG_ERROR([libquadmath must be built with GCC])
|
||||
fi
|
||||
AC_PROG_CPP
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
|
|
@ -83,30 +104,36 @@ AC_CHECK_LIB([m],[cbrtl],[AC_DEFINE([HAVE_CBRTL],[1],[libm includes cbrtl])])
|
|||
|
||||
# Check for symbol versioning (copied from libssp).
|
||||
AC_MSG_CHECKING([whether symbol versioning is supported])
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
|
||||
cat > conftest.map <<EOF
|
||||
if test x$gcc_no_link = xyes; then
|
||||
# If we cannot link, we cannot build shared libraries, so do not use
|
||||
# symbol versioning.
|
||||
quadmath_use_symver=no
|
||||
else
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
|
||||
cat > conftest.map <<EOF
|
||||
FOO_1.0 {
|
||||
global: *foo*; bar; local: *;
|
||||
};
|
||||
EOF
|
||||
AC_TRY_LINK([int foo;],[],[quadmath_use_symver=gnu],[quadmath_use_symver=no])
|
||||
if test x$quadmath_use_symver = xno; then
|
||||
case "$target_os" in
|
||||
solaris2*)
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
|
||||
# Sun ld cannot handle wildcards and treats all entries as undefined.
|
||||
cat > conftest.map <<EOF
|
||||
AC_TRY_LINK([int foo;],[],[quadmath_use_symver=gnu],[quadmath_use_symver=no])
|
||||
if test x$quadmath_use_symver = xno; then
|
||||
case "$target_os" in
|
||||
solaris2*)
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
|
||||
# Sun ld cannot handle wildcards and treats all entries as undefined.
|
||||
cat > conftest.map <<EOF
|
||||
FOO_1.0 {
|
||||
global: foo; local: *;
|
||||
};
|
||||
EOF
|
||||
AC_TRY_LINK([int foo;],[],[quadmath_use_symver=sun],[quadmath_use_symver=no])
|
||||
;;
|
||||
esac
|
||||
AC_TRY_LINK([int foo;],[],[quadmath_use_symver=sun],[quadmath_use_symver=no])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
fi
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
AC_MSG_RESULT($quadmath_use_symver)
|
||||
AM_CONDITIONAL(LIBQUAD_USE_SYMVER, [test "x$quadmath_use_symver" != xno])
|
||||
AM_CONDITIONAL(LIBQUAD_USE_SYMVER_GNU, [test "x$quadmath_use_symver" = xgnu])
|
||||
|
|
|
|||
Loading…
Reference in New Issue