Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/lib/libstdc++-v3 - libmath is gone.



details:   https://anonhg.NetBSD.org/src/rev/f930ee78263d
branches:  trunk
changeset: 766566:f930ee78263d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 28 04:08:57 2011 +0000

description:
- libmath is gone.
- add a bunch of file-specific CPP and compiler directives necessary.
  with a sucessful mknative-gcc run, this appears to run.  haven't yet
  confirmed that the resultant library is usable.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/Makefile |  32 ++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 20b8a252e146 -r f930ee78263d external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Tue Jun 28 04:07:36 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Tue Jun 28 04:08:57 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 12:16:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/28 04:08:57 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -26,12 +26,13 @@
 
 .include "${.CURDIR}/../libsupc++/Makefile.common"
 
-SRCS=          ${LIBMATHSRCS} ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
+SRCS=          ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
 # affects profiling; can't switch it off just for profiling easily.
 #CXXFLAGS+=    ${G_SECTION_FLAGS}
 #CXXFLAGS+=    -ffunction-sections -fdata-sections 
 CXXFLAGS+=     -fno-implicit-templates -fdiagnostics-show-location=once
 CPPFLAGS+=     -I${DIST}/libstdc++-v3/include
+CPPFLAGS+=     -I${.CURDIR}/arch/${MACHINE_ARCH}
 
 CONF=          ${DIST}/libstdc++-v3/config
 
@@ -50,6 +51,32 @@
 COPTS.concept-inst.cc= -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates
 CPPFLAGS.strstream.cc= -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
 
+# For GCC 4.5
+.if ${HAVE_GCC} >= 45
+# XXX also need this for some PCHs.
+CPPFLAGS.atomic.cc = -std=gnu++0x
+CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
+CPPFLAGS.functexcept.cc = -std=gnu++0x
+CPPFLAGS.hash_c++0x.cc = -std=gnu++0x
+CPPFLAGS.hashtable_c++0x.cc = -std=gnu++0x
+CPPFLAGS.limits.cc = -std=gnu++0x
+CPPFLAGS.system_error.cc = -std=gnu++0x
+CPPFLAGS.fstream-inst.cc = -std=gnu++0x
+CPPFLAGS.string-inst.cc = -std=gnu++0x
+CPPFLAGS.wstring-inst.cc = -std=gnu++0x
+CPPFLAGS.mutex.cc = -std=gnu++0x
+CPPFLAGS.condition_variable.cc = -std=gnu++0x
+CPPFLAGS.chrono.cc = -std=gnu++0x
+CPPFLAGS.thread.cc = -std=gnu++0x
+CPPFLAGS.future.cc = -std=gnu++0x
+
+CPPFLAGS.cp-demangle.cc += -DIN_GLIBCPP_V3
+CPPFLAGS.concept-inst.cc += -D_GLIBCXX_CONCEPT_CHECKS
+CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
+CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
+CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
+.endif
+
 # XXX
 MKDEPFLAGS+=   -I$(GLIBCPP_INCLUDE_DIR)/backward
 
@@ -122,7 +149,6 @@
 CLEANFILES+= unwind.h
 
 .PATH: ${DIST}/libstdc++-v3/src \
-       ${DIST}/libstdc++-v3/libmath \
        ${DIST}/libstdc++-v3/libsupc++ \
        ${DIST}/libiberty \
        ${CONF}/locale/generic \



Home | Main Index | Thread Index | Old Index