[Midnightbsd-cvs] src: lib/libgcc: GCC 3.4.6 part 1 of 2.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Nov 20 05:59:29 EST 2007


Log Message:
-----------
GCC 3.4.6 part 1 of 2.

Modified Files:
--------------
    src/gnu/lib/libgcc:
        Makefile (r1.4 -> r1.5)
    src/gnu/lib/libgcc_r:
        Makefile (r1.2 -> r1.3)
    src/gnu/lib/libstdc++:
        Makefile (r1.2 -> r1.3)
    src/gnu/lib/libsupc++:
        Makefile (r1.2 -> r1.3)
    src/gnu/usr.bin/cc:
        Makefile.tgt (r1.1.1.1 -> r1.2)
    src/gnu/usr.bin/cc/cc:
        Makefile (r1.1.1.1 -> r1.2)
    src/gnu/usr.bin/cc/cc_int:
        Makefile (r1.3 -> r1.4)
    src/gnu/usr.bin/cc/cc_tools:
        Makefile (r1.1.1.1 -> r1.2)
        auto-host.h (r1.1.1.1 -> r1.2)
        freebsd-native.h (r1.1.1.1 -> r1.2)
    src/gnu/usr.bin/cc/cpp:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/lib/libgcc/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L gnu/lib/libgcc/Makefile -L gnu/lib/libgcc/Makefile -u -r1.4 -r1.5
--- gnu/lib/libgcc/Makefile
+++ gnu/lib/libgcc/Makefile
@@ -1,14 +1,16 @@
-# $MidnightBSD$
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.54 2004/12/21 09:33:45 ru Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.54.2.1 2006/10/05 19:46:06 obrien Exp $
 
 .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
+# allow to be overridden for the a.out case
+.if !defined(LIB) || ${LIB} != "gcc_r"
 LIB=	gcc
-#SHLIB_NAME=	libgcc_s.so.1
-#SHLIBDIR?=	/lib
+.endif
+
+#SHLIB_MAJOR=	1
 
 # We need to install libgcc_pic.a as well, for use by shared libs.
 INSTALL_PIC_ARCHIVE=
@@ -86,12 +88,19 @@
 #	When upgrading GCC, get the following defintions from config/<cpu>/t-*
 #
 
+.if ${TARGET_ARCH} == "alpha"
+#	from config/alpha/t-alpha
+LIB2FUNCS_EXTRA = qrnnd.asm
+.endif
+
 .if ${TARGET_ARCH} == "arm"
 #	from config/arm/t-strongarm-elf
 CFLAGS+=	-Dinhibit_libc -fno-inline
 LIB1ASMSRC =	lib1funcs.asm
-LIB1ASMFUNCS =	_udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
-OBJS+=	dp-bit.o fp-bit.o
+LIB1ASMFUNCS =	_dvmd_tls _bb_init_func 
+#LIB1ASMFUNCS+=	_fixunsdfsi _addsubsf3 _addsubdf3 \
+#		_truncdfsf2 _fixdfsi _extendsfdf2 _fixsfsi _cmpdf2 _cmpsf2 \
+#		_muldivdf3 _muldivsf3
 # We want fine grained libraries, so use the new code to build the
 # floating point emulation libraries.
 XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform
@@ -161,7 +170,7 @@
 
 SYMS=		${LIB2FUNCS}		\
 		${LIB2_DIVMOD_FUNCS}
-.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
+.if ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 SYMS+=		${FPBIT_FUNCS} ${DPBIT_FUNCS}
 .endif
 SYMS_ST=	${LIB2FUNCS_ST}		\
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/lib/libgcc_r/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L gnu/lib/libgcc_r/Makefile -L gnu/lib/libgcc_r/Makefile -u -r1.2 -r1.3
--- gnu/lib/libgcc_r/Makefile
+++ gnu/lib/libgcc_r/Makefile
@@ -1,4 +1,3 @@
-# $MidnightBSD$
 # $FreeBSD: src/gnu/lib/libgcc_r/Makefile,v 1.5 2000/11/01 01:18:27 jdp Exp $
 
 LIB=	gcc_r
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/lib/libstdc++/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L gnu/lib/libstdc++/Makefile -L gnu/lib/libstdc++/Makefile -u -r1.2 -r1.3
--- gnu/lib/libstdc++/Makefile
+++ gnu/lib/libstdc++/Makefile
@@ -1,5 +1,4 @@
-# $MidnightBSD$
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55.2.1 2005/07/22 17:29:02 kensmith Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55.2.3 2006/10/05 20:57:06 obrien Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
@@ -13,6 +12,9 @@
 SHLIB_MAJOR=	5
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
+.endif
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
@@ -123,7 +125,7 @@
 BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
 BKWHDRSDIR=	${CXXINCLUDEDIR}/backward
 
