Skip to content

R
riscv-gcc-1
Commit 32a4595e by Phil Edwards Committed by Phil Edwards
Options

acinclude.m4: Fix minor typo with ctypes... 

2000-05-11  Phil Edwards  <pme@sourceware.cygnus.com>

	* acinclude.m4:  Fix minor typo with ctypes, add more sanity to
	  enable-cxx-flags, and remove GLIBCPP_ENABLE_NAMESPACES altogether.
	* aclocal.m4:  Regenerate.
	* configure.in:  Non-blank arguments break fewer Linuxes.
	* configure:  Regenerate.
	* src/Makefile.am:  Re-order AC_CXXFLAGS components.
	* src/Makefile.in:  Regenerate.

From-SVN: r33859
parent b7976767
Showing with 40 additions and 90 deletions
libstdc++-v3/ChangeLog
2000-05-11 Phil Edwards <pme@sourceware.cygnus.com>
* acinclude.m4: Fix minor typo with ctypes, add more sanity to
enable-cxx-flags, and remove GLIBCPP_ENABLE_NAMESPACES altogether.
* aclocal.m4: Regenerate.
* configure.in: Non-blank arguments break fewer Linuxes.
* configure: Regenerate.
* src/Makefile.am: Re-order AC_CXXFLAGS components.
* src/Makefile.in: Regenerate.
2000-05-10 Benjamin Kosnik <bkoz@redhat.com> 2000-05-10 Benjamin Kosnik <bkoz@redhat.com>
* bits/std_cmath.h: Tweaks. * bits/std_cmath.h: Tweaks.
......
libstdc++-v3/acinclude.m4
...@@ -350,7 +350,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ...@@ -350,7 +350,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no ctype_default=no
else else
ctype_include_dir="config/solaris/solaris2.7" ctype_include_dir="config/solaris/solaris2.7"
AC_MSG_RESULT("solaris2.[6,7]") AC_MSG_RESULT("solaris2.[7,8]")
ctype_default=no ctype_default=no
fi fi
fi fi
...@@ -643,10 +643,12 @@ dnl experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc. ...@@ -643,10 +643,12 @@ dnl experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc.
dnl Somehow this same set of flags must be passed when [re]building dnl Somehow this same set of flags must be passed when [re]building
dnl libgcc. dnl libgcc.
dnl --disable-cxx-flags passes nothing. dnl --disable-cxx-flags passes nothing.
dnl + See <URL:> dnl + See http://sourceware.cygnus.com/ml/libstdc++/2000-q2/msg00131.html
dnl http://sourceware.cygnus.com/ml/libstdc++/2000-q2/msg00284.html
dnl http://sourceware.cygnus.com/ml/libstdc++/2000-q1/msg00035.html
dnl + Usage: GLIBCPP_ENABLE_CXX_FLAGS(default flags) dnl + Usage: GLIBCPP_ENABLE_CXX_FLAGS(default flags)
dnl If "default flags" is an empty string, the effect is the same dnl If "default flags" is an empty string (or "none"), the effect is
dnl as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_ARG_ENABLE(cxx-flags, AC_ARG_ENABLE(cxx-flags,
...@@ -656,11 +658,14 @@ changequote(<<, >>)dnl ...@@ -656,11 +658,14 @@ changequote(<<, >>)dnl
changequote([, ])dnl changequote([, ])dnl
[case "x$enableval" in [case "x$enableval" in
xyes) AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; xyes) AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xno|x) enable_cxx_flags= ;; xno|x) enable_cxx_flags='' ;;
*) enable_cxx_flags="$enableval" ;; *) enable_cxx_flags="$enableval" ;;
esac], esac],
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')dnl enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')dnl
dnl Run through flags (either default or command-line) and set things. dnl Thinko on my part during design. This kludge is the workaround.
if test "$enable_cxx_flags" = "none"; then enable_cxx_flags=''; fi
dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options.
if test -n "$enable_cxx_flags"; then if test -n "$enable_cxx_flags"; then
for f in $enable_cxx_flags; do for f in $enable_cxx_flags; do
case "$f" in case "$f" in
...@@ -677,40 +682,6 @@ AC_SUBST(EXTRA_CXX_FLAGS) ...@@ -677,40 +682,6 @@ AC_SUBST(EXTRA_CXX_FLAGS)
dnl dnl
dnl Check for certain special build configurations.
dnl
dnl GLIBCPP_ENABLE_NAMESPACES
dnl --enable-namespaces sets '-fhonor-std' and
dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
dnl undefined by default in whatever.h.in).
dnl + Eventually, this will go away.
dnl + Usage: GLIBCPP_ENABLE_NAMESPACES[(DEFAULT)]
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
dnl defaults to `no'.
AC_DEFUN(GLIBCPP_ENABLE_NAMESPACES, [dnl
define([GLIBCPP_ENABLE_NAMESPACES_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_ARG_ENABLE(namespaces,
changequote(<<, >>)dnl
<< --enable-namespaces turns on 'std' [default=>>GLIBCPP_ENABLE_NAMESPACES_DEFAULT],
changequote([, ])dnl
[case "$enableval" in
yes) enable_namespaces=yes ;;
no) enable_namespaces=no ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable namespaces]) ;;
esac],
enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
dnl Option parsed, now set things appropriately
case "$enable_namespaces" in
yes) NAMESPACES='-fhonor-std'
;;
no) NAMESPACES='-fno-honor-std'
;;
esac
AC_SUBST(NAMESPACES)
])
dnl
dnl Check for instructions to automatically rebuild libgcc.a. Requires, dnl Check for instructions to automatically rebuild libgcc.a. Requires,
dnl of course, the location of the gcc objdir. Note that if --disable- dnl of course, the location of the gcc objdir. Note that if --disable-
dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op. dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op.
......
libstdc++-v3/aclocal.m4
...@@ -362,7 +362,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [ ...@@ -362,7 +362,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE, [
ctype_default=no ctype_default=no
else else
ctype_include_dir="config/solaris/solaris2.7" ctype_include_dir="config/solaris/solaris2.7"
AC_MSG_RESULT("solaris2.[6,7]") AC_MSG_RESULT("solaris2.[7,8]")
ctype_default=no ctype_default=no
fi fi
fi fi
...@@ -655,10 +655,12 @@ dnl experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc. ...@@ -655,10 +655,12 @@ dnl experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc.
dnl Somehow this same set of flags must be passed when [re]building dnl Somehow this same set of flags must be passed when [re]building
dnl libgcc. dnl libgcc.
dnl --disable-cxx-flags passes nothing. dnl --disable-cxx-flags passes nothing.
dnl + See <URL:> dnl + See http://sourceware.cygnus.com/ml/libstdc++/2000-q2/msg00131.html
dnl http://sourceware.cygnus.com/ml/libstdc++/2000-q2/msg00284.html
dnl http://sourceware.cygnus.com/ml/libstdc++/2000-q1/msg00035.html
dnl + Usage: GLIBCPP_ENABLE_CXX_FLAGS(default flags) dnl + Usage: GLIBCPP_ENABLE_CXX_FLAGS(default flags)
dnl If "default flags" is an empty string, the effect is the same dnl If "default flags" is an empty string (or "none"), the effect is
dnl as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_ARG_ENABLE(cxx-flags, AC_ARG_ENABLE(cxx-flags,
...@@ -668,11 +670,14 @@ changequote(<<, >>)dnl ...@@ -668,11 +670,14 @@ changequote(<<, >>)dnl
changequote([, ])dnl changequote([, ])dnl
[case "x$enableval" in [case "x$enableval" in
xyes) AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; xyes) AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xno|x) enable_cxx_flags= ;; xno|x) enable_cxx_flags='' ;;
*) enable_cxx_flags="$enableval" ;; *) enable_cxx_flags="$enableval" ;;
esac], esac],
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')dnl enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')dnl
dnl Run through flags (either default or command-line) and set things. dnl Thinko on my part during design. This kludge is the workaround.
if test "$enable_cxx_flags" = "none"; then enable_cxx_flags=''; fi
dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options.
if test -n "$enable_cxx_flags"; then if test -n "$enable_cxx_flags"; then
for f in $enable_cxx_flags; do for f in $enable_cxx_flags; do
case "$f" in case "$f" in
...@@ -689,40 +694,6 @@ AC_SUBST(EXTRA_CXX_FLAGS) ...@@ -689,40 +694,6 @@ AC_SUBST(EXTRA_CXX_FLAGS)
dnl dnl
dnl Check for certain special build configurations.
dnl
dnl GLIBCPP_ENABLE_NAMESPACES
dnl --enable-namespaces sets '-fhonor-std' and
dnl --disable-namespaces sets '-fno-honor-std' (the macro should be
dnl undefined by default in whatever.h.in).
dnl + Eventually, this will go away.
dnl + Usage: GLIBCPP_ENABLE_NAMESPACES[(DEFAULT)]
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
dnl defaults to `no'.
AC_DEFUN(GLIBCPP_ENABLE_NAMESPACES, [dnl
define([GLIBCPP_ENABLE_NAMESPACES_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_ARG_ENABLE(namespaces,
changequote(<<, >>)dnl
<< --enable-namespaces turns on 'std' [default=>>GLIBCPP_ENABLE_NAMESPACES_DEFAULT],
changequote([, ])dnl
[case "$enableval" in
yes) enable_namespaces=yes ;;
no) enable_namespaces=no ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable namespaces]) ;;
esac],
enable_namespaces=GLIBCPP_ENABLE_NAMESPACES_DEFAULT)dnl
dnl Option parsed, now set things appropriately
case "$enable_namespaces" in
yes) NAMESPACES='-fhonor-std'
;;
no) NAMESPACES='-fno-honor-std'
;;
esac
AC_SUBST(NAMESPACES)
])
dnl
dnl Check for instructions to automatically rebuild libgcc.a. Requires, dnl Check for instructions to automatically rebuild libgcc.a. Requires,
dnl of course, the location of the gcc objdir. Note that if --disable- dnl of course, the location of the gcc objdir. Note that if --disable-
dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op. dnl namespaces is in effect, rebuilding libgcc.a is an expensive no-op.
......
libstdc++-v3/configure
...@@ -43,7 +43,7 @@ ac_help="$ac_help ...@@ -43,7 +43,7 @@ ac_help="$ac_help
--enable-threads=LIB use LIB thread package for target GCC." --enable-threads=LIB use LIB thread package for target GCC."
ac_help="$ac_help ac_help="$ac_help
--enable-cxx-flags=FLAGS pass compiler FLAGS when building library; --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
[default=]" [default=none]"
# Initialize some variables set by options. # Initialize some variables set by options.
# The variables have the same names as the options, with # The variables have the same names as the options, with
...@@ -2452,19 +2452,19 @@ fi ...@@ -2452,19 +2452,19 @@ fi
#GLIBCPP_ENABLE_NAMESPACES(yes)
#GLIBCPP_ENABLE_RELIBGCC([../..]) #GLIBCPP_ENABLE_RELIBGCC([../..])
# Check whether --enable-cxx-flags or --disable-cxx-flags was given. # Check whether --enable-cxx-flags or --disable-cxx-flags was given.
if test "${enable_cxx_flags+set}" = set; then if test "${enable_cxx_flags+set}" = set; then
enableval="$enable_cxx_flags" enableval="$enable_cxx_flags"
case "x$enableval" in case "x$enableval" in
xyes) { echo "configure: error: --enable-cxx-flags needs compiler flags as arguments" 1>&2; exit 1; } ;; xyes) { echo "configure: error: --enable-cxx-flags needs compiler flags as arguments" 1>&2; exit 1; } ;;
xno|x) enable_cxx_flags= ;; xno|x) enable_cxx_flags='' ;;
*) enable_cxx_flags="$enableval" ;; *) enable_cxx_flags="$enableval" ;;
esac esac
else else
enable_cxx_flags='' enable_cxx_flags='none'
fi fi
if test "$enable_cxx_flags" = "none"; then enable_cxx_flags=''; fi
if test -n "$enable_cxx_flags"; then if test -n "$enable_cxx_flags"; then
for f in $enable_cxx_flags; do for f in $enable_cxx_flags; do
case "$f" in case "$f" in
...@@ -3621,7 +3621,7 @@ cross_compiling=$ac_cv_prog_cc_cross ...@@ -3621,7 +3621,7 @@ cross_compiling=$ac_cv_prog_cc_cross
ctype_default=no ctype_default=no
else else
ctype_include_dir="config/solaris/solaris2.7" ctype_include_dir="config/solaris/solaris2.7"
echo "$ac_t"""solaris2.6,7"" 1>&6 echo "$ac_t"""solaris2.7,8"" 1>&6
ctype_default=no ctype_default=no
fi fi
fi fi
......
libstdc++-v3/configure.in
...@@ -29,9 +29,8 @@ GLIBCPP_ENABLE_DEBUG ...@@ -29,9 +29,8 @@ GLIBCPP_ENABLE_DEBUG
GLIBCPP_ENABLE_CSTDIO GLIBCPP_ENABLE_CSTDIO
GLIBCPP_ENABLE_LONG_LONG GLIBCPP_ENABLE_LONG_LONG
GLIBCPP_ENABLE_THREADS GLIBCPP_ENABLE_THREADS
#GLIBCPP_ENABLE_NAMESPACES(yes)
#GLIBCPP_ENABLE_RELIBGCC([../..]) #GLIBCPP_ENABLE_RELIBGCC([../..])
GLIBCPP_ENABLE_CXX_FLAGS([]) GLIBCPP_ENABLE_CXX_FLAGS([none])
if test -n "$with_cross_host"; then if test -n "$with_cross_host"; then
......
libstdc++-v3/src/Makefile.am
...@@ -42,7 +42,7 @@ WERROR = -Werror ...@@ -42,7 +42,7 @@ WERROR = -Werror
# -fdata-sections -ffunction-sections \ # -fdata-sections -ffunction-sections \
# -fvtable-gc -Wl,--gc-sections # -fvtable-gc -Wl,--gc-sections
# AC_CXXFLAGS = @OPTLEVEL@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ # AC_CXXFLAGS = @OPTLEVEL@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@ AC_CXXFLAGS = @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
AM_CXXFLAGS = -fno-implicit-templates \ AM_CXXFLAGS = -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \ -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
......
libstdc++-v3/src/Makefile.in
...@@ -85,7 +85,6 @@ LIBTOOL = @LIBTOOL@ ...@@ -85,7 +85,6 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NAMESPACES = @NAMESPACES@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OPTLEVEL = @OPTLEVEL@ OPTLEVEL = @OPTLEVEL@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
...@@ -120,7 +119,7 @@ WERROR = -Werror ...@@ -120,7 +119,7 @@ WERROR = -Werror
# -fdata-sections -ffunction-sections \ # -fdata-sections -ffunction-sections \
# -fvtable-gc -Wl,--gc-sections # -fvtable-gc -Wl,--gc-sections
# AC_CXXFLAGS = @OPTLEVEL@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ # AC_CXXFLAGS = @OPTLEVEL@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@ AC_CXXFLAGS = @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
AM_CXXFLAGS = -fno-implicit-templates \ AM_CXXFLAGS = -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \ -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
......
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