Attachment #133646 for bug #178143

View | Details | Raw Unified | Return to bug 178143
Collapse All | Expand All




# Created by: John Marino <draco@marino.st> 
# Date created:                       2012-07-15
# Whom:                               John Marino <draco@marino.st>
#
# $FreeBSD: ports/lang/gcc-aux/Makefile,v 1.3 2012/11/17 05:58:50 svnexp Exp $
#

PORTNAME=	gcc-aux
PORTVERSION=	${SNAPSHOT}
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
		http://dragonlace.mirrors.ada.cx/src/:boot \
		${MASTER_SITE_GCC}
MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
DISTFILES=	gcc-${GCC_VERSION}.tar.bz2

BOOTSTRAP_COMPILER=	NOT_REQUIRED
BOOTSTRAP_TRIPLET=	NOT_SET
FULL_GNATGCC=		NOT_SET
OS_LABEL4VERS=		[${OPSYS}]
GARCH=			${ARCH:S/amd64/x86_64/}

OPTIONS_DEFINE= 	ADA CXX FORT OBJC STATIC TESTSUITE NLS
OPTIONS_DEFAULT=	ADA CXX FORT OBJC
NO_OPTIONS_SORT=	yes

ADA_DESC=		Build Ada language
CXX_DESC=		Build C++ language
FORT_DESC=		Build Fortran language
OBJC_DESC=      	Build Objective-C language
STATIC_DESC=    	Build with no shared libraries other than libc
TESTSUITE_DESC=		Activate test support

.include <bsd.port.pre.mk>
.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD
.  if ${GARCH} == x86_64
OS_LABEL4VERS=		[FreeBSD64]
BOOTSTRAP_TRIPLET=	x86_64-bootstrap-freebsd8.1/4.6.0
.  else
.else
BLD_TARGET=		i386-aux-freebsd${OSREL}
OS_LABEL4VERS=		[FreeBSD]
BOOTSTRAP_TRIPLET=	i386-bootstrap-freebsd8.0/4.6.0
.  endif
.endif
.if ${OPSYS} == DragonFly
.  if ${GARCH} == x86_64
OS_LABEL4VERS=		[DragonFly64]
BOOTSTRAP_TRIPLET=	x86_64-bootstrap-dragonfly2.8/4.6.0
.  else
BOOTSTRAP_TRIPLET=	i386-bootstrap-dragonfly2.8/4.6.0
.  endif
.endif
BLD_TARGET=		${GARCH}-aux-${OPSYS:L}${OSREL}
BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:L}.tar.bz2

WRKSRC=			${WRKDIR}/gcc-${GCC_VERSION}
BUILDDIR=		${WRKDIR}/build

.endif

# If FULL_GNATGCC is not set, we'll request the bootstrap compiler
.if ${FULL_GNATGCC} == NOT_SET
INTENDED_COMPILER=BOOTSTRAP
FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc
FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin

# for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
.if defined(PLUS_BOOTSTRAPS)
DISTFILES=gcc-${GCC_VERSION}.tar.bz2 \
   gnat-bootstrap.i386.dragonfly.tar.bz2:boot \
   gnat-bootstrap.x86_64.dragonfly.tar.bz2:boot \
   gnat-bootstrap.i386.freebsd.tar.bz2:boot \
   gnat-bootstrap.x86_64.freebsd.tar.bz2:boot
.endif

##  Ada  ##
###########

.if ${PORT_OPTIONS:MADA}
LANGS+=		ada
APPLY_DIFFS+=	ada
.endif

##  C++  ##
###########

.if ${PORT_OPTIONS:MCXX}
LANGS+=		c++
APPLY_DIFFS+=	cxx
MAN1+=		g++.1

##  Fortran  ##
###############

.if ${PORT_OPTIONS:MFORT}
LANGS+=		fortran
APPLY_DIFFS+=	fortran
MAN1+=		gfortran.1

##  Objective-C  ##
###################

.if ${PORT_OPTIONS:MOBJC}
LANGS+=		objc
.endif


##  Testsuite Support  ##
#########################

.if ${PORT_OPTIONS:MTESTSUITE}
BUILD_DEPENDS=	dejagnu>=1.4:${PORTSDIR}/misc/dejagnu
APPLY_DIFFS+=	ada-testsuite
APPLY_DIFFS+=	fortran-testsuite

##  NATIONAL LANGUAGE SUPPORT  ##
#################################

.if ${PORT_OPTIONS:MNLS}
BUILD_DEPENDS=	gettext>=0.18:${PORTSDIR}/devel/gettext
EXTRA_CONFIG+=	--enable-nls
.else

	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}

	# Create new directories in preparation of applying diff files
