mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-18 00:59:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in: Set os_include_dir for cross_compiles.
	* configure: Regenerate.
	* configure.target (l_glibcpp_cxxflags): Don't try to be clever
	when assigning ATOMICITYH. Only special case the special cases...

2000-12-15  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in (gxx_target_include_dir): Install target-dependent
	include files in a target-dependent place.
	* configure: Regenerate.
	* src/Makefile.am: Add in support here.
	* src/Makefile.in: Regenerate.

From-SVN: r38354
This commit is contained in:
Benjamin Kosnik 2000-12-18 18:03:08 +00:00 committed by Benjamin Kosnik
parent 4c6b283591
commit 6e138b89b7
10 changed files with 965 additions and 941 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libstdc++-v3/ChangeLog
View File

@ -1,9 +1,24 @@
2000-12-18 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Set os_include_dir for cross_compiles.
* configure: Regenerate.
* configure.target (l_glibcpp_cxxflags): Don't try to be clever
when assigning ATOMICITYH. Only special case the special cases...
2000-12-18 Joseph S. Myers <jsm28@cam.ac.uk>
* docs/html/17_intro/COPYING: Update to current
ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes references
to 19yy as example year in copyright notice).
2000-12-15 Benjamin Kosnik <bkoz@redhat.com>
* configure.in (gxx_target_include_dir): Install target-dependent
include files in a target-dependent place.
* configure: Regenerate.
* src/Makefile.am: Add in support here.
* src/Makefile.in: Regenerate.
2000-12-14 Benjamin Kosnik <bkoz@fillmore.redhat.com>
* src/Makefile.am (myinstallheaders): Install backwards headers in

1
libstdc++-v3/Makefile.in
View File

@ -111,6 +111,7 @@ enable_static = @enable_static@
gcc_version = @gcc_version@
glibcpp_basedir = @glibcpp_basedir@
gxx_include_dir = @gxx_include_dir@
gxx_target_include_dir = @gxx_target_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@

1842
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff

9
libstdc++-v3/configure.in
View File

@ -162,6 +162,7 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_ISINFF)
ctype_include_dir="config/os/newlib"
os_include_dir="config/os/newlib"
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
@ -203,10 +204,10 @@ include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
AM_CONDITIONAL(NULL_TARGET, 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(CANADIAN, test "$CANADIAN" = yes)
AC_CACHE_SAVE
AC_LC_MESSAGES
@ -274,6 +275,12 @@ if test x${version_specific_libs} = xyes; then
AC_MSG_WARN(version specific directory is: $gcc_version)
fi
# We have to install all the generated or linked includes files
# specified as build_headers in src/Makefile.am in a target-dependent
# place, or else multiple installs for different compilers will
# overwrite these files.
gxx_target_include_dir='$(exec_prefix)/$(target_alias)/include/g++-$(libstdcxx_interface)'
AC_SUBST(gxx_target_include_dir)
# Export all the include and flag information to makefiles.

19
libstdc++-v3/configure.target
View File

@ -118,31 +118,14 @@ esac
# THIS TABLE IS SORTED. KEEP IT THAT WAY.
case "${target}" in
arm*-*-aout | arm*-*-elf)
# Assume newlib
os_include_dir=config/os/newlib
ATOMICITYH=$cpu_include_dir
;;
*-*-aix*)
ATOMICITYH=$os_include_dir
;;
*-*-freebsd*)
ATOMICITYH=$cpu_include_dir
;;
*-*-irix*)
ATOMICITYH=$os_include_dir
;;
*-*-linux*)
ATOMICITYH=$cpu_include_dir
;;
*-*-netbsd*)
ATOMICITYH=$cpu_include_dir
;;
sparc*-*-*)
ATOMICITYH=$cpu_include_dir
;;
*)
ATOMICITYH="config/cpu/generic"
ATOMICITYH=$cpu_include_dir
;;
esac

1
libstdc++-v3/libio/Makefile.in
View File

@ -104,6 +104,7 @@ enable_static = @enable_static@
gcc_version = @gcc_version@
glibcpp_basedir = @glibcpp_basedir@
gxx_include_dir = @gxx_include_dir@
gxx_target_include_dir = @gxx_target_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@

1
libstdc++-v3/libmath/Makefile.in
View File

@ -104,6 +104,7 @@ enable_static = @enable_static@
gcc_version = @gcc_version@
glibcpp_basedir = @glibcpp_basedir@
gxx_include_dir = @gxx_include_dir@
gxx_target_include_dir = @gxx_target_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@

1
libstdc++-v3/libsupc++/Makefile.in
View File

@ -101,6 +101,7 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
glibcpp_basedir = @glibcpp_basedir@
gxx_include_dir = @gxx_include_dir@
gxx_target_include_dir = @gxx_target_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@

9
libstdc++-v3/src/Makefile.am
View File

@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
## $Id: Makefile.am,v 1.57 2000/12/10 20:51:22 apbianco Exp $
## $Id: Makefile.am,v 1.58 2000/12/15 00:55:02 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
@ -233,6 +233,8 @@ myincludep = $(prefix)/include/g++-@libstdcxx_interface@
endif
endif
targetincludep = @gxx_target_include_dir@
# We have our own special, ridiculously complicated installation routine
# here, as automake/autoconf is currently brain-damaged when it comes
# to installing sub-directories of headers. In particular, we want to
@ -253,6 +255,7 @@ myinstalldirs:
if test -z "$(MULTISUBDIR)"; then \
$(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \
$(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \
$(mkinstalldirs) $(DESTDIR)$(targetincludep)/bits; \
fi
# NB: As libio_headers may be empty, need this to make sure bash doesn't
@ -284,8 +287,8 @@ myinstallheaders:
$(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep); \
done; \
for i in $(build_headers); do \
echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/"; \
$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/; \
echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/"; \
$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/; \
done; \
libio_headers_install='$(libio_headers)'; \
for i in $$libio_headers_install; do \

8
libstdc++-v3/src/Makefile.in
View File

@ -101,6 +101,7 @@ enable_shared = @enable_shared@
enable_static = @enable_static@
glibcpp_basedir = @glibcpp_basedir@
gxx_include_dir = @gxx_include_dir@
gxx_target_include_dir = @gxx_target_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
@ -195,6 +196,8 @@ libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@
targetincludep = @gxx_target_include_dir@
# NB: As libio_headers may be empty, need this to make sure bash doesn't
# choke on an empty for... loop by using libio_headers_install
# NB: installation of shadow headers is not attempted.
@ -526,6 +529,7 @@ myinstalldirs:
if test -z "$(MULTISUBDIR)"; then \
$(mkinstalldirs) $(DESTDIR)$(myincludep)/bits; \
$(mkinstalldirs) $(DESTDIR)$(myincludep)/ext; \
$(mkinstalldirs) $(DESTDIR)$(targetincludep)/bits; \
fi
myinstallheaders:
if test -z "$(MULTISUBDIR)"; then \
@ -550,8 +554,8 @@ myinstallheaders:
$(INSTALL_DATA) $(src_incdir)/std/$$i $(myincludep); \
done; \
for i in $(build_headers); do \
echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/"; \
$(INSTALL_DATA) $(bld_incdir)/$$i $(myincludep)/bits/; \
echo "$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/"; \
$(INSTALL_DATA) $(bld_incdir)/$$i $(targetincludep)/bits/; \
done; \
libio_headers_install='$(libio_headers)'; \
for i in $$libio_headers_install; do \