Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/gpl3/gcc/lib/libstdc++-v3/Makefile,v
retrieving revision 1.9
diff -p -r1.9 Makefile
*** Makefile	1 Mar 2014 10:00:45 -0000	1.9
--- Makefile	16 May 2014 00:21:29 -0000
*************** CONF=		${DIST}/libstdc++-v3/config
*** 40,57 ****
  
  GLIBCPP_INCLUDE_DIR=	${DESTDIR}/usr/include/g++
  
! .if ${HAVE_GCC} >= 48
! # Template instantiation bug workaround for -Os
! .if (${MACHINE_ARCH} == "coldfire" || \
!      ${MACHINE_ARCH} == "sh3eb" || \
!      ${MACHINE_ARCH} == "sh3el" || \
!      ${MACHINE_ARCH} == "m68k" || \
!      ${MACHINE_ARCH} == "m68000" || \
!      ${MACHINE_ARCH} == "vax")
! COPTS.hashtable_c++0x.cc = -O2
! COPTS.bitmap_allocator.cc = -O2
! .endif
! .endif
  COPTS.cp-demangle.c = -Wno-stack-protector
  COPTS.cp-demangle.c = -Wno-stack-protector
  COPTS.fstream-inst.cc = -Wno-stack-protector
--- 40,46 ----
  
  GLIBCPP_INCLUDE_DIR=	${DESTDIR}/usr/include/g++
  
! # Template instantiation bug workaround for -O<2/s
  COPTS.cp-demangle.c = -Wno-stack-protector
  COPTS.cp-demangle.c = -Wno-stack-protector
  COPTS.fstream-inst.cc = -Wno-stack-protector
*************** COPTS.misc-inst.cc = -Wno-stack-protecto
*** 60,66 ****
  COPTS.ostream-inst.cc = -Wno-stack-protector
  COPTS.valarray-inst.cc = -Wno-stack-protector
  COPTS.wlocale-inst.cc = -Wno-stack-protector
! COPTS.concept-inst.cc=	-D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates
  CPPFLAGS.strstream.cc=	-I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
  
  # For GCC 4.5
--- 49,57 ----
  COPTS.ostream-inst.cc = -Wno-stack-protector
  COPTS.valarray-inst.cc = -Wno-stack-protector
  COPTS.wlocale-inst.cc = -Wno-stack-protector
! COPTS.concept-inst.cc=	-fimplicit-templates
! COPTS.hashtable_c++0x.cc=  -fimplicit-templates
! COPTS.bitmap_allocator.cc = -fimplicit-templates
  CPPFLAGS.strstream.cc=	-I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
  
  # For GCC 4.5