Some of the configuration process was imported (and modified) from
the libstc++ edition. However, the variables were not renamed at the
time which leads to some confusion when working with it.
Rename GLIBCXX=>GLIBGM2, libcxx=>libgm2 and libstdcxx=>libgm2.
libgm2/ChangeLog:
* acinclude.m4: Rename configure variables to match the
library.
* configure.ac: Likewise.
* configure.host: Likewise.
* libm2iso/wrapclock.cc: Likewise.
* config.h.in: Regenerate.
* configure: Regenerate.
* Makefile.in: Regenerate.
* libm2cor/Makefile.in: Regenerate.
* libm2iso/Makefile.in: Regenerate.
* libm2log/Makefile.in: Regenerate.
* libm2min/Makefile.in: Regenerate.
* libm2pim/Makefile.in: Regenerate.
Signed-off-by: Iain Sandoe <[email protected]>
---
libgm2/Makefile.in | 6 +-
libgm2/acinclude.m4 | 126 +++++++++++++++++------------------
libgm2/config.h.in | 16 ++---
libgm2/configure | 68 +++++++++----------
libgm2/configure.ac | 12 ++--
libgm2/configure.host | 16 ++---
libgm2/libm2cor/Makefile.in | 6 +-
libgm2/libm2iso/Makefile.in | 6 +-
libgm2/libm2iso/wrapclock.cc | 18 ++---
libgm2/libm2log/Makefile.in | 6 +-
libgm2/libm2min/Makefile.in | 6 +-
libgm2/libm2pim/Makefile.in | 6 +-
12 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in
index 85a240be89a..721e93d2f57 100644
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -204,7 +204,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -277,8 +277,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgm2/acinclude.m4 b/libgm2/acinclude.m4
index c243cecfdeb..d61d8b2aeff 100644
--- a/libgm2/acinclude.m4
+++ b/libgm2/acinclude.m4
@@ -4,20 +4,20 @@ dnl This file was derived from libstdc++-v3/acinclude.m4 and
heavily pruned.
dnl Its purpose is to check for glibc time, gettimeofday and
dnl float128 availability.
dnl
-dnl GLIBCXX_CONDITIONAL (NAME, SHELL-TEST)
+dnl GLIBGM2_CONDITIONAL (NAME, SHELL-TEST)
dnl
dnl Exactly like AM_CONDITIONAL, but delays evaluation of the test until the
dnl end of configure. This lets tested variables be reassigned, and the
dnl conditional will depend on the final state of the variable. For a simple
-dnl example of why this is needed, see GLIBCXX_ENABLE_HOSTED.
+dnl example of why this is needed, see GLIBGM2_ENABLE_HOSTED.
dnl
-m4_define([_m4_divert(glibcxx_diversion)], 8000)dnl
-AC_DEFUN([GLIBCXX_CONDITIONAL], [dnl
- m4_divert_text([glibcxx_diversion],dnl
+m4_define([_m4_divert(glibgm2_diversion)], 8000)dnl
+AC_DEFUN([GLIBGM2_CONDITIONAL], [dnl
+ m4_divert_text([glibgm2_diversion],dnl
AM_CONDITIONAL([$1],[$2])
)dnl
])dnl
-AC_DEFUN([GLIBCXX_EVALUATE_CONDITIONALS],
[m4_undivert([glibcxx_diversion])])dnl
+AC_DEFUN([GLIBGM2_EVALUATE_CONDITIONALS],
[m4_undivert([glibgm2_diversion])])dnl
dnl
@@ -25,8 +25,8 @@ dnl Check to see what architecture and operating system we
are compiling
dnl for. Also, if architecture- or OS-specific flags are required for
dnl compilation, pick them up here.
dnl
-AC_DEFUN([GLIBCXX_CHECK_HOST], [
- . $glibcxx_srcdir/configure.host
+AC_DEFUN([GLIBGM2_CHECK_HOST], [
+ . $glibgm2_srcdir/configure.host
AC_MSG_NOTICE([CPU config directory is $cpu_include_dir])
AC_MSG_NOTICE([OS config directory is $os_include_dir])
])
@@ -39,37 +39,37 @@ dnl
dnl Sets:
dnl SUBDIRS
dnl Substs:
-dnl glibcxx_builddir (absolute path)
-dnl glibcxx_srcdir (absolute path)
+dnl glibgm2_builddir (absolute path)
+dnl glibgm2_srcdir (absolute path)
dnl toplevel_builddir (absolute path)
dnl toplevel_srcdir (absolute path)
dnl with_cross_host
dnl with_newlib
dnl with_target_subdir
dnl plus
-dnl - the variables in GLIBCXX_CHECK_HOST / configure.host
+dnl - the variables in GLIBGM2_CHECK_HOST / configure.host
dnl - default settings for all AM_CONFITIONAL test variables
dnl - lots of tools, like CC and CXX
dnl
-AC_DEFUN([GLIBCXX_CONFIGURE], [
+AC_DEFUN([GLIBGM2_CONFIGURE], [
# Keep these sync'd with the list in Makefile.am. The first provides an
# expandable list at autoconf time; the second provides an expandable list
# (i.e., shell variable) at configure time.
- m4_define([glibcxx_SUBDIRS],[])
- SUBDIRS='glibcxx_SUBDIRS'
+ m4_define([glibgm2_SUBDIRS],[])
+ SUBDIRS='glibgm2_SUBDIRS'
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
- glibcxx_builddir=`${PWDCMD-pwd}`
+ glibgm2_builddir=`${PWDCMD-pwd}`
case $srcdir in
- [\\/$]* | ?:[\\/]*) glibcxx_srcdir=${srcdir} ;;
- *) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+ [\\/$]* | ?:[\\/]*) glibgm2_srcdir=${srcdir} ;;
+ *) glibgm2_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
esac
- toplevel_builddir=${glibcxx_builddir}/..
- toplevel_srcdir=${glibcxx_srcdir}/..
- AC_SUBST(glibcxx_builddir)
- AC_SUBST(glibcxx_srcdir)
+ toplevel_builddir=${glibgm2_builddir}/..
+ toplevel_srcdir=${glibgm2_srcdir}/..
+ AC_SUBST(glibgm2_builddir)
+ AC_SUBST(glibgm2_srcdir)
AC_SUBST(toplevel_builddir)
AC_SUBST(toplevel_srcdir)
@@ -121,12 +121,12 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
# Find platform-specific directories containing configuration info.
# Also possibly modify flags used elsewhere, as needed by the platform.
- GLIBCXX_CHECK_HOST
+ GLIBGM2_CHECK_HOST
])
dnl
-dnl GLIBCXX_ENABLE
+dnl GLIBGM2_ENABLE
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
@@ -134,7 +134,7 @@ dnl
dnl See manual/appendix_porting.html#appendix.porting.build_hacking for
dnl documentation.
dnl
-m4_define([GLIBCXX_ENABLE],[dnl
+m4_define([GLIBGM2_ENABLE],[dnl
m4_define([_g_switch],[--enable-$1])dnl
m4_define([_g_help],[AS_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl
AC_ARG_ENABLE([$1],m4_dquote(_g_help),
@@ -167,29 +167,29 @@ dnl Check for clock_gettime, nanosleep and sched_yield,
used in the
dnl implementation of 20.11.7 [time.clock], and 30.3.2 [thread.thread.this]
dnl in the C++11 standard.
dnl
-dnl --enable-libstdcxx-time
-dnl --enable-libstdcxx-time=yes
+dnl --enable-libgm2-time
+dnl --enable-libgm2-time=yes
dnl checks for the availability of monotonic and realtime clocks,
dnl nanosleep and sched_yield in libc.
-dnl --enable-libstdcxx-time=rt
+dnl --enable-libgm2-time=rt
dnl also searches (and, if needed, links) librt. Note that this is
dnl not always desirable because, in glibc 2.16 and earlier, for
dnl example, in turn it triggers the linking of libpthread too,
dnl which activates locking,
dnl a large overhead for single-thread programs.
-dnl --enable-libstdcxx-time=no
-dnl --disable-libstdcxx-time
+dnl --enable-libgm2-time=no
+dnl --disable-libgm2-time
dnl disables the checks completely
dnl
dnl N.B. Darwin provides nanosleep but doesn't support the whole POSIX
dnl Timers option, so doesn't define _POSIX_TIMERS. Because the test
-dnl below fails Darwin unconditionally defines _GLIBCXX_USE_NANOSLEEP in
-dnl os_defines.h and also defines _GLIBCXX_USE_SCHED_YIELD.
+dnl below fails Darwin unconditionally defines _GLIBGM2_USE_NANOSLEEP in
+dnl os_defines.h and also defines _GLIBGM2_USE_SCHED_YIELD.
dnl
dnl needed
-AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
+AC_DEFUN([GLIBGM2_ENABLE_LIBSTDCXX_TIME], [
- GLIBCXX_ENABLE(libstdcxx-time,auto,[[[=KIND]]],
+ GLIBGM2_ENABLE(libgm2-time,auto,[[[=KIND]]],
[use KIND for check type],
[permit yes|no|rt])
@@ -203,7 +203,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
ac_has_nanosleep=no
ac_has_sched_yield=no
- if test x"$enable_libstdcxx_time" = x"auto"; then
+ if test x"$enable_libgm2_time" = x"auto"; then
case "${target_os}" in
cygwin*)
@@ -264,9 +264,9 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
ac_has_sched_yield=yes
esac
- elif test x"$enable_libstdcxx_time" != x"no"; then
+ elif test x"$enable_libgm2_time" != x"no"; then
- if test x"$enable_libstdcxx_time" = x"rt"; then
+ if test x"$enable_libgm2_time" = x"rt"; then
AC_SEARCH_LIBS(clock_gettime, [rt])
AC_SEARCH_LIBS(nanosleep, [rt])
else
@@ -275,11 +275,11 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
fi
case "$ac_cv_search_clock_gettime" in
- -l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime
+ -l*) GLIBGM2_LIBS=$ac_cv_search_clock_gettime
;;
esac
case "$ac_cv_search_nanosleep" in
- -l*) GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_nanosleep"
+ -l*) GLIBGM2_LIBS="$GLIBGM2_LIBS $ac_cv_search_nanosleep"
;;
esac
@@ -287,8 +287,8 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
case "$ac_cv_search_sched_yield" in
-lrt*)
- if test x"$enable_libstdcxx_time" = x"rt"; then
- GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield"
+ if test x"$enable_libgm2_time" = x"rt"; then
+ GLIBGM2_LIBS="$GLIBGM2_LIBS $ac_cv_search_sched_yield"
ac_has_sched_yield=yes
fi
;;
@@ -354,7 +354,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
]])], [ac_has_clock_gettime_syscall=yes],
[ac_has_clock_gettime_syscall=no])
AC_MSG_RESULT($ac_has_clock_gettime_syscall)
if test x"$ac_has_clock_gettime_syscall" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_CLOCK_GETTIME_SYSCALL, 1,
+ AC_DEFINE(_GLIBGM2_USE_CLOCK_GETTIME_SYSCALL, 1,
[Defined if clock_gettime syscall has monotonic and realtime clock
support. ])
ac_has_clock_monotonic=yes
ac_has_clock_realtime=yes
@@ -384,25 +384,25 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
fi
if test x"$ac_has_clock_monotonic" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1,
+ AC_DEFINE(_GLIBGM2_USE_CLOCK_MONOTONIC, 1,
[ Defined if clock_gettime has monotonic clock support. ])
fi
if test x"$ac_has_clock_realtime" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_CLOCK_REALTIME, 1,
+ AC_DEFINE(_GLIBGM2_USE_CLOCK_REALTIME, 1,
[ Defined if clock_gettime has realtime clock support. ])
fi
if test x"$ac_has_sched_yield" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_SCHED_YIELD, 1,
+ AC_DEFINE(_GLIBGM2_USE_SCHED_YIELD, 1,
[ Defined if sched_yield is available. ])
fi
if test x"$ac_has_nanosleep" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_NANOSLEEP, 1,
+ AC_DEFINE(_GLIBGM2_USE_NANOSLEEP, 1,
[ Defined if nanosleep is available. ])
elif test x"$ac_has_win32_sleep" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_WIN32_SLEEP, 1,
+ AC_DEFINE(_GLIBGM2_USE_WIN32_SLEEP, 1,
[Defined if Sleep exists.])
else
AC_MSG_CHECKING([for sleep])
@@ -425,10 +425,10 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
fi
if test x"$ac_has_nanosleep$ac_has_win32_sleep$ac_has_sleep" = x"nonono";
then
- AC_DEFINE(_GLIBCXX_NO_SLEEP,1, [Defined if no way to sleep is available.])
+ AC_DEFINE(_GLIBGM2_NO_SLEEP,1, [Defined if no way to sleep is available.])
fi
- AC_SUBST(GLIBCXX_LIBS)
+ AC_SUBST(GLIBGM2_LIBS)
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
@@ -440,7 +440,7 @@ dnl Check for gettimeofday, used in the implementation of
20.11.7
dnl [time.clock] in the C++11 standard.
dnl
dnl needed
-AC_DEFUN([GLIBCXX_CHECK_GETTIMEOFDAY], [
+AC_DEFUN([GLIBGM2_CHECK_GETTIMEOFDAY], [
AC_MSG_CHECKING([for gettimeofday])
@@ -460,7 +460,7 @@ AC_DEFUN([GLIBCXX_CHECK_GETTIMEOFDAY], [
fi
if test x"$ac_has_gettimeofday" = x"yes"; then
- AC_DEFINE(_GLIBCXX_USE_GETTIMEOFDAY, 1,
+ AC_DEFINE(_GLIBGM2_USE_GETTIMEOFDAY, 1,
[ Defined if gettimeofday is available. ])
fi
@@ -474,8 +474,8 @@ dnl a subdirectory of config/locale.
dnl
dnl Default is generic.
dnl
-AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
- GLIBCXX_ENABLE(clocale,auto,[[[=MODEL]]],
+AC_DEFUN([GLIBGM2_ENABLE_CLOCALE], [
+ GLIBGM2_ENABLE(clocale,auto,[[[=MODEL]]],
[use MODEL for target locale package],
[permit generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto])
@@ -525,10 +525,10 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
# Sanity check model, and test for special functionality.
if test $enable_clocale_flag = gnu; then
- AC_EGREP_CPP([_GLIBCXX_ok], [
+ AC_EGREP_CPP([_GLIBGM2_ok], [
#include <features.h>
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) &&
!defined(__UCLIBC__)
- _GLIBCXX_ok
+ _GLIBGM2_ok
#endif
], enable_clocale_flag=gnu, enable_clocale_flag=generic)
@@ -649,11 +649,11 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
fi
# Export the build objects.
for ling in $ALL_LINGUAS; do \
- glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
- glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
+ glibgm2_MOFILES="$glibgm2_MOFILES $ling.mo"; \
+ glibgm2_POFILES="$glibgm2_POFILES $ling.po"; \
done
- AC_SUBST(glibcxx_MOFILES)
- AC_SUBST(glibcxx_POFILES)
+ AC_SUBST(glibgm2_MOFILES)
+ AC_SUBST(glibgm2_POFILES)
CLOCALE_H=config/locale/gnu/c_locale.h
CLOCALE_CC=config/locale/gnu/c_locale.cc
@@ -704,8 +704,8 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
# This is where the testsuite looks for locale catalogs, using the
# -DLOCALEDIR define during testsuite compilation.
- glibcxx_localedir=${glibcxx_builddir}/po/share/locale
- AC_SUBST(glibcxx_localedir)
+ glibgm2_localedir=${glibgm2_builddir}/po/share/locale
+ AC_SUBST(glibgm2_localedir)
# A standalone libintl (e.g., GNU libintl) may be in use.
if test $USE_NLS = yes; then
@@ -713,7 +713,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
fi
if test $USE_NLS = yes; then
- AC_DEFINE(_GLIBCXX_USE_NLS, 1,
+ AC_DEFINE(_GLIBGM2_USE_NLS, 1,
[Define if NLS translations are to be used.])
fi
@@ -741,7 +741,7 @@ dnl
dnl Defines:
dnl ENABLE_FLOAT128
dnl
-AC_DEFUN([GLIBCXX_ENABLE_FLOAT128], [
+AC_DEFUN([GLIBGM2_ENABLE_FLOAT128], [
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -772,7 +772,7 @@ EOF
enable_float128=no
fi
AC_MSG_RESULT($enable_float128)
- GLIBCXX_CONDITIONAL(ENABLE_FLOAT128, test $enable_float128 = yes)
+ GLIBGM2_CONDITIONAL(ENABLE_FLOAT128, test $enable_float128 = yes)
rm -f conftest*
AC_LANG_RESTORE
diff --git a/libgm2/config.h.in b/libgm2/config.h.in
index f9710ffde8a..e124066598f 100644
--- a/libgm2/config.h.in
+++ b/libgm2/config.h.in
@@ -417,29 +417,29 @@
#undef WE_HAVE_STRUCT_TM_YEAR
/* Defined if no way to sleep is available. */
-#undef _GLIBCXX_NO_SLEEP
+#undef _GLIBGM2_NO_SLEEP
/* Defined if clock_gettime syscall has monotonic and realtime clock support.
*/
-#undef _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL
+#undef _GLIBGM2_USE_CLOCK_GETTIME_SYSCALL
/* Defined if clock_gettime has monotonic clock support. */
-#undef _GLIBCXX_USE_CLOCK_MONOTONIC
+#undef _GLIBGM2_USE_CLOCK_MONOTONIC
/* Defined if clock_gettime has realtime clock support. */
-#undef _GLIBCXX_USE_CLOCK_REALTIME
+#undef _GLIBGM2_USE_CLOCK_REALTIME
/* Defined if gettimeofday is available. */
-#undef _GLIBCXX_USE_GETTIMEOFDAY
+#undef _GLIBGM2_USE_GETTIMEOFDAY
/* Defined if nanosleep is available. */
-#undef _GLIBCXX_USE_NANOSLEEP
+#undef _GLIBGM2_USE_NANOSLEEP
/* Defined if sched_yield is available. */
-#undef _GLIBCXX_USE_SCHED_YIELD
+#undef _GLIBGM2_USE_SCHED_YIELD
/* Defined if Sleep exists. */
-#undef _GLIBCXX_USE_WIN32_SLEEP
+#undef _GLIBGM2_USE_WIN32_SLEEP
/* Define to 1 if on MINIX. */
#undef _MINIX
diff --git a/libgm2/configure b/libgm2/configure
index 283b44f8d9b..d6a4e70aac4 100755
--- a/libgm2/configure
+++ b/libgm2/configure
@@ -725,7 +725,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-GLIBCXX_LIBS
+GLIBGM2_LIBS
CXXCPP
ac_ct_CXX
CXXFLAGS
@@ -739,8 +739,8 @@ AS
LN_S
toplevel_srcdir
toplevel_builddir
-glibcxx_srcdir
-glibcxx_builddir
+glibgm2_srcdir
+glibgm2_builddir
target_os
target_vendor
target_cpu
@@ -811,7 +811,7 @@ with_target_subdir
with_cross_host
with_newlib
enable_maintainer_mode
-enable_libstdcxx_time
+enable_libgm2_time
enable_dependency_tracking
enable_silent_rules
with_build_libsubdir
@@ -1463,7 +1463,7 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-libstdcxx-time[=KIND]
+ --enable-libgm2-time[=KIND]
use KIND for check type [default=auto]
--enable-dependency-tracking
do not reject slow dependency extractors
@@ -4274,7 +4274,7 @@ target_alias=${target_alias-$host_alias}
if test "$build" != "$host"; then
# We are being configured with some form of cross compiler.
- GLIBCXX_IS_NATIVE=false
+ GLIBGM2_IS_NATIVE=false
case "$host","$target" in
# Darwin crosses can use the host system's libraries and headers,
# because of the fat library support. Of course, it must be the
@@ -4285,7 +4285,7 @@ if test "$build" != "$host"; then
hostos=`echo $host | sed 's/.*-darwin/darwin/'`
targetos=`echo $target | sed 's/.*-darwin/darwin/'`
if test $hostos = $targetos || test $targetos = darwin ; then
- GLIBCXX_IS_NATIVE=true
+ GLIBGM2_IS_NATIVE=true
fi
;;
@@ -4294,7 +4294,7 @@ if test "$build" != "$host"; then
;;
esac
else
- GLIBCXX_IS_NATIVE=true
+ GLIBGM2_IS_NATIVE=true
fi
# Runs configure.host, and assorted other critical bits. Sets
@@ -4309,13 +4309,13 @@ fi
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
- glibcxx_builddir=`${PWDCMD-pwd}`
+ glibgm2_builddir=`${PWDCMD-pwd}`
case $srcdir in
- \\/$* | ?:\\/*) glibcxx_srcdir=${srcdir} ;;
- *) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+ \\/$* | ?:\\/*) glibgm2_srcdir=${srcdir} ;;
+ *) glibgm2_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
esac
- toplevel_builddir=${glibcxx_builddir}/..
- toplevel_srcdir=${glibcxx_srcdir}/..
+ toplevel_builddir=${glibgm2_builddir}/..
+ toplevel_srcdir=${glibgm2_srcdir}/..
@@ -4706,7 +4706,7 @@ rm -f conftest*
# Find platform-specific directories containing configuration info.
# Also possibly modify flags used elsewhere, as needed by the platform.
- . $glibcxx_srcdir/configure.host
+ . $glibgm2_srcdir/configure.host
{ $as_echo "$as_me:${as_lineno-$LINENO}: CPU config directory is
$cpu_include_dir" >&5
$as_echo "$as_me: CPU config directory is $cpu_include_dir" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: OS config directory is
$os_include_dir" >&5
@@ -5187,7 +5187,7 @@ $as_echo "$ac_has_gettimeofday" >&6; }
if test x"$ac_has_gettimeofday" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_GETTIMEOFDAY 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_GETTIMEOFDAY 1" >>confdefs.h
fi
@@ -5203,16 +5203,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# For clock_gettime, nanosleep and sched_yield support.
- # Check whether --enable-libstdcxx-time was given.
-if test "${enable_libstdcxx_time+set}" = set; then :
- enableval=$enable_libstdcxx_time;
+ # Check whether --enable-libgm2-time was given.
+if test "${enable_libgm2_time+set}" = set; then :
+ enableval=$enable_libgm2_time;
case "$enableval" in
yes|no|rt) ;;
- *) as_fn_error $? "Unknown argument to enable/disable libstdcxx-time"
"$LINENO" 5 ;;
+ *) as_fn_error $? "Unknown argument to enable/disable libgm2-time"
"$LINENO" 5 ;;
esac
else
- enable_libstdcxx_time=auto
+ enable_libgm2_time=auto
fi
@@ -5232,7 +5232,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_has_nanosleep=no
ac_has_sched_yield=no
- if test x"$enable_libstdcxx_time" = x"auto"; then
+ if test x"$enable_libgm2_time" = x"auto"; then
case "${target_os}" in
cygwin*)
@@ -5351,9 +5351,9 @@ fi
ac_has_sched_yield=yes
esac
- elif test x"$enable_libstdcxx_time" != x"no"; then
+ elif test x"$enable_libgm2_time" != x"no"; then
- if test x"$enable_libstdcxx_time" = x"rt"; then
+ if test x"$enable_libgm2_time" = x"rt"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing
clock_gettime" >&5
$as_echo_n "checking for library containing clock_gettime... " >&6; }
if ${ac_cv_search_clock_gettime+:} false; then :
@@ -5486,11 +5486,11 @@ fi
fi
case "$ac_cv_search_clock_gettime" in
- -l*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime
+ -l*) GLIBGM2_LIBS=$ac_cv_search_clock_gettime
;;
esac
case "$ac_cv_search_nanosleep" in
- -l*) GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_nanosleep"
+ -l*) GLIBGM2_LIBS="$GLIBGM2_LIBS $ac_cv_search_nanosleep"
;;
esac
@@ -5556,8 +5556,8 @@ fi
case "$ac_cv_search_sched_yield" in
-lrt*)
- if test x"$enable_libstdcxx_time" = x"rt"; then
- GLIBCXX_LIBS="$GLIBCXX_LIBS $ac_cv_search_sched_yield"
+ if test x"$enable_libgm2_time" = x"rt"; then
+ GLIBGM2_LIBS="$GLIBGM2_LIBS $ac_cv_search_sched_yield"
ac_has_sched_yield=yes
fi
;;
@@ -5713,7 +5713,7 @@ rm -f core conftest.err conftest.$ac_objext
conftest.$ac_ext
$as_echo "$ac_has_clock_gettime_syscall" >&6; }
if test x"$ac_has_clock_gettime_syscall" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_CLOCK_GETTIME_SYSCALL 1" >>confdefs.h
ac_has_clock_monotonic=yes
ac_has_clock_realtime=yes
@@ -5758,29 +5758,29 @@ $as_echo "$ac_timespec_matches_syscall" >&6; }
if test x"$ac_has_clock_monotonic" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_CLOCK_MONOTONIC 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_CLOCK_MONOTONIC 1" >>confdefs.h
fi
if test x"$ac_has_clock_realtime" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_CLOCK_REALTIME 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_CLOCK_REALTIME 1" >>confdefs.h
fi
if test x"$ac_has_sched_yield" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_SCHED_YIELD 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_SCHED_YIELD 1" >>confdefs.h
fi
if test x"$ac_has_nanosleep" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_NANOSLEEP 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_NANOSLEEP 1" >>confdefs.h
elif test x"$ac_has_win32_sleep" = x"yes"; then
-$as_echo "#define _GLIBCXX_USE_WIN32_SLEEP 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_USE_WIN32_SLEEP 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sleep" >&5
@@ -5840,7 +5840,7 @@ $as_echo "$ac_has_usleep" >&6; }
if test x"$ac_has_nanosleep$ac_has_win32_sleep$ac_has_sleep" = x"nonono";
then
-$as_echo "#define _GLIBCXX_NO_SLEEP 1" >>confdefs.h
+$as_echo "#define _GLIBGM2_NO_SLEEP 1" >>confdefs.h
fi
diff --git a/libgm2/configure.ac b/libgm2/configure.ac
index 52a82fff33e..4aac47d8a84 100644
--- a/libgm2/configure.ac
+++ b/libgm2/configure.ac
@@ -44,7 +44,7 @@ AC_SUBST(target_alias)
if test "$build" != "$host"; then
# We are being configured with some form of cross compiler.
- GLIBCXX_IS_NATIVE=false
+ GLIBGM2_IS_NATIVE=false
case "$host","$target" in
# Darwin crosses can use the host system's libraries and headers,
# because of the fat library support. Of course, it must be the
@@ -55,7 +55,7 @@ if test "$build" != "$host"; then
hostos=`echo $host | sed 's/.*-darwin/darwin/'`
targetos=`echo $target | sed 's/.*-darwin/darwin/'`
if test $hostos = $targetos || test $targetos = darwin ; then
- GLIBCXX_IS_NATIVE=true
+ GLIBGM2_IS_NATIVE=true
fi
;;
@@ -64,18 +64,18 @@ if test "$build" != "$host"; then
;;
esac
else
- GLIBCXX_IS_NATIVE=true
+ GLIBGM2_IS_NATIVE=true
fi
# Runs configure.host, and assorted other critical bits. Sets
# up critical shell variables.
-GLIBCXX_CONFIGURE
+GLIBGM2_CONFIGURE
# For gettimeofday support.
-GLIBCXX_CHECK_GETTIMEOFDAY
+GLIBGM2_CHECK_GETTIMEOFDAY
# For clock_gettime, nanosleep and sched_yield support.
-GLIBCXX_ENABLE_LIBSTDCXX_TIME
+GLIBGM2_ENABLE_LIBSTDCXX_TIME
AM_INIT_AUTOMAKE([1.15.1 no-define foreign no-dist -Wall -Wno-portability])
diff --git a/libgm2/configure.host b/libgm2/configure.host
index 3e094da15fe..48aafb6650a 100644
--- a/libgm2/configure.host
+++ b/libgm2/configure.host
@@ -128,7 +128,7 @@ case "${host_cpu}" in
try_cpu=sparc
;;
*)
- if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
+ if test -d ${glibgm2_srcdir}/config/cpu/${host_cpu}; then
try_cpu=${host_cpu}
fi
esac
@@ -170,31 +170,31 @@ esac
# Set specific CPU overrides for atomicity_dir.
-# This can be over-ridden in GLIBCXX_ENABLE_ATOMIC_BUILTINS.
+# This can be over-ridden in GLIBGM2_ENABLE_ATOMIC_BUILTINS.
# THIS TABLE IS SORTED. KEEP IT THAT WAY.
-if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
+if test -f ${glibgm2_srcdir}/config/${cpu_include_dir}/atomicity.h ; then
atomicity_dir=$cpu_include_dir
fi
-if test -f ${glibcxx_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
+if test -f ${glibgm2_srcdir}/config/${cpu_include_dir}/cxxabi_tweaks.h ; then
abi_tweaks_dir=$cpu_include_dir
fi
# Set directory with CPU-specific optimization
cpu_opt_dir=${cpu_include_dir}/opt
-test -d ${glibcxx_srcdir}/config/${cpu_include_dir}/opt ||
+test -d ${glibgm2_srcdir}/config/${cpu_include_dir}/opt ||
cpu_opt_dir=cpu/generic/opt
# For each header with CPU-specific optimizations check whether it
# exists in ${cpu_opt_dir}. If not, point the variable at the
# appropriate file in the generic directory.
cpu_opt_ext_random=${cpu_opt_dir}/ext/opt_random.h
-test -f ${glibcxx_srcdir}/config/${cpu_opt_ext_random} ||
+test -f ${glibgm2_srcdir}/config/${cpu_opt_ext_random} ||
cpu_opt_ext_random=cpu/generic/opt/ext/opt_random.h
cpu_opt_bits_random=${cpu_opt_dir}/bits/opt_random.h
-test -f ${glibcxx_srcdir}/config/${cpu_opt_ext_random} ||
+test -f ${glibgm2_srcdir}/config/${cpu_opt_ext_random} ||
cpu_opt_ext_random=cpu/generic/opt/bits/opt_random.h
@@ -347,7 +347,7 @@ case "${host}" in
else
try_abi_cpu=$try_cpu
fi
- if test -d ${glibcxx_srcdir}/config/abi/post/${try_abi_cpu}-linux-gnu;
then
+ if test -d ${glibgm2_srcdir}/config/abi/post/${try_abi_cpu}-linux-gnu;
then
abi_baseline_pair=${try_abi_cpu}-linux-gnu
fi
esac
diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in
index 23e1e677ae6..3ed34ac3423 100644
--- a/libgm2/libm2cor/Makefile.in
+++ b/libgm2/libm2cor/Makefile.in
@@ -281,7 +281,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -354,8 +354,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index b9ff2d4e3b5..53d353d41ce 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -307,7 +307,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -380,8 +380,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgm2/libm2iso/wrapclock.cc b/libgm2/libm2iso/wrapclock.cc
index 3a770e5f8c5..8bccea16fa0 100644
--- a/libgm2/libm2iso/wrapclock.cc
+++ b/libgm2/libm2iso/wrapclock.cc
@@ -52,13 +52,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
#endif
// Conditional inclusion of sys/time.h for gettimeofday
-#if !defined(_GLIBCXX_USE_CLOCK_MONOTONIC) && \
- !defined(_GLIBCXX_USE_CLOCK_REALTIME) && \
- defined(_GLIBCXX_USE_GETTIMEOFDAY)
+#if !defined(_GLIBGM2_USE_CLOCK_MONOTONIC) && \
+ !defined(_GLIBGM2_USE_CLOCK_REALTIME) && \
+ defined(_GLIBGM2_USE_GETTIMEOFDAY)
#include <sys/time.h>
#endif
-#if defined(_GLIBCXX_USE_CLOCK_GETTIME_SYSCALL)
+#if defined(_GLIBGM2_USE_CLOCK_GETTIME_SYSCALL)
#include <unistd.h>
#include <sys/syscall.h>
#endif
@@ -82,11 +82,11 @@ typedef long long int longint_t;
gettime returns 0 on success and -1 on failure. If the underlying
system does not have gettime then GetTimeRealtime returns 1. */
-#if defined(HAVE_STRUCT_TIMESPEC) && defined(_GLIBCXX_USE_CLOCK_REALTIME)
+#if defined(HAVE_STRUCT_TIMESPEC) && defined(_GLIBGM2_USE_CLOCK_REALTIME)
extern "C" int
EXPORT(GetTimeRealtime) (struct timespec *ts)
{
-#if defined(_GLIBCXX_USE_CLOCK_GETTIME_SYSCALL)
+#if defined(_GLIBGM2_USE_CLOCK_GETTIME_SYSCALL)
return syscall (SYS_clock_gettime, CLOCK_REALTIME, ts);
#else
return clock_gettime (CLOCK_REALTIME, ts);
@@ -118,11 +118,11 @@ EXPORT(GetTimeRealtime) (void *ts)
gettime returns 0 on success and -1 on failure. If the underlying
system does not have gettime then GetTimeRealtime returns 1. */
-#if defined(HAVE_STRUCT_TIMESPEC) && defined(_GLIBCXX_USE_CLOCK_REALTIME)
+#if defined(HAVE_STRUCT_TIMESPEC) && defined(_GLIBGM2_USE_CLOCK_REALTIME)
extern "C" int
EXPORT(SetTimeRealtime) (struct timespec *ts)
{
-#if defined(_GLIBCXX_USE_CLOCK_SETTIME_SYSCALL)
+#if defined(_GLIBGM2_USE_CLOCK_SETTIME_SYSCALL)
return syscall (SYS_clock_settime, CLOCK_REALTIME, ts);
#elif defined(HAVE_CLOCK_SETTIME)
return clock_settime (CLOCK_REALTIME, ts);
@@ -260,7 +260,7 @@ EXPORT(istimezone) (void)
{
#if defined(HAVE_STRUCT_TIMESPEC)
#if defined(HAVE_TM_TM_GMTOFF)
-#if defined(_GLIBCXX_USE_CLOCK_REALTIME)
+#if defined(_GLIBGM2_USE_CLOCK_REALTIME)
return 1;
#endif
#endif
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index ba3a087dea6..ee38fe18800 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -270,7 +270,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -343,8 +343,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index b8b76b205e0..698e74df411 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -260,7 +260,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -333,8 +333,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 5b380a155f2..664cdbb2b8d 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -297,7 +297,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GLIBCXX_LIBS = @GLIBCXX_LIBS@
+GLIBGM2_LIBS = @GLIBGM2_LIBS@
GM2_FOR_TARGET = @GM2_FOR_TARGET@
GREP = @GREP@
INSTALL = @INSTALL@
@@ -370,8 +370,8 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
exec_prefix = @exec_prefix@
get_gcc_base_ver = @get_gcc_base_ver@
-glibcxx_builddir = @glibcxx_builddir@
-glibcxx_srcdir = @glibcxx_srcdir@
+glibgm2_builddir = @glibgm2_builddir@
+glibgm2_srcdir = @glibgm2_srcdir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
--
2.50.1 (Apple Git-155)
