Skip to content

R
riscv-gcc-1
Commit 5e53dba6 by Benjamin Kosnik
Options

configure.in: Simplify use of AC_CACHE_SAVE. 


2000-10-29  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in: Simplify use of AC_CACHE_SAVE.  Put linked files
	in $(top_builddir)/include/bits, not $(top_builddir)/bits, to help
	with libgcj build issues and improve consistency with the source
	directory's include directory setup.
	* configure: Regenerate.
	* acinclude.m4: Same here.
	* aclocal.m4: Regenerate.
	* mknumeric_limits (OUT_H): Also change paths here.
	* mkcheck.in (C_DIR): And here.
	* mkc++config (OUT_H): And here.
	* libmath/Makefile.am (INCLUDES): And here.
	* src/Makefile.am (INCLUDES): Change to $(top_builddir)/include.
	* libio/Makefile.am: Ditto.
	* libsupc++/Makefile.am (INCLUDES): Ditto.

From-SVN: r37134
parent 37ab89b9
Showing with 112 additions and 94 deletions
libstdc++-v3/ChangeLog
2000-10-29 Mark Harig <mharig@landmark.com>
* src/Makefile.am: Change logic for include dir options.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am: Ditto.
* libsupc++/Makefile.in: Regenerate.
2000-10-29 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Simplify use of AC_CACHE_SAVE. Put linked files
in $(top_builddir)/include/bits, not $(top_builddir)/bits, to help
with libgcj build issues and improve consistency with the source
directory's include directory setup.
* configure: Regenerate.
* acinclude.m4: Same here.
* aclocal.m4: Regenerate.
* mknumeric_limits (OUT_H): Also change paths here.
* mkcheck.in (C_DIR): And here.
* mkc++config (OUT_H): And here.
* libmath/Makefile.am (INCLUDES): And here.
* src/Makefile.am (INCLUDES): Change to $(top_builddir)/include.
* libio/Makefile.am: Ditto.
* libsupc++/Makefile.am (INCLUDES): Ditto.
2000-10-29 Mark Mitchell <mark@codesourcery.com> 2000-10-29 Mark Mitchell <mark@codesourcery.com>
* config/c_io_libio.cc (basic_file<char>::__basic_file): * config/c_io_libio.cc (basic_file<char>::__basic_file):
...@@ -219,43 +243,6 @@ ...@@ -219,43 +243,6 @@
* include/c_std/bits/std_cstdlib.h: abort, exit comment. * include/c_std/bits/std_cstdlib.h: abort, exit comment.
* include/c_std/stdlib.h: Same here. * include/c_std/stdlib.h: Same here.
2000-10-23 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/21_strings/compare.cc (test01): Add using declarations.
* include/c_std/bits/std_cerrno.h: And here.
* include/c_std/bits/std_cassert.h: Tweaks.
* mkcheck.in: Simplify.
* acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): Simplify.
(GLIBCPP_ENABLE_LONG_LONG): Same.
* aclocal.m4: Regenerate.
* src/Makefile.am (c_shadow_headers): Add features.h,
bits/wrap_features.h.
* src/Makefile.in: Regenerate.
* include/c_std/features.h: New file.
* include/c_std/bits/wrap_features.h (_CPP_WRAP_FEATURES_H): New
file. Need to have c++config.h included before this file so
_ISOC99_SOURCE around.
* include/c_std/sys/cdefs.h: Hack.
* include/c_std/stdlib.h: Same, use c++config.h.
* include/c_std/bits/std_cstdlib.h: Use _GLIBCPP_HAVE_STRTOLD.
* include/c_std/bits/std_cassert.h: Fix.
* include/c_std/bits/std_cerrno.h: Make consistent.
* include/c_std/bits/std_csetjmp.h (setjmp): Unscope global
declaration from ::_C_legacy to _C_legacy.
* include/c_std/bits/std_cstdio.h: same with printf.
* include/c_std/stdio.h: And here.
* include/c_std/bits/std_cstdlib.h: abort, exit comment.
* include/c_std/stdlib.h: Same here.
2000-10-21 Benjamin Kosnik <bkoz@purist.soma.redhat.com> 2000-10-21 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): New macro. * acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): New macro.
......
libstdc++-v3/acinclude.m4
...@@ -821,7 +821,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [ ...@@ -821,7 +821,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [
;; ;;
esac esac
AC_MSG_RESULT($os_include_dir) AC_MSG_RESULT($os_include_dir)
AC_LINK_FILES($os_include_dir/bits/os_defines.h, bits/os_defines.h) AC_LINK_FILES($os_include_dir/bits/os_defines.h, include/bits/os_defines.h)
]) ])
...@@ -972,10 +972,12 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ...@@ -972,10 +972,12 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
AC_MSG_WARN("Using default ctype headers.") AC_MSG_WARN("Using default ctype headers.")
fi fi
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h) AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, bits/ctype_inline.h) include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h,
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h) include/bits/ctype_noninline.h)
]) ])
]) ])
...@@ -1335,7 +1337,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1335,7 +1337,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
exit 1 exit 1
;; ;;
esac esac
AC_LINK_FILES($CSTDIO_H, bits/c++io.h) AC_LINK_FILES($CSTDIO_H, include/bits/c++io.h)
AC_LINK_FILES($CSTDIO_CC, src/c++io.cc) AC_LINK_FILES($CSTDIO_CC, src/c++io.cc)
# 2000-08-04 bkoz hack # 2000-08-04 bkoz hack
...@@ -1409,7 +1411,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ ...@@ -1409,7 +1411,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
esac esac
AC_MSG_RESULT($THREADH) AC_MSG_RESULT($THREADH)
AC_LINK_FILES(config/$THREADH, bits/c++threads.h) AC_LINK_FILES(config/$THREADH, include/bits/c++threads.h)
if test $THREADH != threads-no.h; then if test $THREADH != threads-no.h; then
AC_DEFINE(_GLIBCPP_USE_THREADS) AC_DEFINE(_GLIBCPP_USE_THREADS)
fi fi
...@@ -1436,7 +1438,7 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [ ...@@ -1436,7 +1438,7 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
;; ;;
esac esac
AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h) AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h)
AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, bits/atomicity.h) AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, include/bits/atomicity.h)
]) ])
......
libstdc++-v3/aclocal.m4
...@@ -833,7 +833,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [ ...@@ -833,7 +833,7 @@ AC_DEFUN(GLIBCPP_CHECK_OS, [
;; ;;
esac esac
AC_MSG_RESULT($os_include_dir) AC_MSG_RESULT($os_include_dir)
AC_LINK_FILES($os_include_dir/bits/os_defines.h, bits/os_defines.h) AC_LINK_FILES($os_include_dir/bits/os_defines.h, include/bits/os_defines.h)
]) ])
...@@ -984,10 +984,12 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ...@@ -984,10 +984,12 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
AC_MSG_WARN("Using default ctype headers.") AC_MSG_WARN("Using default ctype headers.")
fi fi
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h) AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, bits/ctype_inline.h) include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h,
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h) include/bits/ctype_noninline.h)
]) ])
]) ])
...@@ -1347,7 +1349,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1347,7 +1349,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
exit 1 exit 1
;; ;;
esac esac
AC_LINK_FILES($CSTDIO_H, bits/c++io.h) AC_LINK_FILES($CSTDIO_H, include/bits/c++io.h)
AC_LINK_FILES($CSTDIO_CC, src/c++io.cc) AC_LINK_FILES($CSTDIO_CC, src/c++io.cc)
# 2000-08-04 bkoz hack # 2000-08-04 bkoz hack
...@@ -1421,7 +1423,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ ...@@ -1421,7 +1423,7 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
esac esac
AC_MSG_RESULT($THREADH) AC_MSG_RESULT($THREADH)
AC_LINK_FILES(config/$THREADH, bits/c++threads.h) AC_LINK_FILES(config/$THREADH, include/bits/c++threads.h)
if test $THREADH != threads-no.h; then if test $THREADH != threads-no.h; then
AC_DEFINE(_GLIBCPP_USE_THREADS) AC_DEFINE(_GLIBCPP_USE_THREADS)
fi fi
...@@ -1448,7 +1450,7 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [ ...@@ -1448,7 +1450,7 @@ AC_DEFUN(GLIBCPP_ENABLE_ATOMICITY, [
;; ;;
esac esac
AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h) AC_MSG_RESULT($ATOMICITYH/bits/atomicity.h)
AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, bits/atomicity.h) AC_LINK_FILES($ATOMICITYH/bits/atomicity.h, include/bits/atomicity.h)
]) ])
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/configure.in
...@@ -29,8 +29,6 @@ GLIBCPP_CHECK_COMPILER_VERSION ...@@ -29,8 +29,6 @@ GLIBCPP_CHECK_COMPILER_VERSION
GLIBCPP_CHECK_CPU GLIBCPP_CHECK_CPU
GLIBCPP_CHECK_OS GLIBCPP_CHECK_OS
AC_CACHE_SAVE
# Enable all the crazy c++ stuff. C_MBCHAR must come early. # Enable all the crazy c++ stuff. C_MBCHAR must come early.
GLIBCPP_ENABLE_DEBUG($USE_MAINTAINER_MODE) GLIBCPP_ENABLE_DEBUG($USE_MAINTAINER_MODE)
GLIBCPP_ENABLE_C_MBCHAR([yes]) GLIBCPP_ENABLE_C_MBCHAR([yes])
...@@ -73,11 +71,12 @@ if test -n "$with_cross_host"; then ...@@ -73,11 +71,12 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_MODF) AC_DEFINE(HAVE_MODF)
ctype_include_dir="config/os/wince" ctype_include_dir="config/os/wince"
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h) AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
bits/ctype_inline.h) include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h) include/bits/ctype_noninline.h)
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
...@@ -95,11 +94,12 @@ if test -n "$with_cross_host"; then ...@@ -95,11 +94,12 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_ISINFF) AC_DEFINE(HAVE_ISINFF)
ctype_include_dir="config/os/newlib" ctype_include_dir="config/os/newlib"
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, bits/ctype_base.h) AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
bits/ctype_inline.h) include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \ AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
bits/ctype_noninline.h) include/bits/ctype_noninline.h)
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
...@@ -129,7 +129,6 @@ else ...@@ -129,7 +129,6 @@ else
GLIBCPP_CHECK_MATH_SUPPORT GLIBCPP_CHECK_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
AC_CACHE_SAVE
GLIBCPP_CHECK_WCHAR_T_SUPPORT GLIBCPP_CHECK_WCHAR_T_SUPPORT
GLIBCPP_CHECK_CTYPE_SUPPORT GLIBCPP_CHECK_CTYPE_SUPPORT
GLIBCPP_CHECK_STDLIB_SUPPORT GLIBCPP_CHECK_STDLIB_SUPPORT
...@@ -143,6 +142,7 @@ AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) ...@@ -143,6 +142,7 @@ AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
AC_CACHE_SAVE
AC_LC_MESSAGES AC_LC_MESSAGES
if test "${multilib}" = "yes"; then if test "${multilib}" = "yes"; then
...@@ -214,6 +214,14 @@ fi ...@@ -214,6 +214,14 @@ fi
GLIBCPP_EXPORT_INCLUDES GLIBCPP_EXPORT_INCLUDES
GLIBCPP_EXPORT_FLAGS GLIBCPP_EXPORT_FLAGS
# This should be done by mkincludedir, but hack around it now.
blddir=`pwd`
echo "checking for $blddir/include"
if test ! -d "$blddir/include"; then
mkdir "$blddir/include"
fi
# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am # NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
# so that multilib installs will end up installed in the correct # so that multilib installs will end up installed in the correct
# place. To work around this not being passed down from config-ml.in # place. To work around this not being passed down from config-ml.in
...@@ -238,7 +246,6 @@ CXX="${CXX}" ...@@ -238,7 +246,6 @@ CXX="${CXX}"
) )
blddir=`pwd`
# Generate bits/c++config.h # Generate bits/c++config.h
# NB: This must be the first generated file as others include it. . . # NB: This must be the first generated file as others include it. . .
AC_OUTPUT_COMMANDS([$srcdir/mkc++config $blddir $srcdir]) AC_OUTPUT_COMMANDS([$srcdir/mkc++config $blddir $srcdir])
...@@ -253,8 +260,6 @@ fi ...@@ -253,8 +260,6 @@ fi
# Sanity checking & User-visible messages. # Sanity checking & User-visible messages.
# Checks down here, otherwise they get scrolled off before # Checks down here, otherwise they get scrolled off before
# the user will notice. # the user will notice.
### warnings removed; none were applicable anymore
# Trying to get more people to read documentation. Possibly remove # Trying to get more people to read documentation. Possibly remove
# check and warn all the time. There is no "informational" AC_MSG_ # check and warn all the time. There is no "informational" AC_MSG_
......
libstdc++-v3/libio/ChangeLog
2000-10-29 Benjamin Kosnik <bkoz@gnu.org>
* Makefile.am (INCLUDES): Change to $(top_builddir)/include.
2000-10-29 Mark Mitchell <mark@codesourcery.com> 2000-10-29 Mark Mitchell <mark@codesourcery.com>
* iofopen.c (_IO_new_fopen): Don't define `_IO_wide_data wd' * iofopen.c (_IO_new_fopen): Don't define `_IO_wide_data wd'
......
libstdc++-v3/libio/Makefile.am
...@@ -36,7 +36,7 @@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ ...@@ -36,7 +36,7 @@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = \
-nostdinc++ \ -nostdinc++ \
-I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) \ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
libio_headers = \ libio_headers = \
......
libstdc++-v3/libio/Makefile.in
...@@ -118,7 +118,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -118,7 +118,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
libio_headers = libio.h libioP.h iolibio.h libio_headers = libio.h libioP.h iolibio.h
......
libstdc++-v3/libmath/Makefile.am
...@@ -59,7 +59,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -59,7 +59,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES) INCLUDES = \
-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include \
$(TOPLEVEL_INCLUDES)
......
libstdc++-v3/libmath/Makefile.in
...@@ -134,7 +134,8 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -134,7 +134,8 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES) INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES)
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -104,12 +104,15 @@ libstdcxx_interface = @libstdcxx_interface@ ...@@ -104,12 +104,15 @@ libstdcxx_interface = @libstdcxx_interface@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version) # Cross compiler and multilib support.
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) # Install a library built with a cross compiler in tooldir, not libdir.
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@ @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias) @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexecdir = $(exec_prefix)/$(target_alias) @USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
# Need this library to both be part of libstdc++.a, and installed # Need this library to both be part of libstdc++.a, and installed
# separately too. # separately too.
...@@ -141,7 +144,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -141,7 +144,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir) INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)/include
headers = cxxabi.h exception new new.h typeinfo headers = cxxabi.h exception new new.h typeinfo
......
libstdc++-v3/mkc++config
...@@ -21,15 +21,19 @@ fi ...@@ -21,15 +21,19 @@ fi
BASE_H="$SRC_DIR/include/bits/c++config" BASE_H="$SRC_DIR/include/bits/c++config"
IN_H="$BUILD_DIR/config.h" IN_H="$BUILD_DIR/config.h"
OUT_H="$BUILD_DIR/bits/c++config.h" OUT_H="$BUILD_DIR/include/bits/c++config.h"
if [ ! -f $IN_H ]; then if [ ! -f $IN_H ]; then
echo "necessary file $IN_H not found, exiting" echo "necessary file $IN_H not found, exiting"
exit 1 exit 1
fi fi
if [ ! -d "$BUILD_DIR/bits" ]; then if [ ! -d "$BUILD_DIR/include" ]; then
mkdir "$BUILD_DIR/bits" mkdir "$BUILD_DIR/include"
fi
if [ ! -d "$BUILD_DIR/include/bits" ]; then
mkdir "$BUILD_DIR/include/bits"
fi fi
......
libstdc++-v3/mkcheck.in
...@@ -57,7 +57,7 @@ fi ...@@ -57,7 +57,7 @@ fi
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
C_DIR="`basename @C_INCLUDE_DIR@`" C_DIR="`basename @C_INCLUDE_DIR@`"
if [ $WHICH != "1" ]; then if [ $WHICH != "1" ]; then
INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \ INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR/include -I$BUILD_DIR/libio \
-I$SRC_DIR/include/std -I$SRC_DIR/include/$C_DIR \ -I$SRC_DIR/include/std -I$SRC_DIR/include/$C_DIR \
-I$SRC_DIR/include -I$SRC_DIR/libsupc++ -I$SRC_DIR/libio \ -I$SRC_DIR/include -I$SRC_DIR/libsupc++ -I$SRC_DIR/libio \
-I$SRC_DIR/testsuite" -I$SRC_DIR/testsuite"
......
libstdc++-v3/mknumeric_limits
...@@ -23,14 +23,19 @@ if [ ! -d "$BUILD_DIR" ]; then ...@@ -23,14 +23,19 @@ if [ ! -d "$BUILD_DIR" ]; then
exit 1 exit 1
fi fi
if [ ! -d "$BUILD_DIR/bits" ]; then if [ ! -d "$BUILD_DIR/include" ]; then
mkdir "$BUILD_DIR/bits" mkdir "$BUILD_DIR/include"
fi fi
if [ ! -d "$BUILD_DIR/include/bits" ]; then
mkdir "$BUILD_DIR/include/bits"
fi
if [ ! -d "$BUILD_DIR/src" ]; then if [ ! -d "$BUILD_DIR/src" ]; then
mkdir "$BUILD_DIR/src" mkdir "$BUILD_DIR/src"
fi fi
OUT_H="$BUILD_DIR/bits/std_limits.h" OUT_H="$BUILD_DIR/include/bits/std_limits.h"
OUT_C="$BUILD_DIR/src/limitsMEMBERS.cc" OUT_C="$BUILD_DIR/src/limitsMEMBERS.cc"
if [ -f $OUT_C ]; then if [ -f $OUT_C ]; then
...@@ -46,7 +51,7 @@ fi ...@@ -46,7 +51,7 @@ fi
XCOMPILE=$3 XCOMPILE=$3
if [ $XCOMPILE -eq 1 ]; then if [ $XCOMPILE -eq 1 ]; then
echo "using default values for cross compiles" echo "using default values for cross compiles"
cp $SRC_DIR/bits/limits_generic.h $OUT_H cp $SRC_DIR/include/bits/limits_generic.h $OUT_H
cp $SRC_DIR/src/limits_generic.cc $OUT_C cp $SRC_DIR/src/limits_generic.cc $OUT_C
exit 0; exit 0;
fi fi
...@@ -163,11 +168,11 @@ namespace std { ...@@ -163,11 +168,11 @@ namespace std {
EOF EOF
echo "$CXX $CPPFLAGS -I$BUILD_DIR \ echo "$CXX $CPPFLAGS -I$BUILD_DIR/include \
-o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \ -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
$LDFLAGS" $LDFLAGS"
$CXX $CPPFLAGS -I$BUILD_DIR \ $CXX $CPPFLAGS -I$BUILD_DIR/include \
-o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \ -o "$BUILD_DIR/src/gen-num-limits" "$SRC_DIR/src/gen-num-limits.cc" \
$LDFLAGS $LDFLAGS
......
libstdc++-v3/src/Makefile.in
...@@ -104,12 +104,15 @@ libstdcxx_interface = @libstdcxx_interface@ ...@@ -104,12 +104,15 @@ libstdcxx_interface = @libstdcxx_interface@
AUTOMAKE_OPTIONS = 1.3 gnits AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version) # Cross compiler and multilib support.
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) # Install a library built with a cross compiler in tooldir, not libdir.
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@ @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias) @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
@USE_LIBDIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@toolexecdir = $(exec_prefix)/$(target_alias) @USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
toolexeclib_LTLIBRARIES = libstdc++.la toolexeclib_LTLIBRARIES = libstdc++.la
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
...@@ -137,7 +140,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -137,7 +140,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir) $(TOPLEVEL_INCLUDES) INCLUDES = -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES)
base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/string.tcc bits/generic_shadow.h bits/std_utility.h bits/std_complex.h bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h bits/gslice.h bits/gslice_array.h bits/indirect_array.h bits/exception_support.h bits/std_fstream.h bits/std_iomanip.h bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h bits/std_istream.h bits/istream.tcc bits/std_locale.h bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h bits/streambuf.tcc bits/basic_file.h bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h bits/stl_pthread_alloc.h bits/pthread_allocimpl.h bits/stl_threads.h bits/stl_iterator_base.h backward/algo.h backward/algobase.h backward/alloc.h backward/bvector.h backward/defalloc.h backward/deque.h backward/function.h backward/hash_map.h backward/hash_set.h backward/hashtable.h backward/heap.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/iostream.h backward/rope.h backward/set.h backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h backward/vector.h backward/fstream.h bits/std_bitset.h bits/std_deque.h bits/std_functional.h bits/std_iterator.h bits/std_list.h bits/std_map.h bits/std_memory.h bits/std_numeric.h bits/std_queue.h bits/std_set.h bits/std_stack.h bits/std_stdexcept.h bits/std_vector.h bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h bits/stl_deque.h bits/stl_function.h bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/std_strstream.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/string.tcc bits/generic_shadow.h bits/std_utility.h bits/std_complex.h bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h bits/gslice.h bits/gslice_array.h bits/indirect_array.h bits/exception_support.h bits/std_fstream.h bits/std_iomanip.h bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h bits/std_istream.h bits/istream.tcc bits/std_locale.h bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h bits/streambuf.tcc bits/basic_file.h bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h bits/stl_pthread_alloc.h bits/pthread_allocimpl.h bits/stl_threads.h bits/stl_iterator_base.h backward/algo.h backward/algobase.h backward/alloc.h backward/bvector.h backward/defalloc.h backward/deque.h backward/function.h backward/hash_map.h backward/hash_set.h backward/hashtable.h backward/heap.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/iostream.h backward/rope.h backward/set.h backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h backward/vector.h backward/fstream.h bits/std_bitset.h bits/std_deque.h bits/std_functional.h bits/std_iterator.h bits/std_list.h bits/std_map.h bits/std_memory.h bits/std_numeric.h bits/std_queue.h bits/std_set.h bits/std_stack.h bits/std_stdexcept.h bits/std_vector.h bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h bits/stl_deque.h bits/stl_function.h bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/std_strstream.h ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h bits/stl_config.h bits/stl_construct.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector
...@@ -156,7 +159,7 @@ std_headers = algorithm bitset complex deque fstream functional iomanip ios i ...@@ -156,7 +159,7 @@ std_headers = algorithm bitset complex deque fstream functional iomanip ios i
@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h @GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
@GLIBCPP_NEED_LIBIO_FALSE@libio_headers = @GLIBCPP_NEED_LIBIO_FALSE@libio_headers =
build_headers = $(top_builddir)/bits/std_limits.h $(top_builddir)/bits/c++config.h $(top_builddir)/bits/c++io.h $(top_builddir)/bits/c++threads.h $(top_builddir)/bits/atomicity.h $(top_builddir)/bits/os_defines.h $(top_builddir)/bits/ctype_base.h $(top_builddir)/bits/ctype_noninline.h $(top_builddir)/bits/ctype_inline.h build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
headers = $(base_headers) $(c_headers) headers = $(base_headers) $(c_headers)
...@@ -505,8 +508,8 @@ myinstallheaders: $(headers:%=$(myincludep)/%) ...@@ -505,8 +508,8 @@ myinstallheaders: $(headers:%=$(myincludep)/%)
$(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \ $(INSTALL_DATA) $(GLIBCPP_INCLUDE_DIR)/std/$$i $(myincludep); \
done; \ done; \
for i in $(build_headers); do \ for i in $(build_headers); do \
echo "$(INSTALL_DATA) $$i $(myincludep)/bits/"; \ echo "$(INSTALL_DATA) $(top_builddir)/include/$$i $(myincludep)/bits/"; \
$(INSTALL_DATA) $$i $(myincludep)/bits/; \ $(INSTALL_DATA) $(top_builddir)/include/$$i $(myincludep)/bits/; \
done; \ done; \
libio_headers_install='$(libio_headers)'; \ libio_headers_install='$(libio_headers)'; \
for i in $$libio_headers_install; do \ for i in $$libio_headers_install; do \
......
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