-EXTHDRS=	algorithm bitmap_allocator.h debug_allocator.h demangle.h \
+EXTHDRS=	algorithm bitmap_allocator.h debug_allocator.h \
 		enc_filebuf.h stdio_filebuf.h stdio_sync_filebuf.h functional \
 		hash_map hash_set iterator malloc_allocator.h memory \
 		mt_allocator.h new_allocator.h numeric pod_char_traits.h \
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/lib/libsupc++/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L gnu/lib/libsupc++/Makefile -L gnu/lib/libsupc++/Makefile -u -r1.2 -r1.3
--- gnu/lib/libsupc++/Makefile
+++ gnu/lib/libsupc++/Makefile
@@ -1,5 +1,4 @@
-# $MidnightBSD$
-# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.6.8.1 2005/08/19 02:49:55 cperciva Exp $
+# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.6.8.2 2006/09/05 19:29:38 obrien Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
@@ -8,11 +7,12 @@
 
 # Static only.
 LIB=	supc++
-SRCS=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
-	eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc \
-	eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc \
-	guard.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
-	pure.cc tinfo.cc tinfo2.cc vec.cc
+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
+	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
+	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
+	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
+	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
+	vec.cc vterminate.cc
 
 # from libiberty:
 SRCS+=	cp-demangle.c
Index: Makefile.tgt
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/Makefile.tgt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/Makefile.tgt -L gnu/usr.bin/cc/Makefile.tgt -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/Makefile.tgt
+++ gnu/usr.bin/cc/Makefile.tgt
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8 2004/07/28 05:27:19 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.8.8.1 2006/09/29 01:50:03 obrien Exp $
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
@@ -6,6 +6,9 @@
 GCC_CPU=	alpha
 .elif ${TARGET_ARCH} == "arm"
 GCC_CPU=	arm
+.if defined(TARGET_BIG_ENDIAN)
+CFLAGS+=	-DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
+.endif
 .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cc/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/cc/Makefile -L gnu/usr.bin/cc/cc/Makefile -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/cc/Makefile
+++ gnu/usr.bin/cc/cc/Makefile
@@ -1,9 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31 2004/12/21 09:59:41 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.31.2.1 2006/09/25 06:19:41 ru Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR}
+.PATH: ${GCCDIR} ${GCCDIR}/doc
 
 PROG=	cc
 MAN=	gcc.1
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cc_int/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L gnu/usr.bin/cc/cc_int/Makefile -L gnu/usr.bin/cc/cc_int/Makefile -u -r1.3 -r1.4
--- gnu/usr.bin/cc/cc_int/Makefile
+++ gnu/usr.bin/cc/cc_int/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.45 2004/10/24 15:32:27 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.45.2.1 2006/09/29 01:50:03 obrien Exp $
 
 .include "../Makefile.inc"
 
@@ -79,6 +79,10 @@
 CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-DTARGET_NAME=\"${target}\" -DIN_GCC
 
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+CFLAGS += -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
+.endif
+
 # c-pch.o needs extra defines. Replicate the rule here rather than
 # pollute compiler command line for all other files.
 c-pch.o: c-pch.c
Index: freebsd-native.h
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/cc_tools/freebsd-native.h -L gnu/usr.bin/cc/cc_tools/freebsd-native.h -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.24.8.1 2005/10/30 17:54:39 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.24.8.2 2006/07/11 20:02:39 obrien Exp $ */
 
 /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
    source tree so it can be configured appropriately without using