.if ${PORT_OPTIONS:MCXX}
	${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly
	${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly
.endif


	# Update LINK_SPEC to add gcc-aux lib runpath in every binary
	@${ECHO} "Configuring LINK_SPEC runpath"
	@${PERL} -pi -e 's;\@PREFIX\@;${PREFIX};' \
	  ${WRKSRC}/gcc/config/dragonfly.h \
	  ${WRKSRC}/gcc/config/i386/freebsd64.h \
	  ${WRKSRC}/gcc/config/i386/freebsd.h

.if ${PORT_OPTIONS:MSTATIC}
	@${ECHO} "Reconfiguring GCC Makefile to build compiler statically"
	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-static-version
.if ${PORT_OPTIONS:MNLS}
	@${PERL} -pi -e 's;\@LIBINTL\@;${STINTL} ${STICONV};' ${WRKSRC}/intl/config.intl.in
	@${PERL} -pi -e 's;\@LIBICONV\@;;' \
	  ${WRKSRC}/gcc/Makefile.in \

.endif
.endif

.if ${INTENDED_COMPILER} == BOOTSTRAP
	${MKDIR} ${BOOTSTRAP_PREFIX}
	${MV} ${BOOTSTRAP_PREFIX}/../bin ${BOOTSTRAP_PREFIX}
	${MV} ${BOOTSTRAP_PREFIX}/../lib ${BOOTSTRAP_PREFIX}

	# Bootstrap compiler has statically linked z, gmp, mpc, mpfr and iconv
	# The only shared lib is libc.so.7, so it should work for a long time.

.if ${OSVERSION} > 900000
	# Since June 7, bootstrap compiler's include-fixed headers have been
	# incompatible with FreeBSD 9.0-CURRENT
	${RM} -rf ${BOOTSTRAP_PREFIX}/lib/gcc/${BOOTSTRAP_TRIPLET}/include-fixed
.endif
.endif

do-configure:
	${MKDIR} ${BUILDDIR}

test: build test-ada test-fortran test-objc test-cxx test-c

test-ada:
.if ${PORT_OPTIONS:MADA} && ${PORT_OPTIONS:MTESTSUITE}
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-ada
.endif

test-fortran:
.if ${PORT_OPTIONS:MFORT} && ${PORT_OPTIONS:MTESTSUITE}
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-fortran
.endif

test-objc:
.if ${PORT_OPTIONS:MOBJC} && ${PORT_OPTIONS:MTESTSUITE}
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-objc
.endif

test-cxx:
.if ${PORT_OPTIONS:MCXX} && ${PORT_OPTIONS:MTESTSUITE}
	# libstdc++ testsuite will break every time, TRUE used to force continuation
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c++ || true
.endif

test-c:
.if ${PORT_OPTIONS:MTESTSUITE}
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c
.endif

do-install:
	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${DESTINY}
	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/

post-install:
	${RM} -f ${WRKDIR}/PLIST.all

	   ${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all

	cd ${WRKDIR}; ${SED} -i -e "/PLIST.all/ r PLIST.all" ${TMPPLIST}
.if ${OPSYS} == FreeBSD
.  if ${OSVERSION} > 900000 && ${OSVERSION} < 900507
	@${ECHO_MSG} "===================================================================="
	@${ECHO_MSG} " NOTICE REGARDING ADA TASKING ON FREEBSD 9.0:"
	@${ECHO_MSG} " Due to a bug in the FreeBSD 9.0 threading library, an exiting task"

	@${ECHO_MSG} " 2) Patch and rebuild thread library as described in"
	@${ECHO_MSG} "    http://www.dragonlace.net/posts/F9_Fix/"
	@${ECHO_MSG} "===================================================================="
.  endif
.endif

.include <bsd.port.mk>

Lines 14-21 Link Here

(-)lang/gcc-aux/Makefile.common (-2 / +2 lines)
14	ALL_TARGET= default	14	ALL_TARGET= default
15	MAKE_JOBS_SAFE= yes	15	MAKE_JOBS_SAFE= yes
16		16
17	SNAPSHOT= 20120614	17	SNAPSHOT= 20130411
18	GCC_BRANCH= 4.7	18	GCC_BRANCH= 4.7
19	GCC_POINT= 1	19	GCC_POINT= 3
20	GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT}	20	GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT}
21		21

Lines 1-5 Link Here

(-)lang/gcc-aux/distinfo (-2 / +6 lines)
1	SHA256 (gcc-4.7.1.tar.bz2) = 16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f	1	SHA256 (gcc-4.7.3.tar.bz2) = 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
2	SIZE (gcc-4.7.1.tar.bz2) = 82639660	2	SIZE (gcc-4.7.3.tar.bz2) = 82904224
		3	SHA256 (gnat-bootstrap.i386.dragonfly.tar.bz2) = 9148952791231e7d302238b690b183af72867b19ecac8ac482f035c06583cb0c
		4	SIZE (gnat-bootstrap.i386.dragonfly.tar.bz2) = 28205489
		5	SHA256 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = ccd361f3fa15fad38ea68530b120517f0049767d6b98cf02898d5adf9ef2b23e
		6	SIZE (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 31380342
3	SHA256 (gnat-bootstrap.i386.freebsd.tar.bz2) = c38e1c960f651c3f248c1ef540b1df724058fa71c1d046af93ce975483abb645	7	SHA256 (gnat-bootstrap.i386.freebsd.tar.bz2) = c38e1c960f651c3f248c1ef540b1df724058fa71c1d046af93ce975483abb645
4	SIZE (gnat-bootstrap.i386.freebsd.tar.bz2) = 27973176	8	SIZE (gnat-bootstrap.i386.freebsd.tar.bz2) = 27973176
5	SHA256 (gnat-bootstrap.x86_64.freebsd.tar.bz2) = c4abd6af1281785d47d99352e28e41b2a1455e25ff347eca0de5791cdede9ed8	9	SHA256 (gnat-bootstrap.x86_64.freebsd.tar.bz2) = c4abd6af1281785d47d99352e28e41b2a1455e25ff347eca0de5791cdede9ed8




 /* VxWorks Section */
 /*******************/
 
@@ -2450,9 +2521,13 @@
    initialization of the FP processor.  This version is used under INTERIX
    and WIN32.  */
 

   EH_MECHANISM=-gcc
   THREADSLIB= -lpthread
   GMEM_LIB = gmemlib
@@ -1231,14 +1240,21 @@
   MISCLIB = -lutil
 endif
 
-ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
+
+# FREEBSD AMD64
 ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS = \
+  a-exetim.adb<a-exetim-posix.adb \
+  a-exetim.ads<a-exetim-default.ads \

   s-taprop.adb<s-taprop-posix.adb \
   s-taspri.ads<s-taspri-posix.ads \
   s-tpopsp.adb<s-tpopsp-posix.adb \
@@ -1246,10 +1262,11 @@
   $(ATOMICS_TARGET_PAIRS) \
   $(X86_64_TARGET_PAIRS) \
   system.ads<system-freebsd-x86_64.ads
 

+  EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+  EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
   EH_MECHANISM=-gcc
   THREADSLIB= -lpthread
   GMEM_LIB = gmemlib
@@ -1257,6 +1274,268 @@
   MISCLIB = -lutil
 endif
 
+
+# DRAGONFLY i386
+ifeq ($(strip $(filter-out %86 dragonfly%,$(arch) $(osys))),)

+  EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+  EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+
+  EH_MECHANISM=-gcc
+  THREADSLIB= -lpthread
+  GMEM_LIB = gmemlib
+  LIBRARY_VERSION := $(LIB_VERSION)
+  MISCLIB = -lutil
+endif
+
+
+# OPENBSD i386
+ifeq ($(strip $(filter-out %86 openbsd%,$(arch) $(osys))),)

 ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
   LIBGNAT_TARGET_PAIRS_COMMON = \
   a-intnam.ads<a-intnam-linux.ads \
@@ -2597,7 +2875,7 @@
 	$(MAKE) $(FLAGS_TO_PASS) \
              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
-	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
+	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
 	     MULTISUBDIR="$(MULTISUBDIR)" \
 	     THREAD_KIND="$(THREAD_KIND)" \
              gnatlib
--- gnattools/configure.orig
+++ gnattools/configure
@@ -2058,7 +2058,27 @@




+release
--- gcc/config.gcc.orig
+++ gcc/config.gcc
@@ -581,6 +581,9 @@
     "" | yes | posix)
       thread_file='posix'
       ;;

     *)
       echo 'Unknown thread configuration for FreeBSD'
       exit 1
@@ -597,6 +600,26 @@
   # need_64bit_hwint=yes # system compiler has this for all arch!
   use_gcc_stdint=wrap
   ;;

 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
   extra_options="$extra_options gnu-user.opt"
   gas=yes
@@ -652,6 +675,7 @@
   esac
   ;;
 *-*-netbsd*)

   tmake_file="t-slibgcc"
   gas=yes
   gnu_ld=yes
@@ -903,7 +927,32 @@
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
 	;;
-arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
+arm*-android-eabi*)
+  gas=yes
+  gnu_ld=yes

+  # Correctly modeling that requires the use of TImode.
+  need_64bit_hwint=yes
+  ;;
+arm*-*-symbianelf* | arm*-*-rtems*)
 	# The BPABI long long divmod functions return a 128-bit value in
 	# registers r0-r3.  Correctly modeling that requires the use of
 	# TImode.
@@ -912,11 +961,6 @@
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
 	tmake_file="arm/t-arm arm/t-arm-elf"
 	case ${target} in

-	  tmake_file="${tmake_file} arm/t-bpabi"
-	  use_gcc_stdint=wrap
-	  ;;
 	arm*-*-rtems*)
 	  tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
 	  tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
@@ -1216,19 +1260,31 @@
 x86_64-*-elf*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
 	;;

 	;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
@@ -3577,6 +3633,8 @@
 		;;
 	i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
 		;;

   enable_execute_stack=enable-execute-stack-mprotect.c
   ;;
 i[34567]86-*-mingw* | x86_64-*-mingw*)
@@ -358,11 +372,11 @@
 	tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
 	extra_parts="$extra_parts crti.o crtn.o"
 	;;
-arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
+arm*-*-symbianelf* | arm*-*-rtems*)
 	tmake_file="${tmake_file} arm/t-arm arm/t-elf t-fixedpoint-gnu-prefix"
 	tm_file="$tm_file arm/bpabi-lib.h"
 	case ${host} in
-	arm*-*-eabi* | arm*-*-rtems*)
+	arm*-*-rtems*)
 	  tmake_file="${tmake_file} arm/t-bpabi"
 	  extra_parts="crtbegin.o crtend.o crti.o crtn.o"
 	  ;;
@@ -526,16 +540,29 @@
 x86_64-*-elf*)
 	tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
 	;;

 	;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 	;;
@@ -1167,6 +1194,7 @@
   i[34567]86-*-gnu* | \
   i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
   i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \

+#endif
+
 #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
     && defined(__OpenBSD__)
 # define ElfW(type) Elf_##type
--- /dev/null
+++ libgcc/config/i386/dragonfly-unwind.h
@@ -0,0 +1,158 @@

 }
--- gcc/configure.orig
+++ gcc/configure
@@ -26902,6 +26902,20 @@
       gcc_cv_target_dl_iterate_phdr=no
     fi
     ;;

 if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
--- gcc/Makefile.in.orig
+++ gcc/Makefile.in
@@ -1165,7 +1165,6 @@
 	insn-automata.o \
 	insn-emit.o \
 	insn-extract.o \

 	insn-opinit.o \
 	insn-output.o \
 	insn-peep.o \
@@ -1484,13 +1483,18 @@
 ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
   $(OBJS-libcommon-target) @TREEBROWSER@ main.o gccspec.o cppspec.o \
   $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \

 	$(CPPLIB) $(LIBDECNUMBER)
 
 MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \
@@ -3522,6 +3526,8 @@
   $(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H)
 insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h	$(TM_H) \
   $(MACHMODE_H)

 insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h	\
   $(TM_H) $(RTL_H) $(TM_P_H) insn-config.h $(FLAGS_H) $(RECOG_H)	\
   $(EXPR_H) $(OPTABS_H) reload.h
