Skip to content

R
riscv-gcc-1
Commit e466dc8a by Benjamin Kosnik
Options

Makefile.am: Use it. 


2000-10-11  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* libsupc++/Makefile.am: Use it.
	* libio/Makefile.am: Use it.
	* libmath/Makefile.am: Use it.
	* src/Makefile.am: Use it.
	* Makefile.am (AM_MAKEFLAGS): Remove includes.

	* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
	(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
	* configure.in: Use it.

	* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.

From-SVN: r36847
parent bc87c1c8
Showing with 324 additions and 127 deletions
libstdc++-v3/ChangeLog
2000-10-11 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* libsupc++/Makefile.am: Use it.
* libio/Makefile.am: Use it.
* libmath/Makefile.am: Use it.
* src/Makefile.am: Use it.
* Makefile.am (AM_MAKEFLAGS): Remove includes.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
* configure.in: Use it.
* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.
2000-10-11 Phil Edwards <pme@sources.redhat.com> 2000-10-11 Phil Edwards <pme@sources.redhat.com>
* acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Comment out * acinclude.m4 (GLIBCPP_CHECK_LINKER_FEATURES): Comment out
......
libstdc++-v3/Makefile.am
...@@ -32,54 +32,6 @@ gxx_include_dir=$(includedir)/g++ ...@@ -32,54 +32,6 @@ gxx_include_dir=$(includedir)/g++
SUBDIRS = libio libmath libsupc++ src SUBDIRS = libio libmath libsupc++ src
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
# Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS =
# Warning flags to use.
WARN_CXXFLAGS = \
-Wall -Wno-format -W -Wwrite-strings -Winline \
$(WERROR) @WFMT_FLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \
@EXTRA_CXX_FLAGS@ \
@SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@
# Root level of the include sources.
GLIBCPP_INCLUDE_DIR = $(top_srcdir)/include
# Can either use include/c or include/c_std to grab "C" headers. This
# variable is set to the include directory currently in use.
C_INCLUDE_DIR = $(GLIBCPP_INCLUDE_DIR)/@c_include_dir@
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES = -I$(includedir)
LIBMATH_INCLUDES = -I$(top_srcdir)/libmath
if GLIBCPP_NEED_LIBIO
LIBIO_INCLUDES = \
-I$(top_builddir)/libio -I$(top_srcdir)/libio
else
LIBIO_INCLUDES = -I$(top_srcdir)/libio
endif
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++
# XXX May need to add this in later to enabled shadow header includes
# -I$(top_builddir)/cshadow
CSHADOW_INCLUDES = \
-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)
# Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck" # Use $(blddir) instead of $(top_builddir) for arguments to "mkcheck"
# because then the paths will be full pathnames, not relative # because then the paths will be full pathnames, not relative
# pathnames. (-Wl,--rpath seems to like this better.) # pathnames. (-Wl,--rpath seems to like this better.)
...@@ -174,14 +126,4 @@ AM_MAKEFLAGS = \ ...@@ -174,14 +126,4 @@ AM_MAKEFLAGS = \
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \ "NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" \ "DESTDIR=$(DESTDIR)" \
"WERROR=$(WERROR)" \ "WERROR=$(WERROR)"
"OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" \ \ No newline at end of file
"WARN_CXXFLAGS=$(WARN_CXXFLAGS)" \
"CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" \
"GLIBCPP_INCLUDE_DIR=$(GLIBCPP_INCLUDE_DIR)" \
"C_INCLUDE_DIR=$(C_INCLUDE_DIR)" \
"TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" \
"LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" \
"LIBIO_INCLUDES=$(LIBIO_INCLUDES)" \
"CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" \
"LIBSUPCXX_INCLUDES=$(LIBSUPCXX_INCLUDES)"
libstdc++-v3/Makefile.in
...@@ -67,9 +67,11 @@ AR = @AR@ ...@@ -67,9 +67,11 @@ AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
...@@ -79,25 +81,31 @@ GCJ = @GCJ@ ...@@ -79,25 +81,31 @@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSTRINGOBJS = @LIBSTRINGOBJS@ LIBSTRINGOBJS = @LIBSTRINGOBJS@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@ WFMT_FLAGS = @WFMT_FLAGS@
c_include_dir = @c_include_dir@
glibcpp_basedir = @glibcpp_basedir@ glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@ libinst_wstring_la = @libinst_wstring_la@
...@@ -112,44 +120,6 @@ gxx_include_dir = $(includedir)/g++ ...@@ -112,44 +120,6 @@ gxx_include_dir = $(includedir)/g++
SUBDIRS = libio libmath libsupc++ src SUBDIRS = libio libmath libsupc++ src
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
# Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS =
# Warning flags to use.
WARN_CXXFLAGS = -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) @WFMT_FLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set.
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOWFLAGS@ @DEBUG_FLAGS@
# Root level of the include sources.
GLIBCPP_INCLUDE_DIR = $(top_srcdir)/include
# Can either use include/c or include/c_std to grab "C" headers. This
# variable is set to the include directory currently in use.
C_INCLUDE_DIR = $(GLIBCPP_INCLUDE_DIR)/@c_include_dir@
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES = -I$(includedir)
LIBMATH_INCLUDES = -I$(top_srcdir)/libmath
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = -I$(top_builddir)/libio -I$(top_srcdir)/libio
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = -I$(top_srcdir)/libio
LIBSUPCXX_INCLUDES = -I$(top_srcdir)/libsupc++
# XXX May need to add this in later to enabled shadow header includes
# -I$(top_builddir)/cshadow
CSHADOW_INCLUDES = -I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)
# Multilib support. # Multilib support.
MAKEOVERRIDES = MAKEOVERRIDES =
...@@ -164,7 +134,7 @@ MULTICLEAN = true ...@@ -164,7 +134,7 @@ MULTICLEAN = true
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and # values defined in terms of make variables, as is the case for CC and
# friends when we are called from the top level Makefile. # friends when we are called from the top level Makefile.
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)" "OPTIMIZE_CXXFLAGS=$(OPTIMIZE_CXXFLAGS)" "WARN_CXXFLAGS=$(WARN_CXXFLAGS)" "CONFIG_CXXFLAGS=$(CONFIG_CXXFLAGS)" "GLIBCPP_INCLUDE_DIR=$(GLIBCPP_INCLUDE_DIR)" "C_INCLUDE_DIR=$(C_INCLUDE_DIR)" "TOPLEVEL_INCLUDES=$(TOPLEVEL_INCLUDES)" "LIBMATH_INCLUDES=$(LIBMATH_INCLUDES)" "LIBIO_INCLUDES=$(LIBIO_INCLUDES)" "CSHADOW_INCLUDES=$(CSHADOW_INCLUDES)" "LIBSUPCXX_INCLUDES=$(LIBSUPCXX_INCLUDES)" AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)"
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
......
libstdc++-v3/acinclude.m4
...@@ -269,6 +269,9 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -269,6 +269,9 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
CFLAGS='-x c++ -Wl,--gc-sections' CFLAGS='-x c++ -Wl,--gc-sections'
# Check for -Wl,--gc-sections # Check for -Wl,--gc-sections
# XXX This test is broken at the moment, as symbols required for
# linking are now in libsupc++ (not built yet.....). In addition,
# this test has cored on solaris in the past.
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
AC_TRY_RUN([ AC_TRY_RUN([
int main(void) int main(void)
...@@ -277,7 +280,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -277,7 +280,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
//catch (...) { }; //catch (...) { };
return 0; return 0;
} }
], [ac_sectionLDflags=yes], [ac_sectionLFflags=no], [ac_sectionLDflags=yes]) ], [ac_sectionLDflags=yes],[ac_sectionLFflags=no], [ac_sectionLDflags=yes])
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
else else
...@@ -1476,21 +1479,85 @@ changequote([, ]) ...@@ -1476,21 +1479,85 @@ changequote([, ])
dnl NB: these things may be duplicated in c++config.h as well. dnl NB: these things may be duplicated in c++config.h as well.
case "$enable_cshadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
CSHADOWFLAGS="-fno-builtin" CSHADOW_FLAGS="-fno-builtin"
C_INCLUDE_DIR='$(top_srcdir)/include/c_std'
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS) AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
c_include_dir=c_std
;; ;;
no) no)
CSHADOWFLAGS="" CSHADOW_FLAGS=""
c_include_dir=c C_INCLUDE_DIR='$(top_srcdir)/include/c'
;; ;;
esac esac
AC_SUBST(CSHADOWFLAGS) AC_SUBST(CSHADOW_FLAGS)
AC_SUBST(c_include_dir) AC_SUBST(C_INCLUDE_DIR)
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes) AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
]) ])
dnl
dnl Set up *_INCLUDES and *_INCLUDE_DIR variables for all sundry Makefile.am's.
dnl
dnl GLIBCPP_INCLUDE_DIR
dnl C_INCLUDE_DIR
dnl TOPLEVEL_INCLUDES
dnl LIBMATH_INCLUDES
dnl LIBSUPCXX_INCLUDES
dnl LIBIO_INCLUDES
dnl CSHADOW_INCLUDES
dnl
dnl GLIBCPP_EXPORT_INCLUDE
AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
# Root level of the include sources.
GLIBCPP_INCLUDE_DIR='$(top_srcdir)/include'
# Can either use include/c or include/c_std to grab "C" headers. This
# variable is set to the include directory currently in use.
# set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES='-I$(includedir)'
LIBMATH_INCLUDES='-I$(top_srcdir)/libmath'
LIBSUPCXX_INCLUDES='-I$(top_srcdir)/libsupc++'
#if GLIBCPP_NEED_LIBIO
LIBIO_INCLUDES='-I$(top_builddir)/libio -I$(top_srcdir)/libio'
#else
#LIBIO_INCLUDES='-I$(top_srcdir)/libio'
#endif
#if GLIBCPP_USE_CSHADOW
# CSHADOW_INCLUDES='-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR) \
# -I$(top_blddir)/cshadow'
#else
CSHADOW_INCLUDES='-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)'
#endif
# Now, export this to all the little Makefiles....
AC_SUBST(GLIBCPP_INCLUDE_DIR)
AC_SUBST(TOPLEVEL_INCLUDES)
AC_SUBST(LIBMATH_INCLUDES)
AC_SUBST(LIBSUPCXX_INCLUDES)
AC_SUBST(LIBIO_INCLUDES)
AC_SUBST(CSHADOW_INCLUDES)
])
dnl
dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
dnl
AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
# Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS=
AC_SUBST(OPTIMIZE_CXXFLAGS)
WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings -Winline'
AC_SUBST(WARN_FLAGS)
])
# Check whether LC_MESSAGES is available in <locale.h>. # Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <drepper@cygnus.com>, 1995. # Ulrich Drepper <drepper@cygnus.com>, 1995.
......
libstdc++-v3/aclocal.m4
...@@ -281,6 +281,9 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -281,6 +281,9 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
CFLAGS='-x c++ -Wl,--gc-sections' CFLAGS='-x c++ -Wl,--gc-sections'
# Check for -Wl,--gc-sections # Check for -Wl,--gc-sections
# XXX This test is broken at the moment, as symbols required for
# linking are now in libsupc++ (not built yet.....). In addition,
# this test has cored on solaris in the past.
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
AC_TRY_RUN([ AC_TRY_RUN([
int main(void) int main(void)
...@@ -289,7 +292,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -289,7 +292,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
//catch (...) { }; //catch (...) { };
return 0; return 0;
} }
], [ac_sectionLDflags=yes], [ac_sectionLFflags=no], [ac_sectionLDflags=yes]) ], [ac_sectionLDflags=yes],[ac_sectionLFflags=no], [ac_sectionLDflags=yes])
if test "$ac_test_CFLAGS" = set; then if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
else else
...@@ -1488,21 +1491,85 @@ changequote([, ]) ...@@ -1488,21 +1491,85 @@ changequote([, ])
dnl NB: these things may be duplicated in c++config.h as well. dnl NB: these things may be duplicated in c++config.h as well.
case "$enable_cshadow_headers" in case "$enable_cshadow_headers" in
yes) yes)
CSHADOWFLAGS="-fno-builtin" CSHADOW_FLAGS="-fno-builtin"
C_INCLUDE_DIR='$(top_srcdir)/include/c_std'
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS) AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
c_include_dir=c_std
;; ;;
no) no)
CSHADOWFLAGS="" CSHADOW_FLAGS=""
c_include_dir=c C_INCLUDE_DIR='$(top_srcdir)/include/c'
;; ;;
esac esac
AC_SUBST(CSHADOWFLAGS) AC_SUBST(CSHADOW_FLAGS)
AC_SUBST(c_include_dir) AC_SUBST(C_INCLUDE_DIR)
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes) AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cshadow_headers" = yes)
]) ])
dnl
dnl Set up *_INCLUDES and *_INCLUDE_DIR variables for all sundry Makefile.am's.
dnl
dnl GLIBCPP_INCLUDE_DIR
dnl C_INCLUDE_DIR
dnl TOPLEVEL_INCLUDES
dnl LIBMATH_INCLUDES
dnl LIBSUPCXX_INCLUDES
dnl LIBIO_INCLUDES
dnl CSHADOW_INCLUDES
dnl
dnl GLIBCPP_EXPORT_INCLUDE
AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
# Root level of the include sources.
GLIBCPP_INCLUDE_DIR='$(top_srcdir)/include'
# Can either use include/c or include/c_std to grab "C" headers. This
# variable is set to the include directory currently in use.
# set with C_INCLUDE_DIR in GLIBCPP_ENABLE_SHADOW
# Passed down for cross compilers, canadian crosses.
TOPLEVEL_INCLUDES='-I$(includedir)'
LIBMATH_INCLUDES='-I$(top_srcdir)/libmath'
LIBSUPCXX_INCLUDES='-I$(top_srcdir)/libsupc++'
#if GLIBCPP_NEED_LIBIO
LIBIO_INCLUDES='-I$(top_builddir)/libio -I$(top_srcdir)/libio'
#else
#LIBIO_INCLUDES='-I$(top_srcdir)/libio'
#endif
#if GLIBCPP_USE_CSHADOW
# CSHADOW_INCLUDES='-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR) \
# -I$(top_blddir)/cshadow'
#else
CSHADOW_INCLUDES='-I$(GLIBCPP_INCLUDE_DIR)/std -I$(C_INCLUDE_DIR)'
#endif
# Now, export this to all the little Makefiles....
AC_SUBST(GLIBCPP_INCLUDE_DIR)
AC_SUBST(TOPLEVEL_INCLUDES)
AC_SUBST(LIBMATH_INCLUDES)
AC_SUBST(LIBSUPCXX_INCLUDES)
AC_SUBST(LIBIO_INCLUDES)
AC_SUBST(CSHADOW_INCLUDES)
])
dnl
dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
dnl
AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
# Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS=
AC_SUBST(OPTIMIZE_CXXFLAGS)
WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings -Winline'
AC_SUBST(WARN_FLAGS)
])
# Check whether LC_MESSAGES is available in <locale.h>. # Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <drepper@cygnus.com>, 1995. # Ulrich Drepper <drepper@cygnus.com>, 1995.
......
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
...@@ -143,7 +143,6 @@ AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") ...@@ -143,7 +143,6 @@ AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
AC_LC_MESSAGES AC_LC_MESSAGES
if test "${multilib}" = "yes"; then if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib" multilib_arg="--enable-multilib"
else else
...@@ -153,12 +152,15 @@ fi ...@@ -153,12 +152,15 @@ fi
# Generate the various Makefiles, include files, and scripts. # Generate the various Makefiles, include files, and scripts.
# Export all the include and flag information to makefiles.
GLIBCPP_EXPORT_INCLUDES
GLIBCPP_EXPORT_FLAGS
# 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
# -> top_srcdir/Makefile.am -> top_srcdir/src/Makefile.am, manually # -> top_srcdir/Makefile.am -> top_srcdir/src/Makefile.am, manually
# append it here. # append it here.
AC_OUTPUT(mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile, AC_OUTPUT(mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile,
[if test -n "$CONFIG_FILES"; then [if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
......
libstdc++-v3/libio/ChangeLog
2000-10-11 Benjamin Kosnik <bkoz@gnu.org>
* Makefile.am: Add includes from GLIBCPP_EXPORT_INCLUDES.
2000-10-10 Benjamin Kosnik <bkoz@gnu.org> 2000-10-10 Benjamin Kosnik <bkoz@gnu.org>
* _G_config.h (__need_ptrdiff_t): Add. * _G_config.h (__need_ptrdiff_t): Add.
......
libstdc++-v3/libio/Makefile.am
...@@ -25,6 +25,14 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -25,6 +25,14 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = \
-nostdinc++ \ -nostdinc++ \
......
libstdc++-v3/libio/Makefile.in
...@@ -67,7 +67,7 @@ AR = @AR@ ...@@ -67,7 +67,7 @@ AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
...@@ -87,6 +87,7 @@ MAINT = @MAINT@ ...@@ -87,6 +87,7 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
...@@ -95,9 +96,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ ...@@ -95,9 +96,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@ WFMT_FLAGS = @WFMT_FLAGS@
c_include_dir = @c_include_dir@
glibcpp_basedir = @glibcpp_basedir@ glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@ libinst_wstring_la = @libinst_wstring_la@
...@@ -106,6 +107,15 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -106,6 +107,15 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES) INCLUDES = -nostdinc++ -I$(top_builddir) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
......
libstdc++-v3/libmath/Makefile.am
...@@ -50,6 +50,15 @@ libmath_la_SOURCES = \ ...@@ -50,6 +50,15 @@ libmath_la_SOURCES = \
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES) INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES)
......
libstdc++-v3/libmath/Makefile.in
...@@ -67,7 +67,7 @@ AR = @AR@ ...@@ -67,7 +67,7 @@ AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
...@@ -87,6 +87,7 @@ MAINT = @MAINT@ ...@@ -87,6 +87,7 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
OPT_LDFLAGS = @OPT_LDFLAGS@ OPT_LDFLAGS = @OPT_LDFLAGS@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
...@@ -95,9 +96,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ ...@@ -95,9 +96,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@ WFMT_FLAGS = @WFMT_FLAGS@
c_include_dir = @c_include_dir@
glibcpp_basedir = @glibcpp_basedir@ glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@ libinst_wstring_la = @libinst_wstring_la@
...@@ -122,6 +123,15 @@ libmath_la_SOURCES = signbit.c signbitf.c cabs.c cabsf.c ...@@ -122,6 +123,15 @@ libmath_la_SOURCES = signbit.c signbitf.c cabs.c cabsf.c
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES) INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) $(TOPLEVEL_INCLUDES)
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h CONFIG_HEADER = ../config.h
......
libstdc++-v3/libsupc++/Makefile.am
...@@ -42,6 +42,29 @@ toolexeclib_LTLIBRARIES = libsupc++.la ...@@ -42,6 +42,29 @@ toolexeclib_LTLIBRARIES = libsupc++.la
noinst_LTLIBRARIES = libsupc++convenience.la noinst_LTLIBRARIES = libsupc++convenience.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \ -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -67,7 +67,7 @@ AR = @AR@ ...@@ -67,7 +67,7 @@ AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
...@@ -94,9 +94,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ ...@@ -94,9 +94,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@ WFMT_FLAGS = @WFMT_FLAGS@
c_include_dir = @c_include_dir@
glibcpp_basedir = @glibcpp_basedir@ glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@ libinst_wstring_la = @libinst_wstring_la@
...@@ -114,6 +114,29 @@ toolexeclib_LTLIBRARIES = libsupc++.la ...@@ -114,6 +114,29 @@ toolexeclib_LTLIBRARIES = libsupc++.la
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
noinst_LTLIBRARIES = libsupc++convenience.la noinst_LTLIBRARIES = libsupc++convenience.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_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)
......
libstdc++-v3/mkcheck.in
...@@ -54,9 +54,10 @@ if [ $WHICH -eq 1 ]; then ...@@ -54,9 +54,10 @@ if [ $WHICH -eq 1 ]; then
fi fi
# INC_PATH == include path to new headers for use on gcc command-line # INC_PATH == include path to new headers for use on gcc command-line
C_DIR="`basename @C_INCLUDE_DIR@`"
if [ $WHICH != "1" ]; then if [ $WHICH != "1" ]; then
INC_PATH="@CSHADOWFLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \ INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
-I$SRC_DIR/include/std -I$SRC_DIR/include/@c_include_dir@ \ -I$SRC_DIR/include/std -I$SRC_DIR/include/$C_DIR \
-I$SRC_DIR/include -I$SRC_DIR/libsupc++/include -I$SRC_DIR/libio \ -I$SRC_DIR/include -I$SRC_DIR/libsupc++/include -I$SRC_DIR/libio \
-I$SRC_DIR/testsuite" -I$SRC_DIR/testsuite"
elif [ $WHICH -eq 1 ]; then elif [ $WHICH -eq 1 ]; then
......
libstdc++-v3/src/Makefile.am
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
## $Id: Makefile.am,v 1.37 2000/10/09 08:55:06 bkoz Exp $ ## $Id: Makefile.am,v 1.38 2000/10/10 23:50:39 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
...@@ -40,6 +40,29 @@ toolexeclib_LTLIBRARIES = libstdc++.la ...@@ -40,6 +40,29 @@ toolexeclib_LTLIBRARIES = libstdc++.la
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = \
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = \
@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = \
-D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ \ -D_GNU_SOURCE -D_ISOC99_SOURCE -nostdinc++ \
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
......
libstdc++-v3/src/Makefile.in
...@@ -66,7 +66,7 @@ AR = @AR@ ...@@ -66,7 +66,7 @@ AR = @AR@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CSHADOWFLAGS = @CSHADOWFLAGS@ CSHADOW_FLAGS = @CSHADOW_FLAGS@
CXX = @CXX@ CXX = @CXX@
CXXCPP = @CXXCPP@ CXXCPP = @CXXCPP@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
...@@ -94,9 +94,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ ...@@ -94,9 +94,9 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
STRIP = @STRIP@ STRIP = @STRIP@
USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@ USE_COMPLEX_LONG_DOUBLE = @USE_COMPLEX_LONG_DOUBLE@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
WFMT_FLAGS = @WFMT_FLAGS@ WFMT_FLAGS = @WFMT_FLAGS@
c_include_dir = @c_include_dir@
glibcpp_basedir = @glibcpp_basedir@ glibcpp_basedir = @glibcpp_basedir@
ifGNUmake = @ifGNUmake@ ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@ libinst_wstring_la = @libinst_wstring_la@
...@@ -110,6 +110,29 @@ MAINT_CHARSET = latin1 ...@@ -110,6 +110,29 @@ MAINT_CHARSET = latin1
toolexeclib_LTLIBRARIES = libstdc++.la toolexeclib_LTLIBRARIES = libstdc++.la
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
# These bits are all figured out from configure. Look in acinclude.m4
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use.
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
C_INCLUDE_DIR = @C_INCLUDE_DIR@
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_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) $(TOPLEVEL_INCLUDES)
......
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