Skip to content

R
riscv-gcc-1
Commit 5b80666b by Benjamin Kosnik Committed by Benjamin Kosnik
Options

inclosure: Change to... 


2000-05-25  Benjamin Kosnik  <bkoz@milou.soma.redhat.com>

	* inclosure: Change to...
	* mkinclosure: This.
	Fix paths to bash.
	* mkcshadow: Fix paths to bash.

	* src/Makefile.am: Tweaks. Do cshadow header trickery at build time.
	* src/Makefile.in: Regnerate.
	* acinclude.m4 (GLIBCPP_COMPILER_VERSION): Fix typo.
	(GLIBCPP_ENABLE_SHADOW): Do a less gross hack.
	* aclocal.m4: Regenerate.

	* configure.in: Enable long long by default.
	* configure: Regenerate.

	* mkcheck.in (LIB_PATH): Revert.

From-SVN: r34166
parent e65d7eac
Showing with 172 additions and 86 deletions
libstdc++-v3/ChangeLog
2000-05-25 Benjamin Kosnik <bkoz@milou.soma.redhat.com>
* inclosure: Change to...
* mkinclosure: This.
Fix paths to bash.
* mkcshadow: Fix paths to bash.
* src/Makefile.am: Tweaks. Do cshadow header trickery at build time.
* src/Makefile.in: Regnerate.
* acinclude.m4 (GLIBCPP_COMPILER_VERSION): Fix typo.
(GLIBCPP_ENABLE_SHADOW): Do a less gross hack.
* aclocal.m4: Regenerate.
* configure.in: Enable long long by default.
* configure: Regenerate.
* mkcheck.in (LIB_PATH): Revert.
2000-05-24 Nathan "I don't write ChangeLog Entries" Myers <ncm@cantrip.org> 2000-05-24 Nathan "I don't write ChangeLog Entries" Myers <ncm@cantrip.org>
* config/cpu/i486: New directory. * config/cpu/i486: New directory.
......
libstdc++-v3/Makefile.in
...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ ...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@ CPUFLAGS = @CPUFLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@ ...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHADOW_INCLUDES = @SHADOW_INCLUDES@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@ THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
......
libstdc++-v3/acinclude.m4
...@@ -178,7 +178,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ ...@@ -178,7 +178,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
WERROR='-Werror' WERROR='-Werror'
# Sanity check that g++ is capable of dealing with v-3. # Sanity check that g++ is capable of dealing with v-3.
AC_MSG_CHECKING([for g++ that will successfullly compile this code]) AC_MSG_CHECKING([for g++ that will successfully compile this code])
AC_EGREP_CPP([ok], [ AC_EGREP_CPP([ok], [
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
ok ok
...@@ -998,15 +998,18 @@ AC_MSG_RESULT($enable_cshadow_headers) ...@@ -998,15 +998,18 @@ AC_MSG_RESULT($enable_cshadow_headers)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_cshadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow" CSHADOWFLAGS="-D_ISOC9X_SOURCE"
$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow CSHADOW_INCLUDES=" -I$srcdir/shadow -I$blddir/cshadow"
;; ;;
no) no)
SHADOW_INCLUDES='' CSHADOWFLAGS=""
CSHADOW_INCLUDES=""
;; ;;
esac esac
# SHADOW_INCLUDES is currently not used anywhere in the source
AC_SUBST(SHADOW_INCLUDES) AC_SUBST(CSHADOWFLAGS)
AC_SUBST(CSHADOW_INCLUDES)
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
]) ])
......
libstdc++-v3/aclocal.m4
...@@ -190,7 +190,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ ...@@ -190,7 +190,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
WERROR='-Werror' WERROR='-Werror'
# Sanity check that g++ is capable of dealing with v-3. # Sanity check that g++ is capable of dealing with v-3.
AC_MSG_CHECKING([for g++ that will successfullly compile this code]) AC_MSG_CHECKING([for g++ that will successfully compile this code])
AC_EGREP_CPP([ok], [ AC_EGREP_CPP([ok], [
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
ok ok
...@@ -1010,15 +1010,18 @@ AC_MSG_RESULT($enable_cshadow_headers) ...@@ -1010,15 +1010,18 @@ AC_MSG_RESULT($enable_cshadow_headers)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_cshadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
SHADOW_INCLUDES="-I$srcdir/shadow -I$blddir/cshadow" CSHADOWFLAGS="-D_ISOC9X_SOURCE"
$srcdir/inclosure "-I $blddir/../../gcc/include/ -I /usr/include/ -G machine/ansi.h" | $srcdir/mkcshadow CSHADOW_INCLUDES=" -I$srcdir/shadow -I$blddir/cshadow"
;; ;;
no) no)
SHADOW_INCLUDES='' CSHADOWFLAGS=""
CSHADOW_INCLUDES=""
;; ;;
esac esac
# SHADOW_INCLUDES is currently not used anywhere in the source
AC_SUBST(SHADOW_INCLUDES) AC_SUBST(CSHADOWFLAGS)
AC_SUBST(CSHADOW_INCLUDES)
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
]) ])
......
libstdc++-v3/configure.in
...@@ -27,7 +27,7 @@ GLIBCPP_CHECK_CPU ...@@ -27,7 +27,7 @@ GLIBCPP_CHECK_CPU
# Enable all the crazy c++ stuff. # Enable all the crazy c++ stuff.
GLIBCPP_ENABLE_DEBUG GLIBCPP_ENABLE_DEBUG
GLIBCPP_ENABLE_CSTDIO GLIBCPP_ENABLE_CSTDIO
GLIBCPP_ENABLE_LONG_LONG GLIBCPP_ENABLE_LONG_LONG(yes)
GLIBCPP_ENABLE_SHADOW(no) GLIBCPP_ENABLE_SHADOW(no)
GLIBCPP_ENABLE_THREADS GLIBCPP_ENABLE_THREADS
#GLIBCPP_ENABLE_RELIBGCC([../..]) #GLIBCPP_ENABLE_RELIBGCC([../..])
......
libstdc++-v3/libio/Makefile.am
## Makefile for the math subdirectory of the GNU C++ Standard library. ## Makefile for the libio subdirectory of the GNU C++ Standard library.
## ##
## Copyright (C) 1999, 2000 Cygnus Solutions ## Copyright (C) 1999, 2000 Cygnus Solutions
## ##
...@@ -25,11 +25,7 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -25,11 +25,7 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
if GLIBCPP_NEED_LIBIO_CONFIG_H LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
LIBIO_CONFIG_H = _G_config.h
else
LIBIO_CONFIG_H =
endif
includes = includes =
...@@ -43,17 +39,20 @@ else ...@@ -43,17 +39,20 @@ else
LIBIO_SRCS = LIBIO_SRCS =
endif endif
EXTRA_DIST = iostreamP.h EXTRA_DIST = iostreamP.h
libio_la_LIBADD = $(LIBIO_SRCS) libio_la_LIBADD = $(LIBIO_SRCS)
libio_la_DEPENDENCIES = $(libio_la_LIBADD) libio_la_DEPENDENCIES = $(libio_la_LIBADD)
libio_la_SOURCES = $(LIBIO_SRCS) libio_la_SOURCES = $(LIBIO_SRCS)
# Specifying that *.o depend on this one header if GLIBCPP_NEED_LIBIO_CONFIG_H
$(libio_la_OBJECTS): $(LIBIO_CONFIG_H) LIBIO_CONFIG_H = _G_config.h
else
LIBIO_CONFIG_H =
endif
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ # Specify that *.o depend on this one header
$(libio_la_OBJECTS): $(LIBIO_CONFIG_H)
# Generate this file. # Generate this file.
_G_config.h: $(srcdir)/gen-params _G_config.h: $(srcdir)/gen-params
...@@ -67,3 +66,8 @@ _G_config.h: $(srcdir)/gen-params ...@@ -67,3 +66,8 @@ _G_config.h: $(srcdir)/gen-params
libstdc++-v3/libio/Makefile.in
...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ ...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@ CPUFLAGS = @CPUFLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@ ...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHADOW_INCLUDES = @SHADOW_INCLUDES@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@ THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
...@@ -107,9 +108,8 @@ libinst_wstring_la = @libinst_wstring_la@ ...@@ -107,9 +108,8 @@ libinst_wstring_la = @libinst_wstring_la@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@LIBIO_CONFIG_H = \
@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@_G_config.h LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE@LIBIO_CONFIG_H = \
includes = includes =
...@@ -126,8 +126,9 @@ EXTRA_DIST = iostreamP.h ...@@ -126,8 +126,9 @@ EXTRA_DIST = iostreamP.h
libio_la_LIBADD = $(LIBIO_SRCS) libio_la_LIBADD = $(LIBIO_SRCS)
libio_la_DEPENDENCIES = $(libio_la_LIBADD) libio_la_DEPENDENCIES = $(libio_la_LIBADD)
libio_la_SOURCES = $(LIBIO_SRCS) libio_la_SOURCES = $(LIBIO_SRCS)
@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@LIBIO_CONFIG_H = \
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ @GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@_G_config.h
@GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE@LIBIO_CONFIG_H = \
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
...@@ -338,7 +339,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ ...@@ -338,7 +339,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Specifying that *.o depend on this one header # Specify that *.o depend on this one header
$(libio_la_OBJECTS): $(LIBIO_CONFIG_H) $(libio_la_OBJECTS): $(LIBIO_CONFIG_H)
# Generate this file. # Generate this file.
......
libstdc++-v3/math/Makefile.in
...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ ...@@ -69,6 +69,8 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@ CPUFLAGS = @CPUFLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@ ...@@ -90,7 +92,6 @@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHADOW_INCLUDES = @SHADOW_INCLUDES@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@ THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
......
libstdc++-v3/mkcheck.in
...@@ -61,10 +61,14 @@ fi ...@@ -61,10 +61,14 @@ fi
#LIB_PATH == where to find the build library binaries. #LIB_PATH == where to find the build library binaries.
if [ $WHICH != "1" ]; then if [ $WHICH != "1" ]; then
LIB_PATH="-L$BUILD_DIR/src/.libs -R$BUILD_DIR/src/.libs" LIB_PATH="-L$BUILD_DIR/src/.libs"
# BSD seems to want this
# LIB_PATH="-L$BUILD_DIR/src/.libs -R$BUILD_DIR/src/.libs"
CXX="../../gcc/g++ -B../../gcc/" CXX="../../gcc/g++ -B../../gcc/"
elif [ $WHICH -eq 1 ]; then elif [ $WHICH -eq 1 ]; then
LIB_PATH="-L$PREFIX_DIR/lib -R$PREFIX_DIR/lib" LIB_PATH="-L$PREFIX_DIR/lib"
# BSD seems to want this
# LIB_PATH="-L$PREFIX_DIR/lib -R$PREFIX_DIR/lib"
CXX="$PREFIX_DIR/bin/g++" CXX="$PREFIX_DIR/bin/g++"
fi fi
......
libstdc++-v3/mkcshadow
#!/bin/bash #!/usr/bin/env bash
# mkcshadow: reads header names (like "features.h" or "sys/types.h") # mkcshadow: reads header names (like "features.h" or "sys/types.h")
# from stdin, and creates shadow headers under cshadow/, except where # from stdin, and creates shadow headers under cshadow/, except where
...@@ -8,7 +8,7 @@ SCRIPTDIR=${0%/*} ...@@ -8,7 +8,7 @@ SCRIPTDIR=${0%/*}
if [ ! -d cshadow ]; then if [ ! -d cshadow ]; then
echo "Creating cshadow." echo "Creating cshadow."
mkdir cshadow mkdir ../cshadow
fi fi
echo "Creating..." echo "Creating..."
...@@ -19,7 +19,7 @@ while read header; do ...@@ -19,7 +19,7 @@ while read header; do
# strip off directory names while making # strip off directory names while making
# any necessary directories # any necessary directories
dir=cshadow dir=../cshadow
case "$header" in */*) case "$header" in */*)
right="$header" right="$header"
while [ "$right" != "${right##*/}" ] ; do while [ "$right" != "${right##*/}" ] ; do
...@@ -30,9 +30,9 @@ while read header; do ...@@ -30,9 +30,9 @@ while read header; do
;; ;;
esac esac
echo " cshadow/$header" echo " ../cshadow/$header"
UPNAME=`echo $header | tr 'a-z./-' 'A-Z___'` UPNAME=`echo $header | tr 'a-z./-' 'A-Z___'`
cat >"cshadow/$header" <<EOF cat >"../cshadow/$header" <<EOF
// -*- C++ -*- header wrapper. // -*- C++ -*- header wrapper.
// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. // Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
...@@ -86,3 +86,9 @@ EOF ...@@ -86,3 +86,9 @@ EOF
#################### end #################### #################### end ####################
fi fi
done done
libstdc++-v3/inclosure → libstdc++-v3/mkinclosure
#!/bin/bash #!/usr/bin/env bash
# #
# usage: inclosure [ -I dir ] ... [ -G header-name ] ... header-name ... # usage: inclosure [ -I dir ] ... [ -G header-name ] ... header-name ...
# #
...@@ -98,3 +98,5 @@ until cmp -s $OLDH $HDRS; do # (until no new headers found) ...@@ -98,3 +98,5 @@ until cmp -s $OLDH $HDRS; do # (until no new headers found)
done done
cat $HDRS cat $HDRS
libstdc++-v3/src/Makefile.am
...@@ -46,7 +46,8 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la ...@@ -46,7 +46,8 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# These bits are all figured out from configure. Look in acinclude.m4 # These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. # or configure.in to see how they are set.
AC_CXXFLAGS = \ AC_CXXFLAGS = \
@WERROR@ @FMTFLAGS@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ @WERROR@ @FMTFLAGS@ @CSHADOWFLAGS@ @CPUFLAGS@ \
@EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
# Need to manually set this option because AC_CXXFLAGS has to be at # Need to manually set this option because AC_CXXFLAGS has to be at
# the end of the compile line so that -O2 can be over-riden as the # the end of the compile line so that -O2 can be over-riden as the
...@@ -58,6 +59,23 @@ AM_CXXFLAGS = \ ...@@ -58,6 +59,23 @@ AM_CXXFLAGS = \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES = -I$(includedir)
LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio
CSHADOW_INCLUDES = @CSHADOWFLAGS@ @CSHADOW_INCLUDES@
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-nostdinc++ -I$(top_srcdir) \
$(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(CSHADOW_INCLUDES) \
$(TOPLEVEL_INCLUDES)
# Need to explicitly set this so that AM_CXXFLAGS is last. (That way, # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,
# things like -O2 passed down from the toplevel can be overridden by # things like -O2 passed down from the toplevel can be overridden by
# --enable-debug.) # --enable-debug.)
...@@ -74,18 +92,6 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ ...@@ -74,18 +92,6 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@
TOPLEVEL_INCLUDES = -I$(includedir)
LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-nostdinc++ -I$(top_srcdir) \
$(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)
headers = \ headers = \
bits/cpp_type_traits.h \ bits/cpp_type_traits.h \
bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h \ bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h \
...@@ -182,6 +188,15 @@ generated_headers = \ ...@@ -182,6 +188,15 @@ generated_headers = \
cpu_headers = \ cpu_headers = \
$(top_srcdir)/@cpu_include_dir@/bits/atomicity.h $(top_srcdir)/@cpu_include_dir@/bits/atomicity.h
sources = \
limitsMEMBERS.cc c++io.cc \
cmath.cc \
complex.cc complexf.cc complexl.cc complex_io.cc \
stdexcept.cc ios.cc stdstreams.cc strstream.cc \
locale.cc localename.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc
string_sources = \ string_sources = \
stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \ stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \
stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \ stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \
...@@ -221,14 +236,6 @@ wstring_sources = \ ...@@ -221,14 +236,6 @@ wstring_sources = \
wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \ wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \
wstringSCOPY.cc wstringEQ.cc wstringSCOPY.cc wstringEQ.cc
sources = \
limitsMEMBERS.cc c++io.cc \
cmath.cc \
complex.cc complexf.cc complexl.cc complex_io.cc \
stdexcept.cc ios.cc stdstreams.cc strstream.cc \
locale.cc localename.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc
VPATH += $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src VPATH += $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src
VPATH += $(top_srcdir)/@ctype_include_dir@ VPATH += $(top_srcdir)/@ctype_include_dir@
...@@ -251,6 +258,24 @@ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm ...@@ -251,6 +258,24 @@ libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
# Make sure cshadow headers are built first.
if GLIBCPP_USE_CSHADOW
CSHADOW_H = $(top_builddir)/stamp-cshadow
else
CSHADOW_H =
endif
# Specify that all *.o's depend on this.
$(libstdc___la_OBJECTS): $(CSHADOW_H)
$(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
$(top_srcdir)/mkcshadow
$(top_srcdir)/mkinclosure \
"-I $(top_builddir)/../../gcc/include -I /usr/include -G machine/ansi.h" | $(top_srcdir)/mkcshadow;
rm -f $(top_builddir)/stamp-cshadow
echo "done" > $(top_builddir)/stamp-cshadow
# We cannot use the default rules to install headers since we cannot # We cannot use the default rules to install headers since we cannot
# statically decide which headers to install. So we have our own special # statically decide which headers to install. So we have our own special
# installation routine here. # installation routine here.
......
libstdc++-v3/src/Makefile.in
...@@ -68,6 +68,7 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ ...@@ -68,6 +68,7 @@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@ CPUFLAGS = @CPUFLAGS@
CSHADOWFLAGS = @CSHADOWFLAGS@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -89,7 +90,6 @@ MAKEINFO = @MAKEINFO@ ...@@ -89,7 +90,6 @@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHADOW_INCLUDES = @SHADOW_INCLUDES@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
THREADINCS = @THREADINCS@ THREADINCS = @THREADINCS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
...@@ -124,7 +124,8 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la ...@@ -124,7 +124,8 @@ EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# These bits are all figured out from configure. Look in acinclude.m4 # These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. # or configure.in to see how they are set.
AC_CXXFLAGS = \ AC_CXXFLAGS = \
@WERROR@ @FMTFLAGS@ @CPUFLAGS@ @EXTRA_CXX_FLAGS@ @DEBUGFLAGS@ @WERROR@ @FMTFLAGS@ @CSHADOWFLAGS@ @CPUFLAGS@ \
@EXTRA_CXX_FLAGS@ @DEBUGFLAGS@
# Need to manually set this option because AC_CXXFLAGS has to be at # Need to manually set this option because AC_CXXFLAGS has to be at
...@@ -137,6 +138,24 @@ AM_CXXFLAGS = \ ...@@ -137,6 +138,24 @@ AM_CXXFLAGS = \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES = -I$(includedir)
LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio
CSHADOW_INCLUDES = @CSHADOWFLAGS@ @CSHADOW_INCLUDES@
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-nostdinc++ -I$(top_srcdir) \
$(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(CSHADOW_INCLUDES) \
$(TOPLEVEL_INCLUDES)
# Need to explicitly set this so that AM_CXXFLAGS is last. (That way, # Need to explicitly set this so that AM_CXXFLAGS is last. (That way,
# things like -O2 passed down from the toplevel can be overridden by # things like -O2 passed down from the toplevel can be overridden by
# --enable-debug.) # --enable-debug.)
...@@ -154,20 +173,6 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ ...@@ -154,20 +173,6 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \
# course is impossible. # course is impossible.
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(LIBTOOL) --mode=link "$(CC)" $(AM_CXXFLAGS) $(LDFLAGS) -o $@
TOPLEVEL_INCLUDES = -I$(includedir)
LIBIO_INCLUDES = @BUILD_LIBIO_INCLUDE@ -I$(top_srcdir)/libio
CONFIG_INCLUDES = \
-I$(top_srcdir)/@cpu_include_dir@ \
-I$(top_srcdir)/@ctype_include_dir@
INCLUDES = \
-nostdinc++ -I$(top_srcdir) \
$(LIBIO_INCLUDES) $(CONFIG_INCLUDES) $(TOPLEVEL_INCLUDES)
headers = \ headers = \
bits/cpp_type_traits.h \ bits/cpp_type_traits.h \
bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h \ bits/std_cctype.h bits/ctype_base.h bits/ctype_specializations.h \
...@@ -265,6 +270,15 @@ cpu_headers = \ ...@@ -265,6 +270,15 @@ cpu_headers = \
$(top_srcdir)/@cpu_include_dir@/bits/atomicity.h $(top_srcdir)/@cpu_include_dir@/bits/atomicity.h
sources = \
limitsMEMBERS.cc c++io.cc \
cmath.cc \
complex.cc complexf.cc complexl.cc complex_io.cc \
stdexcept.cc ios.cc stdstreams.cc strstream.cc \
locale.cc localename.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc
string_sources = \ string_sources = \
stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \ stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \
stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \ stringCTORCPR.cc stringCTORCPRAL.cc stringCTORPRAL.cc \
...@@ -305,15 +319,6 @@ wstring_sources = \ ...@@ -305,15 +319,6 @@ wstring_sources = \
wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \ wstringADDCS.cc wstringEXTRACT.cc wstringINSERT.cc wstringGETLINE.cc \
wstringSCOPY.cc wstringEQ.cc wstringSCOPY.cc wstringEQ.cc
sources = \
limitsMEMBERS.cc c++io.cc \
cmath.cc \
complex.cc complexf.cc complexl.cc complex_io.cc \
stdexcept.cc ios.cc stdstreams.cc strstream.cc \
locale.cc localename.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc
VPATH = $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src $(top_srcdir)/@ctype_include_dir@ VPATH = $(top_srcdir) $(top_srcdir)/std $(top_srcdir)/src $(top_srcdir)/@ctype_include_dir@
# Actual sources for the distro, but don't build these. # Actual sources for the distro, but don't build these.
...@@ -333,6 +338,9 @@ libstdc___la_LIBADD = \ ...@@ -333,6 +338,9 @@ libstdc___la_LIBADD = \
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = \
@GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H = \
# We cannot use the default rules to install headers since we cannot # We cannot use the default rules to install headers since we cannot
# statically decide which headers to install. So we have our own special # statically decide which headers to install. So we have our own special
...@@ -598,6 +606,16 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ ...@@ -598,6 +606,16 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Specify that all *.o's depend on this.
$(libstdc___la_OBJECTS): $(CSHADOW_H)
$(top_builddir)/stamp-cshadow: $(top_srcdir)/mkinclosure \
$(top_srcdir)/mkcshadow
$(top_srcdir)/mkinclosure \
"-I $(top_builddir)/../../gcc/include -I /usr/include -G machine/ansi.h" | $(top_srcdir)/mkcshadow;
rm -f $(top_builddir)/stamp-cshadow
echo "done" > $(top_builddir)/stamp-cshadow
install: myinstallheaders install: myinstallheaders
# NB: As libio_headers may be empty, need this to make sure bash doesn't # NB: As libio_headers may be empty, need this to make sure bash doesn't
......
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