@@ -3615,6 +3621,7 @@
 
 insn-modes.c: s-modes; @true
 insn-modes.h: s-modes-h; @true

 min-insn-modes.c: s-modes-m; @true
 
 s-modes: build/genmodes$(build_exeext)
@@ -3632,6 +3639,12 @@
 	$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c
 	$(STAMP) s-modes-m
 

 insn-preds.c: s-preds; @true
 tm-preds.h: s-preds-h; @true
 tm-constrs.h: s-constrs-h; @true
@@ -4394,7 +4407,7 @@
 	DESTDIR=$(@D) \
 	$(SHELL) $(srcdir)/doc/install.texi2html
 

 
 generated-manpages: man
 
@@ -4546,7 +4559,7 @@
 # Install the driver last so that the window when things are
 # broken is small.
 install: install-common $(INSTALL_HEADERS) \

     install-driver install-lto-wrapper install-gcc-ar
 
 ifeq ($(enable_plugin),yes)
@@ -4671,6 +4684,9 @@
 	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
 	-( cd $(DESTDIR)$(bindir) && \
 	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )

 	-if [ -f gcc-cross$(exeext) ] ; then \
 	  if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
 	    rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
@@ -4744,10 +4760,7 @@
 install-man: lang.install-man \
 	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
 	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \

 	-rm -f $@
--- configure.orig
+++ configure
@@ -14419,7 +14419,7 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5




 
--- libstdc++-v3/configure.orig
+++ libstdc++-v3/configure
@@ -15738,7 +15738,7 @@
 if test "${enable_clocale+set}" = set; then :
   enableval=$enable_clocale;
       case "$enableval" in

        *) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
 	  	        esac
 
@@ -15776,6 +15776,9 @@
       darwin* | freebsd*)
 	enable_clocale_flag=darwin
 	;;

       *)
 	if test x"$with_newlib" = x"yes"; then
 	  enable_clocale_flag=newlib
@@ -15917,7 +15920,23 @@
       CTIME_CC=config/locale/generic/time_members.cc
       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
       ;;

+  struct ctype_base
+  {
+    // Non-standard typedefs.
+    typedef const int*		__to_type;
+
+    // NB: Offsets into ctype<char>::_M_table force a particular size
+    // on the mask type. Because of this, we don't use an enum.

+} // namespace
--- /dev/null
+++ libstdc++-v3/config/os/bsd/dragonfly/ctype_inline.h
@@ -0,0 +1,161 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2000, 2003, 2004, 2005, 2009, 2010

+  bool
+  ctype<char>::
+  is(mask __m, char __c) const
+  {
+    if (_M_table)
+      return _M_table[static_cast<unsigned char>(__c)] & __m;
+    else
+      return __libc_ctype_ [__c + 1] & __m;
+  }
+
+  const char*
+  ctype<char>::
+  is(const char* __low, const char* __high, mask* __vec) const
+  {
+    if (_M_table)
+      while (__low < __high)
+	*__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
+    else
+      for (;__low < __high; ++__vec, ++__low)
+	{
+	  mask __m = 0;
+	  if (this->is(upper, *__low))  __m |= upper;
+	  if (this->is(lower, *__low))  __m |= lower;
+	  if (this->is(alpha, *__low))  __m |= alpha;
+	  if (this->is(digit, *__low))  __m |= digit;
+	  if (this->is(xdigit, *__low)) __m |= xdigit;
+	  if (this->is(space, *__low))  __m |= space;
+	  if (this->is(print, *__low))  __m |= print;
+	  if (this->is(graph, *__low))  __m |= graph;
+	  if (this->is(cntrl, *__low))  __m |= cntrl;
+	  if (this->is(punct, *__low))  __m |= punct;
+	  // Do not include explicit line for alnum mask since it is a
+	  // pure composite of masks on DragonFly.
+	  *__vec = __m;
+	}
+    return __high;
+  }
+

+  ctype<char>::
+  scan_is(mask __m, const char* __low, const char* __high) const
+  {
+    if (_M_table)
+      while (__low < __high
+	     && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
+	++__low;
+    else
+      while (__low < __high && !this->is(__m, *__low))
+	++__low;
+    return __low;
+  }
+

+  ctype<char>::
+  scan_not(mask __m, const char* __low, const char* __high) const
+  {
+    if (_M_table)
+      while (__low < __high
+	     && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
+	++__low;
+    else
+      while (__low < __high && this->is(__m, *__low) != 0)
+	++__low;
+    return __low;
+  }
+




 // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
 // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
 // { dg-require-cstdint "" }
--- libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc.orig
+++ libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc
@@ -1,5 +1,5 @@
-// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
-// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
+// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
+// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
 // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
 // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
 // { dg-require-cstdint "" }
--- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig
+++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
@@ -1,5 +1,5 @@

Return to bug 178143

Lines 2228-2234 Link Here

(-)lang/gcc-aux/files/diff-ada (-29 / +18 lines)
2228	/* VxWorks Section */	2228	/* VxWorks Section */
2229	/*******************/	2229	/*******************/
2230		2230
2231	@@ -2416,9 +2487,13 @@	2231	@@ -2450,9 +2521,13 @@
2232	initialization of the FP processor. This version is used under INTERIX	2232	initialization of the FP processor. This version is used under INTERIX
2233	and WIN32. */	2233	and WIN32. */
2234		2234
Lines 8971-8984 Link Here
8971	EH_MECHANISM=-gcc	8971	EH_MECHANISM=-gcc
8972	THREADSLIB= -lpthread	8972	THREADSLIB= -lpthread
8973	GMEM_LIB = gmemlib	8973	GMEM_LIB = gmemlib
8974	@@ -1231,26 +1240,101 @@	8974	@@ -1231,14 +1240,21 @@
8975	MISCLIB = -lutil	8975	MISCLIB = -lutil
8976	endif	8976	endif
8977		8977
8978	-ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
8979	+	8978	+
8980	+# FREEBSD AMD64	8979	+# FREEBSD AMD64
8981	+ifeq ($(strip $(filter-out x86_64 freebsd%,$(arch) $(osys))),)	8980	ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
8982	LIBGNAT_TARGET_PAIRS = \	8981	LIBGNAT_TARGET_PAIRS = \
8983	+ a-exetim.adb<a-exetim-posix.adb \	8982	+ a-exetim.adb<a-exetim-posix.adb \
8984	+ a-exetim.ads<a-exetim-default.ads \	8983	+ a-exetim.ads<a-exetim-default.ads \
Lines 8996-9003 Link Here
8996	s-taprop.adb<s-taprop-posix.adb \	8995	s-taprop.adb<s-taprop-posix.adb \
8997	s-taspri.ads<s-taspri-posix.ads \	8996	s-taspri.ads<s-taspri-posix.ads \
8998	s-tpopsp.adb<s-tpopsp-posix.adb \	8997	s-tpopsp.adb<s-tpopsp-posix.adb \
8999	- g-trasym.adb<g-trasym-dwarf.adb \	8998	@@ -1246,10 +1262,11 @@
9000	$(ATOMICS_TARGET_PAIRS) \
9001	$(X86_64_TARGET_PAIRS) \	8999	$(X86_64_TARGET_PAIRS) \
9002	system.ads<system-freebsd-x86_64.ads	9000	system.ads<system-freebsd-x86_64.ads
9003		9001
Lines 9008-9020 Link Here
9008	+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o	9006	+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
9009	+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o	9007	+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
9010	+	9008	+
9011	+ EH_MECHANISM=-gcc	9009	EH_MECHANISM=-gcc
9012	+ THREADSLIB= -lpthread	9010	THREADSLIB= -lpthread
9013	+ GMEM_LIB = gmemlib	9011	GMEM_LIB = gmemlib
9014	+ LIBRARY_VERSION := $(LIB_VERSION)	9012	@@ -1257,6 +1274,268 @@
9015	+ MISCLIB = -lutil	9013	MISCLIB = -lutil
9016	+endif	9014	endif
9017	+	9015
9018	+	9016	+
9019	+# DRAGONFLY i386	9017	+# DRAGONFLY i386
9020	+ifeq ($(strip $(filter-out %86 dragonfly%,$(arch) $(osys))),)	9018	+ifeq ($(strip $(filter-out %86 dragonfly%,$(arch) $(osys))),)
Lines 9076-9088 Link Here
9076	+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o	9074	+ EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
9077	+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o	9075	+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
9078	+	9076	+
9079	EH_MECHANISM=-gcc	9077	+ EH_MECHANISM=-gcc
9080	THREADSLIB= -lpthread	9078	+ THREADSLIB= -lpthread
9081	GMEM_LIB = gmemlib	9079	+ GMEM_LIB = gmemlib
9082	@@ -1258,6 +1342,200 @@	9080	+ LIBRARY_VERSION := $(LIB_VERSION)
9083	MISCLIB = -lutil	9081	+ MISCLIB = -lutil
9084	endif	9082	+endif
9085		9083	+
9086	+	9084	+
9087	+# OPENBSD i386	9085	+# OPENBSD i386
9088	+ifeq ($(strip $(filter-out %86 openbsd%,$(arch) $(osys))),)	9086	+ifeq ($(strip $(filter-out %86 openbsd%,$(arch) $(osys))),)
Lines 9280-9294 Link Here
9280	ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)	9278	ifeq ($(strip $(filter-out s390% linux%,$(arch) $(osys))),)
9281	LIBGNAT_TARGET_PAIRS_COMMON = \	9279	LIBGNAT_TARGET_PAIRS_COMMON = \
9282	a-intnam.ads<a-intnam-linux.ads \	9280	a-intnam.ads<a-intnam-linux.ads \
9283	@@ -2597,7 +2875,7 @@
9284	$(MAKE) $(FLAGS_TO_PASS) \
9285	GNATLIBFLAGS="$(GNATLIBFLAGS)" \
9286	GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
9287	- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
9288	+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
9289	MULTISUBDIR="$(MULTISUBDIR)" \
9290	THREAD_KIND="$(THREAD_KIND)" \
9291	gnatlib
9292	--- gnattools/configure.orig	9281	--- gnattools/configure.orig
9293	+++ gnattools/configure	9282	+++ gnattools/configure
9294	@@ -2058,7 +2058,27 @@	9283	@@ -2058,7 +2058,27 @@

Lines 1-16 Link Here

(-)lang/gcc-aux/Makefile (-46 / +52 lines)
1	# New ports collection makefile for: gcc-aux	1	# Created by: John Marino <draco@marino.st>
2	# Date created: 2012-07-15
3	# Whom: John Marino <draco@marino.st>
4	#
5	# $FreeBSD: ports/lang/gcc-aux/Makefile,v 1.3 2012/11/17 05:58:50 svnexp Exp $	2	# $FreeBSD: ports/lang/gcc-aux/Makefile,v 1.3 2012/11/17 05:58:50 svnexp Exp $
6	#
7		3
8	PORTNAME= gcc-aux	4	PORTNAME= gcc-aux
9	PORTVERSION= ${SNAPSHOT}	5	PORTVERSION= ${SNAPSHOT}
10	PORTREVISION= 1
11	CATEGORIES= lang	6	CATEGORIES= lang
12	MASTER_SITES= http://downloads.dragonlace.net/src/:boot \	7	MASTER_SITES= http://downloads.dragonlace.net/src/:boot \
13	http://dragonlace.mirrors.ada.cx/src/:boot \
14	${MASTER_SITE_GCC}	8	${MASTER_SITE_GCC}
15	MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION}	9	MASTER_SITE_SUBDIR= releases/gcc-${GCC_VERSION}
16	DISTFILES= gcc-${GCC_VERSION}.tar.bz2	10	DISTFILES= gcc-${GCC_VERSION}.tar.bz2
Lines 26-54 Link Here
26	BOOTSTRAP_COMPILER= NOT_REQUIRED	20	BOOTSTRAP_COMPILER= NOT_REQUIRED
27	BOOTSTRAP_TRIPLET= NOT_SET	21	BOOTSTRAP_TRIPLET= NOT_SET
28	FULL_GNATGCC= NOT_SET	22	FULL_GNATGCC= NOT_SET
		23	OS_LABEL4VERS= [${OPSYS}]
		24	GARCH= ${ARCH:S/amd64/x86_64/}