@@ -7,7 +7,8 @@
 #define FREEBSD_NATIVE 1
 
 /* Fake out gcc/config/freebsd<version>.h.  */
-#define	FBSD_MAJOR 6
+#define	FBSD_MAJOR	6
+#define FBSD_CC_VER	602001          /* form like __FreeBSD_version */
 
 #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
 #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */
Index: auto-host.h
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cc_tools/auto-host.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/cc_tools/auto-host.h -L gnu/usr.bin/cc/cc_tools/auto-host.h -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/cc_tools/auto-host.h
+++ gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.18 2004/07/28 05:27:20 kan Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.18.8.1 2006/09/29 01:54:09 obrien Exp $ */
 
 #ifndef __FreeBSD_version
 #include <sys/param.h>
@@ -523,7 +523,7 @@
 /* The number of bytes in type int */
 #define SIZEOF_INT 4
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
 /* The number of bytes in type long */
 # define SIZEOF_LONG SIZEOF_INT
 #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cc_tools/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/cc_tools/Makefile -L gnu/usr.bin/cc/cc_tools/Makefile -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/cc_tools/Makefile
+++ gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.81 2005/06/03 04:21:04 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.81.2.2 2006/09/29 01:56:01 obrien Exp $
 
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -47,7 +47,6 @@
 .ORDER: options.h options.c
 options.h options.c: opts.sh ${OPTION_FILES}
 	/bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES}
-	
 
 GENSRCS+=	options.c options.h
 CLEANFILES+=	options.c options.h
@@ -152,7 +151,7 @@
 GENSRCS+=	tm-preds.h
 
 #-----------------------------------------------------------------------
-# Gengtype 
+# Gengtype
 
 gengtype-lex.c : gengtype-lex.l
 	${LEX} -t  ${.ALLSRC} | \
@@ -214,7 +213,9 @@
 .if ${TARGET_ARCH} == "amd64"
 TARGET_INC=	i386/biarch64.h
 .endif
+.if ${TARGET_ARCH} != "arm"
 TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
+.endif
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/unix.h
 TARGET_INC+=	${GCC_CPU}/att.h
@@ -234,6 +235,14 @@
 TARGET_INC+=	${GCC_CPU}/sysv4.h
 .endif
 .endif
+.if ${TARGET_ARCH} == "arm"
+TARGET_INC+=	${GCC_CPU}/elf.h
+TARGET_INC+=	${GCC_CPU}/aout.h
+TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
+. if defined(TARGET_BIG_ENDIAN)
+CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
+. endif
+.endif
 TARGET_INC+=	${GCC_CPU}/freebsd.h
 .if ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/x86-64.h
@@ -498,7 +507,7 @@
 gencodes.o: insn-modes.h genrtl.h
 genconfig.o: insn-modes.h genrtl.h
 print-rtl.o: insn-modes.h genrtl.h tm-preds.h tree-check.h
-read-rtl.o: insn-modes.h genrtl.h 
+read-rtl.o: insn-modes.h genrtl.h
 genattr.o: insn-modes.h genrtl.h
 genemit.o: insn-modes.h genrtl.h
 genflags.o: insn-modes.h genrtl.h
Index: Makefile
===================================================================
RCS file: /home/cvs/src/gnu/usr.bin/cc/cpp/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L gnu/usr.bin/cc/cpp/Makefile -L gnu/usr.bin/cc/cpp/Makefile -u -r1.1.1.1 -r1.2
--- gnu/usr.bin/cc/cpp/Makefile
+++ gnu/usr.bin/cc/cpp/Makefile
@@ -1,22 +1,14 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24 2004/02/05 22:44:21 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.24.8.2 2006/09/29 01:44:25 obrien Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR}
+.PATH: ${GCCDIR} ${GCCDIR}/doc
 
 PROG=	cpp
 SRCS=	gcc.c cppspec.c
 
-CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
-
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
-CLEANFILES= cpp.1
-
-cpp.1: cccp.1
-	cat ${.ALLSRC} > ${.TARGET}
-
 .include <bsd.prog.mk>


More information about the Midnightbsd-cvs mailing list