29		25
30	OPTIONS= ADA "Build Ada language" on	26	OPTIONS_DEFINE= ADA CXX FORT OBJC STATIC TESTSUITE NLS
31	OPTIONS+= CXX "Build C++ language" on	27	OPTIONS_DEFAULT= ADA CXX FORT OBJC
32	OPTIONS+= FORT "Build Fortran language" on	28	NO_OPTIONS_SORT= yes
33	OPTIONS+= OBJC "Build Objective-C language" on	29
34	OPTIONS+= STATIC "Build with no shared libraries other than libc" off	30	ADA_DESC= Build Ada language
35	OPTIONS+= TESTSUITE "Activate test support" off	31	CXX_DESC= Build C++ language
36	OPTIONS+= NLS "Native Language Support" off	32	FORT_DESC= Build Fortran language
		33	OBJC_DESC= Build Objective-C language
		34	STATIC_DESC= Build with no shared libraries other than libc
		35	TESTSUITE_DESC= Activate test support
37		36
38	.include <bsd.port.pre.mk>
39	.include <bsd.port.options.mk>	37	.include <bsd.port.options.mk>
40		38
41	.if ${ARCH} == "amd64"	39	.if ${OPSYS} == FreeBSD
42	BLD_TARGET= x86_64-aux-freebsd${OSREL}	40	. if ${GARCH} == x86_64
43	OS_LABEL4VERS= [FreeBSD64]	41	OS_LABEL4VERS= [FreeBSD64]
44	BOOTSTRAP_TRIPLET= x86_64-bootstrap-freebsd8.1/4.6.0	42	BOOTSTRAP_TRIPLET= x86_64-bootstrap-freebsd8.1/4.6.0
45	BOOTSTRAP_COMPILER= gnat-bootstrap.x86_64.freebsd.tar.bz2	43	. else
46	.else
47	BLD_TARGET= i386-aux-freebsd${OSREL}
48	OS_LABEL4VERS= [FreeBSD]
49	BOOTSTRAP_TRIPLET= i386-bootstrap-freebsd8.0/4.6.0	44	BOOTSTRAP_TRIPLET= i386-bootstrap-freebsd8.0/4.6.0
50	BOOTSTRAP_COMPILER= gnat-bootstrap.i386.freebsd.tar.bz2	45	. endif
51	.endif	46	.endif
		47	.if ${OPSYS} == DragonFly
		48	. if ${GARCH} == x86_64
		49	OS_LABEL4VERS= [DragonFly64]
		50	BOOTSTRAP_TRIPLET= x86_64-bootstrap-dragonfly2.8/4.6.0
		51	. else
		52	BOOTSTRAP_TRIPLET= i386-bootstrap-dragonfly2.8/4.6.0
		53	. endif
		54	.endif
		55	BLD_TARGET= ${GARCH}-aux-${OPSYS:L}${OSREL}
		56	BOOTSTRAP_COMPILER= gnat-bootstrap.${GARCH}.${OPSYS:L}.tar.bz2
52		57
53	WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}	58	WRKSRC= ${WRKDIR}/gcc-${GCC_VERSION}
54	BUILDDIR= ${WRKDIR}/build	59	BUILDDIR= ${WRKDIR}/build
Lines 79-85 Link Here
79	.endif	84	.endif
80		85
81	# If FULL_GNATGCC is not set, we'll request the bootstrap compiler	86	# If FULL_GNATGCC is not set, we'll request the bootstrap compiler
82	.if ${FULL_GNATGCC} == "NOT_SET"	87	.if ${FULL_GNATGCC} == NOT_SET
83	INTENDED_COMPILER=BOOTSTRAP	88	INTENDED_COMPILER=BOOTSTRAP
84	FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc	89	FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gnatgcc
85	FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin	90	FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin
Lines 89-94 Link Here
89	# for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"	94	# for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
90	.if defined(PLUS_BOOTSTRAPS)	95	.if defined(PLUS_BOOTSTRAPS)
91	DISTFILES=gcc-${GCC_VERSION}.tar.bz2 \	96	DISTFILES=gcc-${GCC_VERSION}.tar.bz2 \
		97	gnat-bootstrap.i386.dragonfly.tar.bz2:boot \
		98	gnat-bootstrap.x86_64.dragonfly.tar.bz2:boot \
92	gnat-bootstrap.i386.freebsd.tar.bz2:boot \	99	gnat-bootstrap.i386.freebsd.tar.bz2:boot \
93	gnat-bootstrap.x86_64.freebsd.tar.bz2:boot	100	gnat-bootstrap.x86_64.freebsd.tar.bz2:boot
94	.endif	101	.endif
Lines 97-103 Link Here
97	## Ada ##	104	## Ada ##
98	###########	105	###########
99		106
100	.if defined(WITH_ADA)	107	.if ${PORT_OPTIONS:MADA}
101	LANGS+= ada	108	LANGS+= ada
102	APPLY_DIFFS+= ada	109	APPLY_DIFFS+= ada
103	.endif	110	.endif
Lines 106-112 Link Here
106	## C++ ##	113	## C++ ##
107	###########	114	###########
108		115
109	.if defined(WITH_CXX)	116	.if ${PORT_OPTIONS:MCXX}
110	LANGS+= c++	117	LANGS+= c++
111	APPLY_DIFFS+= cxx	118	APPLY_DIFFS+= cxx
112	MAN1+= g++.1	119	MAN1+= g++.1
Lines 116-122 Link Here
116	## Fortran ##	123	## Fortran ##
117	###############	124	###############
118		125
119	.if defined(WITH_FORT)	126	.if ${PORT_OPTIONS:MFORT}
120	LANGS+= fortran	127	LANGS+= fortran
121	APPLY_DIFFS+= fortran	128	APPLY_DIFFS+= fortran
122	MAN1+= gfortran.1	129	MAN1+= gfortran.1
Lines 129-135 Link Here
129	## Objective-C ##	136	## Objective-C ##
130	###################	137	###################
131		138
132	.if defined(WITH_OBJC)	139	.if ${PORT_OPTIONS:MOBJC}
133	LANGS+= objc	140	LANGS+= objc
134	.endif	141	.endif
135		142
Lines 137-143 Link Here
137	## Testsuite Support ##	144	## Testsuite Support ##
138	#########################	145	#########################
139		146
140	.if defined(WITH_TESTSUITE)	147	.if ${PORT_OPTIONS:MTESTSUITE}
141	BUILD_DEPENDS= dejagnu>=1.4:${PORTSDIR}/misc/dejagnu	148	BUILD_DEPENDS= dejagnu>=1.4:${PORTSDIR}/misc/dejagnu
142	APPLY_DIFFS+= ada-testsuite	149	APPLY_DIFFS+= ada-testsuite
143	APPLY_DIFFS+= fortran-testsuite	150	APPLY_DIFFS+= fortran-testsuite
Lines 149-155 Link Here
149	## NATIONAL LANGUAGE SUPPORT ##	156	## NATIONAL LANGUAGE SUPPORT ##
150	#################################	157	#################################
151		158
152	.if defined(WITH_NLS)	159	.if ${PORT_OPTIONS:MNLS}
153	BUILD_DEPENDS= gettext>=0.18:${PORTSDIR}/devel/gettext	160	BUILD_DEPENDS= gettext>=0.18:${PORTSDIR}/devel/gettext
154	EXTRA_CONFIG+= --enable-nls	161	EXTRA_CONFIG+= --enable-nls
155	.else	162	.else
Lines 191-197 Link Here
191	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}	198	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}
192		199
193	# Create new directories in preparation of applying diff files	200	# Create new directories in preparation of applying diff files
194	.if defined(WITH_CXX)	201	.if ${PORT_OPTIONS:MCXX}
195	${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly	202	${MKDIR} ${WRKSRC}/libstdc++-v3/config/locale/dragonfly
196	${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly	203	${MKDIR} ${WRKSRC}/libstdc++-v3/config/os/bsd/dragonfly
197	.endif	204	.endif
Lines 204-217 Link Here
204		211
205	# Update LINK_SPEC to add gcc-aux lib runpath in every binary	212	# Update LINK_SPEC to add gcc-aux lib runpath in every binary
206	@${ECHO} "Configuring LINK_SPEC runpath"	213	@${ECHO} "Configuring LINK_SPEC runpath"
207	@perl -pi -e 's;\@PREFIX\@;${PREFIX};' \	214	@${PERL} -pi -e 's;\@PREFIX\@;${PREFIX};' \
		215	${WRKSRC}/gcc/config/dragonfly.h \
208	${WRKSRC}/gcc/config/i386/freebsd64.h \	216	${WRKSRC}/gcc/config/i386/freebsd64.h \
209	${WRKSRC}/gcc/config/i386/freebsd.h	217	${WRKSRC}/gcc/config/i386/freebsd.h
210		218
211	.if defined(WITH_STATIC)	219	.if ${PORT_OPTIONS:MSTATIC}
212	@${ECHO} "Reconfiguring GCC Makefile to build compiler statically"	220	@${ECHO} "Reconfiguring GCC Makefile to build compiler statically"
213	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-static-version	221	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-static-version
214	.if defined(WITH_NLS)	222	.if ${PORT_OPTIONS:MNLS}
215	@${PERL} -pi -e 's;\@LIBINTL\@;${STINTL} ${STICONV};' ${WRKSRC}/intl/config.intl.in	223	@${PERL} -pi -e 's;\@LIBINTL\@;${STINTL} ${STICONV};' ${WRKSRC}/intl/config.intl.in
216	@${PERL} -pi -e 's;\@LIBICONV\@;;' \	224	@${PERL} -pi -e 's;\@LIBICONV\@;;' \
217	${WRKSRC}/gcc/Makefile.in \	225	${WRKSRC}/gcc/Makefile.in \
Lines 225-231 Link Here
225	.endif	233	.endif
226	.endif	234	.endif
227		235
228	.if ${INTENDED_COMPILER} == "BOOTSTRAP"	236	.if ${INTENDED_COMPILER} == BOOTSTRAP
229	${MKDIR} ${BOOTSTRAP_PREFIX}	237	${MKDIR} ${BOOTSTRAP_PREFIX}
230	${MV} ${BOOTSTRAP_PREFIX}/../bin ${BOOTSTRAP_PREFIX}	238	${MV} ${BOOTSTRAP_PREFIX}/../bin ${BOOTSTRAP_PREFIX}
231	${MV} ${BOOTSTRAP_PREFIX}/../lib ${BOOTSTRAP_PREFIX}	239	${MV} ${BOOTSTRAP_PREFIX}/../lib ${BOOTSTRAP_PREFIX}
Lines 234-245 Link Here
234	# Bootstrap compiler has statically linked z, gmp, mpc, mpfr and iconv	242	# Bootstrap compiler has statically linked z, gmp, mpc, mpfr and iconv
235	# The only shared lib is libc.so.7, so it should work for a long time.	243	# The only shared lib is libc.so.7, so it should work for a long time.
236		244
237	.if ${OSVERSION} > 900000
238	# Since June 7, bootstrap compiler's include-fixed headers have been
239	# incompatible with FreeBSD 9.0-CURRENT
240	${RM} -rf ${BOOTSTRAP_PREFIX}/lib/gcc/${BOOTSTRAP_TRIPLET}/include-fixed	245	${RM} -rf ${BOOTSTRAP_PREFIX}/lib/gcc/${BOOTSTRAP_TRIPLET}/include-fixed
241	.endif	246	.endif
242	.endif
243		247
244	do-configure:	248	do-configure:
245	${MKDIR} ${BUILDDIR}	249	${MKDIR} ${BUILDDIR}
Lines 252-285 Link Here
252	test: build test-ada test-fortran test-objc test-cxx test-c	256	test: build test-ada test-fortran test-objc test-cxx test-c
253		257
254	test-ada:	258	test-ada:
255	.if defined(WITH_ADA) && defined(WITH_TESTSUITE)	259	.if ${PORT_OPTIONS:MADA} && ${PORT_OPTIONS:MTESTSUITE}
256	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-ada	260	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-ada
257	.endif	261	.endif
258		262
259	test-fortran:	263	test-fortran:
260	.if defined(WITH_FORT) && defined(WITH_TESTSUITE)	264	.if ${PORT_OPTIONS:MFORT} && ${PORT_OPTIONS:MTESTSUITE}
261	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-fortran	265	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-fortran
262	.endif	266	.endif
263		267
264	test-objc:	268	test-objc:
265	.if defined(WITH_OBJC) && defined(WITH_TESTSUITE)	269	.if ${PORT_OPTIONS:MOBJC} && ${PORT_OPTIONS:MTESTSUITE}
266	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-objc	270	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-objc
267	.endif	271	.endif
268		272
269	test-cxx:	273	test-cxx:
270	.if defined(WITH_CXX) && defined(WITH_TESTSUITE)	274	.if ${PORT_OPTIONS:MCXX} && ${PORT_OPTIONS:MTESTSUITE}
271	# libstdc++ testsuite will break every time, TRUE used to force continuation	275	# libstdc++ testsuite will break every time, TRUE used to force continuation
272	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c++ \|\| true	276	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c++ \|\| true
273	.endif	277	.endif
274		278
275	test-c:	279	test-c:
276	.if defined(WITH_TESTSUITE)	280	.if ${PORT_OPTIONS:MTESTSUITE}
277	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c	281	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} -sk check-c
278	.endif	282	.endif
279		283
280	do-install:	284	do-install:
281	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${DESTINY}	285	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${GMAKE} install-strip DESTDIR=${DESTINY}
282	${CP} -pr ${DESTINY}${PREFIX}/ ${PREFIX}/	286	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
283		287
284	post-install:	288	post-install:
285	${RM} -f ${WRKDIR}/PLIST.all	289	${RM} -f ${WRKDIR}/PLIST.all
Lines 293-299 Link Here
293	${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all	297	${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
294		298
295	cd ${WRKDIR}; ${SED} -i -e "/PLIST.all/ r PLIST.all" ${TMPPLIST}	299	cd ${WRKDIR}; ${SED} -i -e "/PLIST.all/ r PLIST.all" ${TMPPLIST}
296	.if ${OSVERSION} > 900000 && ${OSVERSION} < 900507	300	.if ${OPSYS} == FreeBSD
		301	. if ${OSVERSION} > 900000 && ${OSVERSION} < 900507
297	@${ECHO_MSG} "===================================================================="	302	@${ECHO_MSG} "===================================================================="
298	@${ECHO_MSG} " NOTICE REGARDING ADA TASKING ON FREEBSD 9.0:"	303	@${ECHO_MSG} " NOTICE REGARDING ADA TASKING ON FREEBSD 9.0:"
299	@${ECHO_MSG} " Due to a bug in the FreeBSD 9.0 threading library, an exiting task"	304	@${ECHO_MSG} " Due to a bug in the FreeBSD 9.0 threading library, an exiting task"
Lines 303-308 Link Here
303	@${ECHO_MSG} " 2) Patch and rebuild thread library as described in"	308	@${ECHO_MSG} " 2) Patch and rebuild thread library as described in"
304	@${ECHO_MSG} " http://www.dragonlace.net/posts/F9_Fix/"	309	@${ECHO_MSG} " http://www.dragonlace.net/posts/F9_Fix/"
305	@${ECHO_MSG} "===================================================================="	310	@${ECHO_MSG} "===================================================================="
		311	. endif
306	.endif	312	.endif
307		313
308	.include <bsd.port.post.mk>	314	.include <bsd.port.mk>

Lines 4-10 Link Here

(-)lang/gcc-aux/files/diff-core (-32 / +32 lines)
4	+release	4	+release
5	--- gcc/config.gcc.orig	5	--- gcc/config.gcc.orig
6	+++ gcc/config.gcc	6	+++ gcc/config.gcc
7	@@ -573,6 +573,9 @@	7	@@ -581,6 +581,9 @@
8	"" \| yes \| posix)	8	"" \| yes \| posix)
9	thread_file='posix'	9	thread_file='posix'
10	;;	10	;;
Lines 14-20 Link Here
14	*)	14	*)
15	echo 'Unknown thread configuration for FreeBSD'	15	echo 'Unknown thread configuration for FreeBSD'
16	exit 1	16	exit 1
17	@@ -589,6 +592,26 @@	17	@@ -597,6 +600,26 @@
18	# need_64bit_hwint=yes # system compiler has this for all arch!	18	# need_64bit_hwint=yes # system compiler has this for all arch!
19	use_gcc_stdint=wrap	19	use_gcc_stdint=wrap
20	;;	20	;;
Lines 41-47 Link Here
41	--linux* \| frv--linux* \| --kfreebsd-gnu \| --knetbsd-gnu \| --gnu* \| --kopensolaris*-gnu)	41	--linux* \| frv--linux* \| --kfreebsd-gnu \| --knetbsd-gnu \| --gnu* \| --kopensolaris*-gnu)
42	extra_options="$extra_options gnu-user.opt"	42	extra_options="$extra_options gnu-user.opt"
43	gas=yes	43	gas=yes
44	@@ -644,6 +667,7 @@	44	@@ -652,6 +675,7 @@
45	esac	45	esac
46	;;	46	;;
47	--netbsd*)	47	--netbsd*)
Lines 49-59 Link Here
49	tmake_file="t-slibgcc"	49	tmake_file="t-slibgcc"
50	gas=yes	50	gas=yes
51	gnu_ld=yes	51	gnu_ld=yes
52	@@ -885,7 +909,32 @@	52	@@ -903,7 +927,32 @@
53	tm_file="dbxelf.h elfos.h newlib-stdint.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"	53	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
54	tmake_file="arm/t-arm arm/t-arm-elf"	54	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
55	;;	55	;;
56	-arm--eabi* \| arm--symbianelf* \| arm--rtemseabi*)	56	-arm--eabi* \| arm--symbianelf* \| arm--rtems*)
57	+arm-android-eabi)	57	+arm-android-eabi)
58	+ gas=yes	58	+ gas=yes
59	+ gnu_ld=yes	59	+ gnu_ld=yes
Lines 79-89 Link Here
79	+ # Correctly modeling that requires the use of TImode.	79	+ # Correctly modeling that requires the use of TImode.
80	+ need_64bit_hwint=yes	80	+ need_64bit_hwint=yes
81	+ ;;	81	+ ;;
82	+arm--symbianelf* \| arm--rtemseabi*)	82	+arm--symbianelf* \| arm--rtems*)
83	# The BPABI long long divmod functions return a 128-bit value in	83	# The BPABI long long divmod functions return a 128-bit value in
84	# registers r0-r3. Correctly modeling that requires the use of	84	# registers r0-r3. Correctly modeling that requires the use of
85	# TImode.	85	# TImode.
86	@@ -894,11 +943,6 @@	86	@@ -912,11 +961,6 @@
87	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"	87	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
88	tmake_file="arm/t-arm arm/t-arm-elf"	88	tmake_file="arm/t-arm arm/t-arm-elf"
89	case ${target} in	89	case ${target} in
Lines 92-101 Link Here
92	- tmake_file="${tmake_file} arm/t-bpabi"	92	- tmake_file="${tmake_file} arm/t-bpabi"
93	- use_gcc_stdint=wrap	93	- use_gcc_stdint=wrap
94	- ;;	94	- ;;
95	arm--rtemseabi*)	95	arm--rtems*)
96	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"	96	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
97	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"	97	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
98	@@ -1196,19 +1240,31 @@	98	@@ -1216,19 +1260,31 @@
99	x86_64--elf)	99	x86_64--elf)
100	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"	100	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
101	;;	101	;;
Lines 129-135 Link Here
129	;;	129	;;
130	i[34567]86--openbsd2.\|i[34567]86-*openbsd3.[0123])	130	i[34567]86--openbsd2.\|i[34567]86-*openbsd3.[0123])
131	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"	131	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
132	@@ -3530,6 +3586,8 @@	132	@@ -3577,6 +3633,8 @@
133	;;	133	;;
134	i[34567]86--cygwin \| i[34567]86--mingw \| x86_64--mingw)	134	i[34567]86--cygwin \| i[34567]86--mingw \| x86_64--mingw)
135	;;	135	;;
Lines 768-788 Link Here
768	enable_execute_stack=enable-execute-stack-mprotect.c	768	enable_execute_stack=enable-execute-stack-mprotect.c
769	;;	769	;;
770	i[34567]86--mingw \| x86_64--mingw)	770	i[34567]86--mingw \| x86_64--mingw)
771	@@ -354,11 +368,11 @@	771	@@ -358,11 +372,11 @@
772	tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"	772	tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
773	extra_parts="$extra_parts crti.o crtn.o"	773	extra_parts="$extra_parts crti.o crtn.o"
774	;;	774	;;
775	-arm--eabi* \| arm--symbianelf* \| arm--rtemseabi*)	775	-arm--eabi* \| arm--symbianelf* \| arm--rtems*)
776	+arm--symbianelf* \| arm--rtemseabi*)	776	+arm--symbianelf* \| arm--rtems*)
777	tmake_file="${tmake_file} arm/t-arm arm/t-elf t-fixedpoint-gnu-prefix"	777	tmake_file="${tmake_file} arm/t-arm arm/t-elf t-fixedpoint-gnu-prefix"
778	tm_file="$tm_file arm/bpabi-lib.h"	778	tm_file="$tm_file arm/bpabi-lib.h"
779	case ${host} in	779	case ${host} in
780	- arm--eabi* \| arm--rtemseabi*)	780	- arm--eabi* \| arm--rtems*)
781	+ arm--rtemseabi*)	781	+ arm--rtems*)
782	tmake_file="${tmake_file} arm/t-bpabi"	782	tmake_file="${tmake_file} arm/t-bpabi"
783	extra_parts="crtbegin.o crtend.o crti.o crtn.o"	783	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
784	;;	784	;;
785	@@ -523,16 +537,29 @@	785	@@ -526,16 +540,29 @@
786	x86_64--elf)	786	x86_64--elf)
787	tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"	787	tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
788	;;	788	;;
Lines 812-818 Link Here
812	;;	812	;;
813	i[34567]86--openbsd2.\|i[34567]86-*openbsd3.[0123])	813	i[34567]86--openbsd2.\|i[34567]86-*openbsd3.[0123])
814	;;	814	;;
815	@@ -1160,6 +1187,7 @@	815	@@ -1167,6 +1194,7 @@
816	i[34567]86--gnu \| \	816	i[34567]86--gnu \| \
817	i[34567]86--solaris2 \| x86_64--solaris2.1[0-9] \| \	817	i[34567]86--solaris2 \| x86_64--solaris2.1[0-9] \| \
818	i[34567]86--cygwin \| i[34567]86--mingw \| x86_64--mingw \| \	818	i[34567]86--cygwin \| i[34567]86--mingw \| x86_64--mingw \| \
Lines 925-932 Link Here
925	+#endif	925	+#endif
926	+	926	+
927	#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \	927	#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
928	&& defined(TARGET_DL_ITERATE_PHDR) \	928	&& defined(__OpenBSD__)
929	&& defined(__sun__) && defined(__svr4__)	929	# define ElfW(type) Elf_##type
930	--- /dev/null	930	--- /dev/null
931	+++ libgcc/config/i386/dragonfly-unwind.h	931	+++ libgcc/config/i386/dragonfly-unwind.h
932	@@ -0,0 +1,158 @@	932	@@ -0,0 +1,158 @@
Lines 1473-1479 Link Here
1473	}	1473	}
1474	--- gcc/configure.orig	1474	--- gcc/configure.orig
1475	+++ gcc/configure	1475	+++ gcc/configure
1476	@@ -26810,6 +26810,20 @@	1476	@@ -26902,6 +26902,20 @@
1477	gcc_cv_target_dl_iterate_phdr=no	1477	gcc_cv_target_dl_iterate_phdr=no
1478	fi	1478	fi
1479	;;	1479	;;
Lines 1496-1502 Link Here
1496	if test x$gcc_cv_target_dl_iterate_phdr = xyes; then	1496	if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
1497	--- gcc/Makefile.in.orig	1497	--- gcc/Makefile.in.orig
1498	+++ gcc/Makefile.in	1498	+++ gcc/Makefile.in
1499	@@ -1150,7 +1150,6 @@	1499	@@ -1165,7 +1165,6 @@
1500	insn-automata.o \	1500	insn-automata.o \
1501	insn-emit.o \	1501	insn-emit.o \
1502	insn-extract.o \	1502	insn-extract.o \
Lines 1504-1510 Link Here
1504	insn-opinit.o \	1504	insn-opinit.o \
1505	insn-output.o \	1505	insn-output.o \
1506	insn-peep.o \	1506	insn-peep.o \
1507	@@ -1469,13 +1468,18 @@	1507	@@ -1484,13 +1483,18 @@
1508	ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \	1508	ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
1509	$(OBJS-libcommon-target) @TREEBROWSER@ main.o gccspec.o cppspec.o \	1509	$(OBJS-libcommon-target) @TREEBROWSER@ main.o gccspec.o cppspec.o \
1510	$(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \	1510	$(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \
Lines 1525-1531 Link Here
1525	$(CPPLIB) $(LIBDECNUMBER)	1525	$(CPPLIB) $(LIBDECNUMBER)
1526		1526
1527	MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \	1527	MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \
1528	@@ -3506,6 +3510,8 @@	1528	@@ -3522,6 +3526,8 @@
1529	$(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H)	1529	$(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H)
1530	insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \	1530	insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
1531	$(MACHMODE_H)	1531	$(MACHMODE_H)
Lines 1534-1540 Link Here
1534	insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \	1534	insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
1535	$(TM_H) $(RTL_H) $(TM_P_H) insn-config.h $(FLAGS_H) $(RECOG_H) \	1535	$(TM_H) $(RTL_H) $(TM_P_H) insn-config.h $(FLAGS_H) $(RECOG_H) \
1536	$(EXPR_H) $(OPTABS_H) reload.h	1536	$(EXPR_H) $(OPTABS_H) reload.h
1537	@@ -3599,6 +3605,7 @@	1537	@@ -3615,6 +3621,7 @@
1538		1538
1539	insn-modes.c: s-modes; @true	1539	insn-modes.c: s-modes; @true
1540	insn-modes.h: s-modes-h; @true	1540	insn-modes.h: s-modes-h; @true
Lines 1542-1548 Link Here
1542	min-insn-modes.c: s-modes-m; @true	1542	min-insn-modes.c: s-modes-m; @true
1543		1543
1544	s-modes: build/genmodes$(build_exeext)	1544	s-modes: build/genmodes$(build_exeext)
1545	@@ -3616,6 +3623,12 @@	1545	@@ -3632,6 +3639,12 @@
1546	$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c	1546	$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c
1547	$(STAMP) s-modes-m	1547	$(STAMP) s-modes-m
1548		1548
Lines 1555-1561 Link Here
1555	insn-preds.c: s-preds; @true	1555	insn-preds.c: s-preds; @true
1556	tm-preds.h: s-preds-h; @true	1556	tm-preds.h: s-preds-h; @true
1557	tm-constrs.h: s-constrs-h; @true	1557	tm-constrs.h: s-constrs-h; @true
1558	@@ -4378,7 +4391,7 @@	1558	@@ -4394,7 +4407,7 @@
1559	DESTDIR=$(@D) \	1559	DESTDIR=$(@D) \
1560	$(SHELL) $(srcdir)/doc/install.texi2html	1560	$(SHELL) $(srcdir)/doc/install.texi2html
1561		1561
Lines 1564-1570 Link Here
1564		1564
1565	generated-manpages: man	1565	generated-manpages: man
1566		1566
1567	@@ -4530,7 +4543,7 @@	1567	@@ -4546,7 +4559,7 @@
1568	# Install the driver last so that the window when things are	1568	# Install the driver last so that the window when things are
1569	# broken is small.	1569	# broken is small.
1570	install: install-common $(INSTALL_HEADERS) \	1570	install: install-common $(INSTALL_HEADERS) \
Lines 1573-1579 Link Here
1573	install-driver install-lto-wrapper install-gcc-ar	1573	install-driver install-lto-wrapper install-gcc-ar
1574		1574
1575	ifeq ($(enable_plugin),yes)	1575	ifeq ($(enable_plugin),yes)
1576	@@ -4655,6 +4668,9 @@	1576	@@ -4671,6 +4684,9 @@
1577	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)	1577	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
1578	-( cd $(DESTDIR)$(bindir) && \	1578	-( cd $(DESTDIR)$(bindir) && \
1579	$(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )	1579	$(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
Lines 1583-1589 Link Here
1583	-if [ -f gcc-cross$(exeext) ] ; then \	1583	-if [ -f gcc-cross$(exeext) ] ; then \
1584	if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \	1584	if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
1585	rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \	1585	rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
1586	@@ -4728,10 +4744,7 @@	1586	@@ -4744,10 +4760,7 @@
1587	install-man: lang.install-man \	1587	install-man: lang.install-man \
1588	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \	1588	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
1589	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \	1589	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
Lines 1597-1603 Link Here
1597	-rm -f $@	1597	-rm -f $@
1598	--- configure.orig	1598	--- configure.orig
1599	+++ configure	1599	+++ configure
1600	@@ -14412,7 +14412,7 @@	1600	@@ -14419,7 +14419,7 @@
1601	_ACEOF	1601	_ACEOF
1602	if ac_fn_c_try_compile "$LINENO"; then :	1602	if ac_fn_c_try_compile "$LINENO"; then :
1603	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5	1603	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

Lines 44-50 Link Here

(-)lang/gcc-aux/files/diff-cxx (-12 / +46 lines)
44		44
45	--- libstdc++-v3/configure.orig	45	--- libstdc++-v3/configure.orig
46	+++ libstdc++-v3/configure	46	+++ libstdc++-v3/configure
47	@@ -15704,7 +15704,7 @@	47	@@ -15738,7 +15738,7 @@
48	if test "${enable_clocale+set}" = set; then :	48	if test "${enable_clocale+set}" = set; then :
49	enableval=$enable_clocale;	49	enableval=$enable_clocale;
50	case "$enableval" in	50	case "$enableval" in
Lines 53-59 Link Here
53	*) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;	53	*) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
54	esac	54	esac
55		55
56	@@ -15742,6 +15742,9 @@	56	@@ -15776,6 +15776,9 @@
57	darwin* \| freebsd*)	57	darwin* \| freebsd*)
58	enable_clocale_flag=darwin	58	enable_clocale_flag=darwin
59	;;	59	;;
Lines 63-69 Link Here
63	*)	63	*)
64	if test x"$with_newlib" = x"yes"; then	64	if test x"$with_newlib" = x"yes"; then
65	enable_clocale_flag=newlib	65	enable_clocale_flag=newlib
66	@@ -15883,7 +15886,23 @@	66	@@ -15917,7 +15920,23 @@
67	CTIME_CC=config/locale/generic/time_members.cc	67	CTIME_CC=config/locale/generic/time_members.cc
68	CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h	68	CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
69	;;	69	;;
Lines 622-628 Link Here
622	+ struct ctype_base	622	+ struct ctype_base
623	+ {	623	+ {
624	+ // Non-standard typedefs.	624	+ // Non-standard typedefs.
625	+ typedef const unsigned char* __to_type;	625	+ typedef const int* __to_type;
626	+	626	+
627	+ // NB: Offsets into ctype<char>::_M_table force a particular size	627	+ // NB: Offsets into ctype<char>::_M_table force a particular size
628	+ // on the mask type. Because of this, we don't use an enum.	628	+ // on the mask type. Because of this, we don't use an enum.
Lines 746-752 Link Here
746	+} // namespace	746	+} // namespace
747	--- /dev/null	747	--- /dev/null
748	+++ libstdc++-v3/config/os/bsd/dragonfly/ctype_inline.h	748	+++ libstdc++-v3/config/os/bsd/dragonfly/ctype_inline.h
749	@@ -0,0 +1,127 @@	749	@@ -0,0 +1,161 @@
750	+// Locale support -- C++ --	750	+// Locale support -- C++ --
751	+	751	+
752	+// Copyright (C) 2000, 2003, 2004, 2005, 2009, 2010	752	+// Copyright (C) 2000, 2003, 2004, 2005, 2009, 2010
Lines 791-804 Link Here
791	+ bool	791	+ bool
792	+ ctype<char>::	792	+ ctype<char>::
793	+ is(mask __m, char __c) const	793	+ is(mask __m, char __c) const
794	+ { return _M_table[(unsigned char)(__c)] & __m; }	794	+ {
		795	+ if (_M_table)
		796	+ return _M_table[static_cast<unsigned char>(__c)] & __m;
		797	+ else
		798	+ return __libc_ctype_ [__c + 1] & __m;
		799	+ }
795	+	800	+
796	+ const char*	801	+ const char*
797	+ ctype<char>::	802	+ ctype<char>::
798	+ is(const char* __low, const char* __high, mask* __vec) const	803	+ is(const char* __low, const char* __high, mask* __vec) const
799	+ {	804	+ {
800	+ while (__low < __high)	805	+ if (_M_table)
801	+ __vec++ = _M_table[__low++];	806	+ while (__low < __high)
		807	+ __vec++ = _M_table[static_cast<unsigned char>(__low++)];
		808	+ else
		809	+ for (;__low < __high; ++__vec, ++__low)
		810	+ {
		811	+ mask __m = 0;
		812	+ if (this->is(upper, *__low)) __m \|= upper;
		813	+ if (this->is(lower, *__low)) __m \|= lower;
		814	+ if (this->is(alpha, *__low)) __m \|= alpha;
		815	+ if (this->is(digit, *__low)) __m \|= digit;
		816	+ if (this->is(xdigit, *__low)) __m \|= xdigit;
		817	+ if (this->is(space, *__low)) __m \|= space;
		818	+ if (this->is(print, *__low)) __m \|= print;
		819	+ if (this->is(graph, *__low)) __m \|= graph;
		820	+ if (this->is(cntrl, *__low)) __m \|= cntrl;
		821	+ if (this->is(punct, *__low)) __m \|= punct;
		822	+ // Do not include explicit line for alnum mask since it is a
		823	+ // pure composite of masks on DragonFly.
		824	+ *__vec = __m;
		825	+ }
802	+ return __high;	826	+ return __high;
803	+ }	827	+ }
804	+	828	+
Lines 806-813 Link Here
806	+ ctype<char>::	830	+ ctype<char>::
807	+ scan_is(mask __m, const char* __low, const char* __high) const	831	+ scan_is(mask __m, const char* __low, const char* __high) const
808	+ {	832	+ {
809	+ while (__low < __high && !this->is(__m, *__low))	833	+ if (_M_table)
810	+ ++__low;	834	+ while (__low < __high
		835	+ && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
		836	+ ++__low;
		837	+ else
		838	+ while (__low < __high && !this->is(__m, *__low))
		839	+ ++__low;
811	+ return __low;	840	+ return __low;
812	+ }	841	+ }
813	+	842	+
Lines 815-822 Link Here
815	+ ctype<char>::	844	+ ctype<char>::
816	+ scan_not(mask __m, const char* __low, const char* __high) const	845	+ scan_not(mask __m, const char* __low, const char* __high) const
817	+ {	846	+ {
818	+ while (__low < __high && this->is(__m, *__low) != 0)	847	+ if (_M_table)
819	+ ++__low;	848	+ while (__low < __high
		849	+ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
		850	+ ++__low;
		851	+ else
		852	+ while (__low < __high && this->is(__m, *__low) != 0)
		853	+ ++__low;
820	+ return __low;	854	+ return __low;
821	+ }	855	+ }
822	+	856	+

Lines 508-523 Link Here

(-)lang/gcc-aux/files/diff-cxx-testsuite (-10 lines)
508	// { dg-options " -std=gnu++0x -pthreads" { target --solaris* } }	508	// { dg-options " -std=gnu++0x -pthreads" { target --solaris* } }
509	// { dg-options " -std=gnu++0x " { target --cygwin --darwin* } }	509	// { dg-options " -std=gnu++0x " { target --cygwin --darwin* } }
510	// { dg-require-cstdint "" }	510	// { dg-require-cstdint "" }
511	--- libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc.orig
512	+++ libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc
513	@@ -1,5 +1,5 @@
514	-// { dg-do run { target --freebsd* --netbsd* --linux* --solaris* --cygwin --darwin* alpha--osf* mips-sgi-irix6* powerpc-ibm-aix* } }
515	-// { dg-options " -std=gnu++0x -pthread" { target --freebsd* --netbsd* --linux* alpha--osf* mips-sgi-irix6* powerpc-ibm-aix* } }
516	+// { dg-do run { target --freebsd* --dragonfly* --netbsd* --linux* --solaris* --cygwin --darwin* alpha--osf* mips-sgi-irix6* } }
517	+// { dg-options " -std=gnu++0x -pthread" { target --freebsd* --dragonfly* --netbsd* --linux* alpha--osf* mips-sgi-irix6* } }
518	// { dg-options " -std=gnu++0x -pthreads" { target --solaris* } }
519	// { dg-options " -std=gnu++0x " { target --cygwin --darwin* } }
520	// { dg-require-cstdint "" }
521	--- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig	511	--- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig
522	+++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc	512	+++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
523	@@ -1,5 +1,5 @@	513	@@ -1,5 +1,5 @@