[Midnightbsd-cvs] mports: mports/lang: Drop gcc before 3.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 9 13:42:06 EDT 2008
Log Message:
-----------
Drop gcc before 3.4
Modified Files:
--------------
mports/lang:
Makefile (r1.38 -> r1.39)
Removed Files:
-------------
mports/lang/gcc33:
Makefile
distinfo
pkg-descr
pkg-plist
mports/lang/gcc33/files:
freebsd7.h
opt.patch-bc
patch-config.gcc
patch-fa
patch-fb
patch-fc
patch-freebsd-spec.h
patch-gengtype-yacc.y
patch-i386.c
mports/lang/gcc32:
Makefile
distinfo
pkg-descr
pkg-plist
mports/lang/gcc32/files:
freebsd7.h
opt.patch-bc
patch-ad
patch-af
patch-ar
patch-fa
patch-fb
patch-fc
patch-gcc+config+freebsd-spec.h
patch-gcc+config.gcc
patch-gcc,config,freebsd-spec.h
patch-gcc,config,i386,i386.c
patch-vc
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -L lang/Makefile -L lang/Makefile -u -r1.38 -r1.39
--- lang/Makefile
+++ lang/Makefile
@@ -8,8 +8,6 @@
SUBDIR += ezm3
SUBDIR += gawk
SUBDIR += gcc-objc
- SUBDIR += gcc32
- SUBDIR += gcc33
SUBDIR += gcc41
SUBDIR += gcc41-withgcjawt
SUBDIR += gcc42
--- lang/gcc33/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GCC, the GNU Compiler Collection includes gcc, g++, and g77.
-
-This port installs the various front ends as gcc33, g++33,
-and g77-33 into the ${PREFIX}/bin directory.
-
-WWW: http://gcc.gnu.org/
--- lang/gcc33/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
- at comment $FreeBSD: ports/lang/gcc33/pkg-plist,v 1.58 2006/06/17 13:47:29 gerald Exp $
-bin/c++%%SUFFIX%%
-bin/cpp%%SUFFIX%%
-bin/g++%%SUFFIX%%
-bin/g77-%%SUFFIX%%
-bin/gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-bin/gcov%%SUFFIX%%
-bin/%%GNU_HOST%%-c++%%SUFFIX%%
-bin/%%GNU_HOST%%-g++%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-info/gcc%%SUFFIX%%/dir
- at comment Insert PLIST.lib here
--- lang/gcc33/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: egcs
-# Date created: 9 Jan 1998
-# Whom: John Polstra <jdp at polstra.com>
-#
-# $MidnightBSD: mports/lang/gcc33/Makefile,v 1.2 2008/04/14 04:09:44 laffer1 Exp $
-# $FreeBSD: ports/lang/gcc33/Makefile,v 1.212 2006/06/17 13:47:29 gerald Exp $
-#
-
-PORTNAME= gcc
-PORTVERSION= 3.3.6
-PORTREVISION= 4
-PORTEPOCH= 1
-CATEGORIES= lang
-VERSIONSTRING= ${PORTVERSION}
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${VERSIONSTRING}
-DISTFILES= gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-g77-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= GNU Compiler Collection 3.3
-LICENCE= gpl2
-
-SUFFIX= 33
-LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
-NOT_FOR_ARCHS= amd64
-USE_BISON= build
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD=yes
-
-PATCH_WRKSRC= ${SRCDIR}
-CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure
-NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-freebsd6.0
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd6.0
-.endif
-
-SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
-WRKSRC= ${WRKDIR}/build
-TARGLIB= ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${PORTVERSION}
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-nls \
- --with-system-zlib \
- --program-suffix=${SUFFIX} \
- --libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/ \
- --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-MAKE_ENV= LD_LIBRARY_PATH=.:${WRKSRC}/gcc
-ALL_TARGET= bootstrap-lean
-USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
- SUFFIX=${SUFFIX}
-MAN1= cpp${SUFFIX}.1 \
- g++${SUFFIX}.1 \
- g77-${SUFFIX}.1 \
- gcc${SUFFIX}.1 \
- gcov${SUFFIX}.1
-INFO= gcc${SUFFIX}/cpp \
- gcc${SUFFIX}/cppinternals \
- gcc${SUFFIX}/g77 \
- gcc${SUFFIX}/gcc \
- gcc${SUFFIX}/gccint
-
-pre-everything::
- @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} target=${CONFIGURE_TARGET}"
-
-post-patch:
- @${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
- ${SRCDIR}/gcc/version.c
-
-pre-configure:
- cd ${SRCDIR} ; contrib/gcc_update --touch
- @${LN} -sf ${FILESDIR}/freebsd7.h ${SRCDIR}/gcc/config
- @${RM} -f ${SRCDIR}/gcc/*/*.info*
- @${MKDIR} ${CONFIGURE_WRKSRC}
-
-post-build:
- @${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
- @${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
- @${ECHO_MSG} "This assumes that you have the dejagnu port installed."
-
-check: build
- cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
-
-post-install:
- # man pages can only be generated if Perl >= 5.6 is installed;
- # fake them otherwise.
- for mp in ${_MANPAGES}; do \
- ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
- done
-.for f in c++ g77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
- # gij and jv-convert, for example, are not built on all platforms.
- if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
- ${MV} -f ${PREFIX}/man/man1/${f}.1 \
- ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
- fi
-.endfor
- ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}
- -${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1
- ${RM} -f ${TARGLIB}/*.la
- ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
- ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
- # Add target libraries and include files to packaging list.
- ${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gnu
- cd ${PREFIX} ; if [ -d $d ]; then \
- ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
- ${FIND} $d -type d | ${SORT} -r \
- | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
- fi
-.endfor
- ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
- ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib 2>&1 || true" >> ${WRKDIR}/PLIST.lib
- cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
-
-.include <bsd.port.post.mk>
--- lang/gcc33/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (gcc-core-3.3.6.tar.bz2) = 18c52e6fb8966b7700665dca289d077f
-SHA256 (gcc-core-3.3.6.tar.bz2) = 4f9bee8ac57711508d6b8031d5ecfefc16fcf37ec81568b3f8344ef5f4cdfeb6
-SIZE (gcc-core-3.3.6.tar.bz2) = 11879804
-MD5 (gcc-g++-3.3.6.tar.bz2) = 6b3d00b8d079805be1b895f7f6ce47a0
-SHA256 (gcc-g++-3.3.6.tar.bz2) = 7ee9fdf2771084c4933bb0a31d2fd9bfe8df746f9f47d76562b7a9e302a29d92
-SIZE (gcc-g++-3.3.6.tar.bz2) = 2146232
-MD5 (gcc-g77-3.3.6.tar.bz2) = 3752faab670bcc43b1ad8d5ef9ed8ed2
-SHA256 (gcc-g77-3.3.6.tar.bz2) = 3f21787c966bf065eb327d2d28628d197dc3cfa6c95626abc74d44436ea5e3eb
-SIZE (gcc-g77-3.3.6.tar.bz2) = 1109786
-MD5 (gcc-objc-3.3.6.tar.bz2) = 9af803dc2f7845c5119fa0ec69228b1e
-SHA256 (gcc-objc-3.3.6.tar.bz2) = 278d75689c2769c9e06bea4c85024333cd19a6559bec99e66732f31aabf67d1d
-SIZE (gcc-objc-3.3.6.tar.bz2) = 208832
-MD5 (gcc-testsuite-3.3.6.tar.bz2) = 0d3eb24b64b1ce2e7f16902545b7608e
-SHA256 (gcc-testsuite-3.3.6.tar.bz2) = 0298e4b3f62dfed300553f6354c8d8e86efe16fca7e1f9fe0d3e012ca5c5abaa
-SIZE (gcc-testsuite-3.3.6.tar.bz2) = 1101247
--- lang/gcc33/files/freebsd7.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* FreeBSD version number setting for FreeBSD 7.x systems.
- Copyright (C) 2001 Free Software Foundation, Inc.
- Contributed by David E. O'Brien <obrien at FreeBSD.org> and BSDi.
- Copyright (C) 2005 David E. O'Brien.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-#define FBSD_MAJOR 7
--- lang/gcc33/files/patch-gengtype-yacc.y
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc/gengtype-yacc.y.orig Fri Sep 20 00:33:24 2002
-+++ gcc/gengtype-yacc.y Tue Apr 22 09:11:27 2003
-@@ -24,6 +24,9 @@
- #include "system.h"
- #include "gengtype.h"
- #define YYERROR_VERBOSE
-+
-+#define malloc xmalloc
-+#define realloc xrealloc
- %}
-
- %union {
--- lang/gcc33/files/patch-i386.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc/config/i386/i386.c.orig Sun Dec 12 13:00:44 2004
-+++ gcc/config/i386/i386.c Sun Oct 30 21:04:51 2005
-@@ -1017,4 +1017,11 @@ override_options ()
- {"athlon-mp", PROCESSOR_ATHLON, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW
- | PTA_3DNOW_A | PTA_SSE},
-+ {"k8", PROCESSOR_ATHLON, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW
-+ | PTA_3DNOW_A | PTA_SSE | PTA_SSE2},
-+
-+ {"opteron", PROCESSOR_ATHLON, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW
-+ | PTA_3DNOW_A | PTA_SSE | PTA_SSE2},
-+ {"athlon64", PROCESSOR_ATHLON, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW
-+ | PTA_3DNOW_A | PTA_SSE | PTA_SSE2},
- };
-
--- lang/gcc33/files/patch-freebsd-spec.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/config/freebsd-spec.h.orig Thu Jan 13 18:06:26 2005
-+++ gcc/config/freebsd-spec.h Sun Oct 30 21:22:05 2005
-@@ -59,6 +59,8 @@ Boston, MA 02111-1307, USA. */
- builtin_define ("__FreeBSD__=4"); \
- else if (FBSD_MAJOR == 3) \
- builtin_define ("__FreeBSD__=3"); \
-+ else if (FBSD_MAJOR == 7) \
-+ builtin_define ("__FreeBSD__=7"); \
- else \
- builtin_define ("__FreeBSD__"); \
- builtin_define_std ("unix"); \
--- lang/gcc33/files/patch-fa
+++ /dev/null
@@ -1,179 +0,0 @@
---- gcc/c-format.c.orig Wed Feb 20 14:54:32 2002
-+++ gcc/c-format.c Mon May 27 20:42:37 2002
-@@ -19,6 +19,8 @@
- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
-
-+/* $FreeBSD: ports/lang/gcc33/files/patch-fa,v 1.11 2002/10/10 23:19:05 obrien Exp $ */
-+
- #include "config.h"
- #include "system.h"
- #include "tree.h"
-@@ -75,6 +77,7 @@
- last. */
- enum format_type { printf_format_type, scanf_format_type,
- strftime_format_type, strfmon_format_type,
-+ printf0_format_type,
- format_type_error };
-
- typedef struct function_format_info
-@@ -82,6 +85,7 @@
- enum format_type format_type; /* type of format (printf, scanf, etc.) */
- unsigned HOST_WIDE_INT format_num; /* number of format argument */
- unsigned HOST_WIDE_INT first_arg_num; /* number of first arg (zero for varargs) */
-+ int null_format_ok; /* TRUE if the format string may be NULL */
- } function_format_info;
-
- static bool decode_format_attr PARAMS ((tree,
-@@ -249,7 +253,7 @@
- {
- if (validated_p)
- abort ();
-- error ("unrecognized format specifier");
-+ error_with_decl (getdecls (), "unrecognized format specifier");
- return false;
- }
- else
-@@ -540,6 +544,7 @@
- /* Pointer to type of argument expected if '*' is used for a precision,
- or NULL if '*' not used for precisions. */
- tree *const precision_type;
-+ const int null_format_ok;
- } format_kind_info;
-
-
-@@ -783,6 +788,18 @@
- { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R" },
- /* GNU conversion specifiers. */
- { "m", 0, STD_EXT, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" },
-+ /* BSD conversion specifiers. */
-+ /* FreeBSD kernel extensions (src/sys/kern/subr_prf.c).
-+ The format %b is supported to decode error registers.
-+ Its usage is: printf("reg=%b\n", regval, "<base><arg>*");
-+ which produces: reg=3<BITTWO,BITONE>
-+ The format %D provides a hexdump given a pointer and separator string:
-+ ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX
-+ ("%*D", len, ptr, " ") -> XX XX XX XX ...
-+ */
-+ { "D", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" },
-+ { "b", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" },
-+ { "rz", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" },
- { NULL, 0, 0, NOLENGTHS, NULL, NULL }
- };
-
-@@ -847,23 +864,29 @@
- printf_flag_specs, printf_flag_pairs,
- FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
- 'w', 0, 'p', 0, 'L',
-- &integer_type_node, &integer_type_node
-+ &integer_type_node, &integer_type_node, 0
- },
- { "scanf", scanf_length_specs, scan_char_table, "*'I", NULL,
- scanf_flag_specs, scanf_flag_pairs,
- FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
- 'w', 0, 0, '*', 'L',
-- NULL, NULL
-+ NULL, NULL, 0
- },
- { "strftime", NULL, time_char_table, "_-0^#", "EO",
- strftime_flag_specs, strftime_flag_pairs,
- FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
-- NULL, NULL
-+ NULL, NULL, 0
- },
- { "strfmon", strfmon_length_specs, monetary_char_table, "=^+(!-", NULL,
- strfmon_flag_specs, strfmon_flag_pairs,
- FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
-- NULL, NULL
-+ NULL, NULL, 0
-+ },
-+ { "printf0", printf_length_specs, print_char_table, " +#0-'I", NULL,
-+ printf_flag_specs, printf_flag_pairs,
-+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-+ 'w', 0, 'p', 0, 'L',
-+ &integer_type_node, &integer_type_node, 1
- }
- };
-
-@@ -917,6 +940,14 @@
-
- static void check_format_types PARAMS ((int *, format_wanted_type *));
-
-+
-+inline static int get_null_fmt_ok (fmttype)
-+ enum format_type fmttype;
-+{
-+ return format_types[(int)fmttype].null_format_ok;
-+}
-+
-+
- /* Decode a format type from a string, returning the type, or
- format_type_error if not valid, in which case the caller should print an
- error message. */
-@@ -1986,6 +2017,57 @@
- }
- }
-
-+ if (*format_chars == 'b')
-+ {
-+ /* There should be an int arg to control the string arg. */
-+ if (params == 0)
-+ {
-+ status_warning (status, "too few arguments for format");
-+ return;
-+ }
-+ if (info->first_arg_num != 0)
-+ {
-+ cur_param = TREE_VALUE (params);
-+ params = TREE_CHAIN (params);
-+ ++arg_num;
-+ if ((TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
-+ != integer_type_node)
-+ &&
-+ (TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
-+ != unsigned_type_node))
-+ {
-+ status_warning (status, "bitmap is not type int (arg %d)",
-+ arg_num);
-+ }
-+ }
-+ }
-+ if (*format_chars == 'D')
-+ {
-+ /* There should be an unsigned char * arg before the string arg. */
-+ if (params == 0)
-+ {
-+ status_warning (status, "too few arguments for format");
-+ return;
-+ }
-+ if (info->first_arg_num != 0)
-+ {
-+ tree cur_type;
-+
-+ cur_param = TREE_VALUE (params);
-+ params = TREE_CHAIN (params);
-+ ++arg_num;
-+ cur_type = TREE_TYPE (cur_param);
-+ if (TREE_CODE (cur_type) != POINTER_TYPE
-+ || TYPE_MAIN_VARIANT (TREE_TYPE (cur_type))
-+ != unsigned_char_type_node)
-+ {
-+ status_warning (status,
-+ "ethernet address is not type unsigned char * (arg %d)",
-+ arg_num);
-+ }
-+ }
-+ }
-+
- format_char = *format_chars;
- if (format_char == 0
- || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
-@@ -2112,7 +2194,7 @@
- else if (strchr (fci->flags2, '2') != 0)
- y2k_level = 2;
- if (y2k_level == 3)
-- status_warning (status, "`%%%c' yields only last 2 digits of year in some locales",
-+ status_warning (status, "`%%%c' yields only last 2 digits of year in some locales on non-BSD systems",
- format_char);
- else if (y2k_level == 2)
- status_warning (status, "`%%%c' yields only last 2 digits of year", format_char);
--- lang/gcc33/files/patch-fb
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcc/flags.h.orig Sun Jan 31 09:46:18 1999
-+++ gcc/flags.h Tue Mar 30 13:17:11 1999
-@@ -137,6 +137,10 @@
-
- extern int warn_aggregate_return;
-
-+/* Nonzero means that -Wformat accepts certain non-ANSI formats. */
-+
-+extern int flag_format_extensions;
-+
- /* Nonzero if generating code to do profiling. */
-
- extern int profile_flag;
--- lang/gcc33/files/patch-config.gcc
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc/config.gcc.orig Wed Apr 28 21:42:47 2004
-+++ gcc/config.gcc Sun Oct 30 21:08:57 2005
-@@ -475,6 +475,7 @@ case $machine in
- *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
- *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
- *-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";;
-+ *-*-freebsd7 | *-*-freebsd[7].*) fbsd_tm_file="freebsd7.h";;
- *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
- esac
- tmake_file="t-slibgcc-elf-ver t-freebsd"
--- lang/gcc33/files/opt.patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/bounds/lib/Makefile.orig Tue May 20 16:35:05 2003
-+++ gcc/bounds/lib/Makefile Tue May 20 16:35:19 2003
-@@ -14,7 +14,7 @@
- SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
-
- # Use this on System V.
--CPPFLAGS = -DUSG
-+CPPFLAGS = -DBSD4_2
-
- .c.o:
- $(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
--- lang/gcc33/files/patch-fc
+++ /dev/null
@@ -1,21 +0,0 @@
---- gcc/toplev.c.orig Tue Jun 6 13:11:39 2000
-+++ gcc/toplev.c Mon Jun 26 20:19:31 2000
-@@ -787,6 +787,9 @@
- /* Tag all structures with __attribute__(packed) */
- int flag_pack_struct = 0;
-
-+/* Nonzero means that -Wformat accepts certain system-dependent formats. */
-+int flag_format_extensions = 0;
-+
- /* Emit code to check for stack overflow; also may cause large objects
- to be allocated dynamically. */
- int flag_stack_check;
-@@ -1064,6 +1067,8 @@
- "Do the full regmove optimization pass"},
- {"pack-struct", &flag_pack_struct, 1,
- N_("Pack structure members together without holes") },
-+ {"format-extensions", &flag_format_extensions, 1,
-+ N_("-Wformat accepts certain FreeBSD system-dependent formats") },
- {"stack-check", &flag_stack_check, 1,
- N_("Insert stack checking code into the program") },
- {"argument-alias", &flag_argument_noalias, 0,
--- lang/gcc32/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-GCC, the GNU Compiler Collection includes gcc, g++, gcj, and g77.
-
-This port installs the various front ends as gcc32, g++32, gcj32,
-and g77-32 into the ${PREFIX}/bin directory.
-
-WWW: http://gcc.gnu.org/
-
-- Gerald Pfeifer
-gerald at FreeBSD.org
--- lang/gcc32/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
- at comment $FreeBSD: ports/lang/gcc32/pkg-plist,v 1.49 2005/12/04 10:06:23 edwin Exp $
-bin/cpp32
-bin/g++filt32
-bin/g++32
-bin/g77-32
-bin/gcc32
-bin/gcov32
-bin/%%GNU_HOST%%-gcc32
-bin/%%GNU_HOST%%-g++32
-bin/gccbug-%%PORTVERSION%%
- at comment Insert PLIST.gcc-lib here
- at comment -=[ begin PLIST.gcc-lib ]=-
- at comment -=[ end PLIST.gcc-lib ]=-
--- lang/gcc32/Makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: egcs
-# Date created: 9 Jan 1998
-# Whom: John Polstra <jdp at polstra.com>
-#
-# $MidnightBSD: mports/lang/gcc32/Makefile,v 1.2 2008/04/14 04:11:15 laffer1 Exp $
-# $FreeBSD: ports/lang/gcc32/Makefile,v 1.194 2006/06/24 09:42:34 dinoex Exp $
-#
-
-PORTNAME= gcc
-PORTVERSION= 3.2.3
-PORTREVISION= 4
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GCC} \
- http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
-MASTER_SITE_SUBDIR= releases/gcc-${PORTVERSION}
-DISTFILES= gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
- gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
- gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
- gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= GNU Compiler Collection 3.2.3
-LICENSE= gpl2
-
-NOT_FOR_ARCHS= amd64
-LATEST_LINK?= gcc32${PKGNAMESUFFIX}
-USE_BZIP2= yes
-INFO= cpp cppinternals g77 gcc gccint
-
-PATCH_WRKSRC= ${SRCDIR}
-CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure
-# Do not let USE_GCC be set here. We can't hardcode that gcc32 should require
-# gcc32 in order to build. Setting USE_GCC at all here causes recursion errors
-# when it clobbers the USE_GCC defined by other ports.
-.undef USE_GCC
-NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout6.0
-.else
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-freebsd6.0
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd6.0
-.endif
-.endif
-
-WITHOUT_CPU_CFLAGS=true
-GCC_REV= ${PORTVERSION:C/\.0$//}
-SRCDIR= ${WRKDIR}/gcc-${GCC_REV}
-WRKSRC= ${WRKDIR}/build
-TARGLIB= ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
-PLIST_SUB= GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET} \
- PORTVERSION=${PORTVERSION}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-CONFIGURE_ARGS+= --disable-nls \
- --with-gxx-include-dir=${TARGLIB}/include/g++-v3
-#CONFIGURE_ARGS+= --program-suffix=32
-CONFIGURE_ARGS+= --with-system-zlib --includedir=${TARGLIB}/include/Java
-CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
-.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
-LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB}
-EXTRA_SHLIB= libgcc_s
-USE_LDCONFIG= ${TARGLIB}
-.else
-CONFIGURE_ARGS+= --disable-shared
-.endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+= --enable-threads
-# ?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
-.endif
-
-ALL_TARGET= bootstrap
-MAN1= cpp32.1 g++32.1 g77-32.1 gcc32.1 gcov32.1
-MAN7= fsf-funding.7 gfdl.7 gpl.7
-
-pre-configure:
- cd ${SRCDIR} ; contrib/gcc_update --touch
- @${LN} -sf ${FILESDIR}/freebsd7.h ${SRCDIR}/gcc/config
- @${RM} -f ${SRCDIR}/gcc/*/*.info*
- @${MKDIR} ${CONFIGURE_WRKSRC}
- @${REINPLACE_CMD} -e 's/elf_x86_64/elf_x86_64_fbsd/g' \
- ${SRCDIR}/gcc/config/i386/freebsd64.h
-
-pre-install:
- ${MKDIR} ${PREFIX}/info
-.if defined(WANT_SHAREDLIBS)
- -@${MKDIR} ${PREFIX}/libdata/ldconfig
-.endif
-
-post-install:
- @${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
- @${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
- @(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
- ${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
- ${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
- ${TARGLIB}/cpp0 ${TARGLIB}/collect2 ${TARGLIB}/f771 ; \
- do \
- ${STRIP_CMD} $$prog ; \
- done )
-.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
- ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}32
- ( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
- || ${MV} -f ${PREFIX}/man/man1/${file}.1 \
- ${PREFIX}/man/man1/${file}32.1 )
-.endfor
-.for file in g77
- ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-32
- ( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
- || ${MV} -f ${PREFIX}/man/man1/${file}.1 \
- ${PREFIX}/man/man1/${file}-32.1 )
-.endfor
- ${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
- # These 3 libraries are moved from PREFIX/lib to avoid conflicts
- # with the stock compiler.
-.for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
- ${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB}
-.endfor
- -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
- ${RM} -f ${PREFIX}/lib/libiberty.a
- ${RM} -f ${TARGLIB}/*.la
-# I am sick and tired of the anonyance that man pages can only be generated if
-# perl 5.6 is installed. This is becoming a royal PITA on non-5-CURRENT systems
-.for mp in ${_MANPAGES}
- ( ${TEST} -e ${mp} && ${TOUCH} ${TOUCH_FLAGS} ${mp} )
-.endfor
- cd ${PREFIX} ;\
- ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l \
- >${WRKDIR}/PLIST.gcc-lib
- cd ${PREFIX} ;\
- ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
- | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
- >>${WRKDIR}/PLIST.gcc-lib
- (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
- ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
- ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-lib" >> ${WRKDIR}/ex.script
- ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script
- ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-gcc-lib
- cd ${WRKDIR} ; ex < ex.script
-
-.include <bsd.port.post.mk>
--- lang/gcc32/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 (gcc-core-3.2.3.tar.bz2) = 66664a84b383ba8d68612cd89b9478b2
-SHA256 (gcc-core-3.2.3.tar.bz2) = fb320c4351a35dc0d99cf764a27d52dd51d1822f022e876cd826e94253412c58
-SIZE (gcc-core-3.2.3.tar.bz2) = 10324429
-MD5 (gcc-g++-3.2.3.tar.bz2) = ebb7932d0dc526b10c222a22cc02f180
-SHA256 (gcc-g++-3.2.3.tar.bz2) = 170dd3e43cc80e8d6074ec0e28dc3ae5a31ebfd3852510d2d621527bba5ff965
-SIZE (gcc-g++-3.2.3.tar.bz2) = 1947960
-MD5 (gcc-g77-3.2.3.tar.bz2) = 8bea8cf9734995738552d90cf3f80b62
-SHA256 (gcc-g77-3.2.3.tar.bz2) = 335880339fb6ca685f71a80fa2cb5c8dc943e0ff8366df1087363516bb6e733c
-SIZE (gcc-g77-3.2.3.tar.bz2) = 1144165
-MD5 (gcc-objc-3.2.3.tar.bz2) = eaca8b22d4ef2b42b84b877edbdf896b
-SHA256 (gcc-objc-3.2.3.tar.bz2) = b8f3aa06893a74919e35c1a460f2cfb2803a62bf72bfaf56d4e3f985db818b97
-SIZE (gcc-objc-3.2.3.tar.bz2) = 204251
--- lang/gcc32/files/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc/config/freebsd-spec.h.orig Tue Nov 20 18:06:45 2001
-+++ gcc/config/freebsd-spec.h Sat Feb 2 13:37:38 2002
-@@ -79,7 +82,10 @@
- #define FBSD_CPP_SPEC " \
- %(cpp_cpu) \
- %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \
-- %{posix:-D_POSIX_SOURCE}"
-+ %{posix:-D_POSIX_SOURCE} \
-+ %{!maout: -D__ELF__} \
-+ %{munderscores: -D__UNDERSCORES__} \
-+ %{maout: %{!mno-underscores: -D__UNDERSCORES__}}"
-
- /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add
- the magical crtbegin.o file (see crtstuff.c) which provides part
--- lang/gcc32/files/patch-af
+++ /dev/null
@@ -1,50 +0,0 @@
---- gcc/config/i386/freebsd.h.orig Wed May 30 16:05:31 2001
-+++ gcc/config/i386/freebsd.h Mon Jun 18 17:47:30 2001
-@@ -76,6 +76,14 @@
-
- #undef WCHAR_TYPE_SIZE
- #define WCHAR_TYPE_SIZE BITS_PER_WORD
-+
-+#undef CC1_SPEC
-+#define CC1_SPEC "\
-+ %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-+ %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}"
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}"
-
- /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add
- the magical crtbegin.o file (see crtstuff.c) which provides part
-@@ -84,11 +92,18 @@
-
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC \
-- "%{!shared: \
-- %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
-- %{!p:%{profile:gcrt1.o%s} \
-- %{!profile:crt1.o%s}}}} \
-- crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
-+ "%{maout: %{shared:c++rt0.o%s} \
-+ %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}} \
-+ %{!maout: \
-+ %{!shared: \
-+ %{pg:gcrt1.o%s} \
-+ %{!pg:%{p:gcrt1.o%s} \
-+ %{!p:%{profile:gcrt1.o%s} \
-+ %{!profile:crt1.o%s}}}} \
-+ crti.o%s \
-+ %{!shared:crtbegin.o%s} \
-+ %{shared:crtbeginS.o%s} \
-+ }"
-
- /* Provide a ENDFILE_SPEC appropriate for FreeBSD. Here we tack on
- the magical crtend.o file (see crtstuff.c) which provides part of
-@@ -98,7 +113,7 @@
-
- #undef ENDFILE_SPEC
- #define ENDFILE_SPEC \
-- "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-+ "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}"
-
- /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support
- for the special GCC options -static and -shared, which allow us to
--- lang/gcc32/files/patch-gcc,config,i386,i386.c
+++ /dev/null
@@ -1,52 +0,0 @@
-$FreeBSD: ports/lang/gcc32/files/patch-gcc,config,i386,i386.c,v 1.1 2004/12/19 19:13:24 obrien Exp $
-
-http://gcc.gnu.org/ml/gcc-patches/2003-05/msg00629.html
- Date: Wed, 7 May 2003 17:52:21 -0700
- From: Richard Henderson <rth at redhat.com>
- Subject: fix amd64 xfmode splits
- Message-ID: <20030508005221.GX27351 at redhat.com>
-
- Test case for this is FreeBSD vfprintf.c (i.e. a tad big) and
- I wasn't able to reduce the test. The cause is evident though:
- the second part of a 12-byte quantity is SImode, not DImode,
- and so is invalid as a base address.
-
- r~
-
-* config/i386/i386.c (ix86_split_long_move): Fix base register
- mode for XFmode splits for TARGET_64BIT.
-
---- gcc/config/i386/i386.c.orig Wed Mar 12 01:04:01 2003
-+++ gcc/config/i386/i386.c Sun Dec 19 10:39:53 2004
-@@ -8828,15 +8828,24 @@
- Do an lea to the last part and use only one colliding move. */
- else if (collisions > 1)
- {
-+ rtx base;
-+
- collisions = 1;
-- emit_insn (gen_rtx_SET (VOIDmode, part[0][nparts - 1],
-- XEXP (part[1][0], 0)));
-- part[1][0] = change_address (part[1][0],
-- TARGET_64BIT ? DImode : SImode,
-- part[0][nparts - 1]);
-- part[1][1] = adjust_address (part[1][0], VOIDmode, UNITS_PER_WORD);
-+
-+ base = part[0][nparts - 1];
-+
-+ /* Handle the case when the last part isn't valid for lea.
-+ Happens in 64-bit mode storing the 12-byte XFmode. */
-+ if (GET_MODE (base) != Pmode)
-+ base = gen_rtx_REG (Pmode, REGNO (base));
-+
-+ emit_insn (gen_rtx_SET (VOIDmode, base, XEXP (part[1][0], 0)));
-+ part[1][0] = replace_equiv_address (part[1][0], base);
-+ part[1][1] = replace_equiv_address (part[1][1],
-+ plus_constant (base, UNITS_PER_WORD));
- if (nparts == 3)
-- part[1][2] = adjust_address (part[1][0], VOIDmode, 8);
-+ part[1][2] = replace_equiv_address (part[1][2],
-+ plus_constant (base, 8));
- }
- }
-
--- lang/gcc32/files/freebsd7.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* FreeBSD version number setting for FreeBSD 6.x systems.
- Copyright (C) 2001 Free Software Foundation, Inc.
- Contributed by David E. O'Brien <obrien at FreeBSD.org> and BSDi.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-#define FBSD_MAJOR 7
-
-/* $FreeBSD: ports/lang/gcc32/files/freebsd7.h,v 1.1 2005/11/09 17:26:36 obrien Exp $ */
--- lang/gcc32/files/patch-gcc+config+freebsd-spec.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- gcc/config/freebsd-spec.h.org Sat Aug 13 10:18:00 2005
-+++ gcc/config/freebsd-spec.h Sat Aug 13 18:40:03 2005
-@@ -48,6 +48,11 @@
- || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \
- || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
-
-+#if FBSD_MAJOR == 7
-+#define FBSD_CPP_PREDEFINES \
-+ "-D__FreeBSD__=7 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+#endif
-+
- #if FBSD_MAJOR == 6
- #define FBSD_CPP_PREDEFINES \
- "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
--- lang/gcc32/files/patch-ad
+++ /dev/null
@@ -1,70 +0,0 @@
---- gcc/config/i386/freebsd-aout.h.orig Tue Jan 22 16:56:28 2002
-+++ gcc/config/i386/freebsd-aout.h Sat Feb 2 13:30:32 2002
-@@ -76,14 +76,6 @@
- /* FreeBSD using a.out does not support DWARF2 unwinding mechanisms. */
- #define DWARF2_UNWIND_INFO 0
-
--/* Don't default to pcc-struct-return, because in FreeBSD we prefer the
-- superior nature of the older gcc way. */
--#define DEFAULT_PCC_STRUCT_RETURN 0
--
--/* Ensure we the configuration knows our system correctly so we can link with
-- libraries compiled with the native cc. */
--#undef NO_DOLLAR_IN_LABEL
--
- /* i386 freebsd still uses old binutils that don't insert nops by default
- when the .align directive demands to insert extra space in the text
- segment. */
-@@ -93,19 +85,18 @@
-
- /* Profiling routines, partially copied from i386/osfrose.h. */
-
--/* Redefine this to use %eax instead of %edx. */
-+/* Tell final.c that we don't need a label passed to mcount. */
-+#define NO_PROFILE_DATA
-+
- #undef FUNCTION_PROFILER
- #define FUNCTION_PROFILER(FILE, LABELNO) \
- { \
- if (flag_pic) \
- { \
-- fprintf (FILE, "\tleal %sP%d at GOTOFF(%%ebx),%%eax\n", \
-- LPREFIX, (LABELNO)); \
- fprintf (FILE, "\tcall *mcount at GOT(%%ebx)\n"); \
- } \
- else \
- { \
-- fprintf (FILE, "\tmovl $%sP%d,%%eax\n", LPREFIX, (LABELNO)); \
- fprintf (FILE, "\tcall mcount\n"); \
- } \
- }
-@@ -123,6 +114,7 @@
-
- #define TYPE_ASM_OP "\t.type\t"
- #define SIZE_ASM_OP "\t.size\t"
-+#define SET_ASM_OP "\t.set\t"
-
- /* The following macro defines the format used to output the second
- operand of the .type assembler directive. Different svr4 assemblers
-@@ -132,6 +124,12 @@
-
- #define TYPE_OPERAND_FMT "@%s"
-
-+#define HANDLE_SYSV_PRAGMA 1
-+
-+#define ASM_WEAKEN_LABEL(FILE,NAME) \
-+ do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
-+ fputc ('\n', FILE); } while (0)
-+
- /* Write the extra assembler code needed to declare a function's result.
- Most svr4 assemblers don't require any special declaration of the
- result value, but there are exceptions. */
-@@ -233,6 +231,8 @@
- #define STARTFILE_SPEC \
- "%{shared:c++rt0.o%s} \
- %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}"
-+
-+#define MD_STARTFILE_PREFIX "/usr/lib/aout/"
-
- /* Define this so we can compile MS code for use with WINE. */
- #define HANDLE_PRAGMA_PACK_PUSH_POP
--- lang/gcc32/files/patch-gcc,config,freebsd-spec.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- gcc/config/freebsd-spec.h.orig Tue Mar 2 14:34:55 2004
-+++ gcc/config/freebsd-spec.h Fri Dec 17 11:22:26 2004
-@@ -130,11 +130,20 @@
- }"
- #else
- #if FBSD_MAJOR >= 5
-+#include <sys/param.h>
-+#if __FreeBSD_version < 502102 /* upto FreeBSD 5.2.1 */
- #define FBSD_LIB_SPEC " \
- %{!shared: \
- %{!pg: %{pthread:-lc_r} -lc} \
- %{pg: %{pthread:-lc_r_p} -lc_p} \
- }"
-+#else
-+#define FBSD_LIB_SPEC " \
-+ %{!shared: \
-+ %{!pg: %{pthread:-lpthread} -lc} \
-+ %{pg: %{pthread:-lpthread_p} -lc_p} \
-+ }"
-+#endif /* deal with FreeBSD 5.0 - 5.2.1 */
- #else
- #define FBSD_LIB_SPEC " \
- %{!shared: \
--- lang/gcc32/files/patch-fa
+++ /dev/null
@@ -1,188 +0,0 @@
---- gcc/c-format.c.orig Wed Feb 20 14:54:32 2002
-+++ gcc/c-format.c Mon May 27 20:42:37 2002
-@@ -19,6 +19,8 @@
- Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
-
-+/* $FreeBSD: ports/lang/gcc32/files/patch-fa,v 1.11 2002/05/28 03:43:59 obrien Exp $ */
-+
- #include "config.h"
- #include "system.h"
- #include "tree.h"
-@@ -75,6 +77,7 @@
- last. */
- enum format_type { printf_format_type, scanf_format_type,
- strftime_format_type, strfmon_format_type,
-+ printf0_format_type,
- format_type_error };
-
- typedef struct function_format_info
-@@ -82,6 +85,7 @@
- enum format_type format_type; /* type of format (printf, scanf, etc.) */
- unsigned HOST_WIDE_INT format_num; /* number of format argument */
- unsigned HOST_WIDE_INT first_arg_num; /* number of first arg (zero for varargs) */
-+ int null_format_ok; /* TRUE if the format string may be NULL */
- } function_format_info;
-
- static bool decode_format_attr PARAMS ((tree,
-@@ -249,7 +253,7 @@
- {
- if (validated_p)
- abort ();
-- error ("unrecognized format specifier");
-+ error_with_decl (getdecls (), "unrecognized format specifier");
- return false;
- }
- else
-@@ -540,6 +544,7 @@
- /* Pointer to type of argument expected if '*' is used for a precision,
- or NULL if '*' not used for precisions. */
- tree *const precision_type;
-+ const int null_format_ok;
- } format_kind_info;
-
-
-@@ -783,6 +788,18 @@
- { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R" },
- /* GNU conversion specifiers. */
- { "m", 0, STD_EXT, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" },
-+ /* BSD conversion specifiers. */
-+ /* FreeBSD kernel extensions (src/sys/kern/subr_prf.c).
-+ The format %b is supported to decode error registers.
-+ Its usage is: printf("reg=%b\n", regval, "<base><arg>*");
-+ which produces: reg=3<BITTWO,BITONE>
-+ The format %D provides a hexdump given a pointer and separator string:
-+ ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX
-+ ("%*D", len, ptr, " ") -> XX XX XX XX ...
-+ */
-+ { "D", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" },
-+ { "b", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" },
-+ { "rz", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" },
- { NULL, 0, 0, NOLENGTHS, NULL, NULL }
- };
-
-@@ -847,23 +864,29 @@
- printf_flag_specs, printf_flag_pairs,
- FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
- 'w', 0, 'p', 0, 'L',
-- &integer_type_node, &integer_type_node
-+ &integer_type_node, &integer_type_node, 0
- },
- { "scanf", scanf_length_specs, scan_char_table, "*'I", NULL,
- scanf_flag_specs, scanf_flag_pairs,
- FMT_FLAG_ARG_CONVERT|FMT_FLAG_SCANF_A_KLUDGE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_ZERO_WIDTH_BAD|FMT_FLAG_DOLLAR_GAP_POINTER_OK,
- 'w', 0, 0, '*', 'L',
-- NULL, NULL
-+ NULL, NULL, 0
- },
- { "strftime", NULL, time_char_table, "_-0^#", "EO",
- strftime_flag_specs, strftime_flag_pairs,
- FMT_FLAG_FANCY_PERCENT_OK, 'w', 0, 0, 0, 0,
-- NULL, NULL
-+ NULL, NULL, 0
- },
- { "strfmon", strfmon_length_specs, monetary_char_table, "=^+(!-", NULL,
- strfmon_flag_specs, strfmon_flag_pairs,
- FMT_FLAG_ARG_CONVERT, 'w', '#', 'p', 0, 'L',
-- NULL, NULL
-+ NULL, NULL, 0
-+ },
-+ { "printf0", printf_length_specs, print_char_table, " +#0-'I", NULL,
-+ printf_flag_specs, printf_flag_pairs,
-+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
-+ 'w', 0, 'p', 0, 'L',
-+ &integer_type_node, &integer_type_node, 1
- }
- };
-
-@@ -917,6 +940,14 @@
-
- static void check_format_types PARAMS ((int *, format_wanted_type *));
-
-+
-+inline static int get_null_fmt_ok (fmttype)
-+ enum format_type fmttype;
-+{
-+ return format_types[(int)fmttype].null_format_ok;
-+}
-+
-+
- /* Decode a format type from a string, returning the type, or
- format_type_error if not valid, in which case the caller should print an
- error message. */
-@@ -1475,7 +1506,7 @@
- specially if info == NULL and add a res->number_null entry for
- that case, or maybe add a function pointer to be called at
- the end instead of hardcoding check_format_info_main. */
-- status_warning (status, "null format string");
-+ if (!info->null_format_ok) status_warning (status, "null format string");
-
- /* Skip to first argument to check, so we can see if this format
- has any arguments (it shouldn't). */
-@@ -1986,6 +2017,57 @@
- }
- }
-
-+ if (*format_chars == 'b')
-+ {
-+ /* There should be an int arg to control the string arg. */
-+ if (params == 0)
-+ {
-+ status_warning (status, "too few arguments for format");
-+ return;
-+ }
-+ if (info->first_arg_num != 0)
-+ {
-+ cur_param = TREE_VALUE (params);
-+ params = TREE_CHAIN (params);
-+ ++arg_num;
-+ if ((TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
-+ != integer_type_node)
-+ &&
-+ (TYPE_MAIN_VARIANT (TREE_TYPE (cur_param))
-+ != unsigned_type_node))
-+ {
-+ status_warning (status, "bitmap is not type int (arg %d)",
-+ arg_num);
-+ }
-+ }
-+ }
-+ if (*format_chars == 'D')
-+ {
-+ /* There should be an unsigned char * arg before the string arg. */
-+ if (params == 0)
-+ {
-+ status_warning (status, "too few arguments for format");
-+ return;
-+ }
-+ if (info->first_arg_num != 0)
-+ {
-+ tree cur_type;
-+
-+ cur_param = TREE_VALUE (params);
-+ params = TREE_CHAIN (params);
-+ ++arg_num;
-+ cur_type = TREE_TYPE (cur_param);
-+ if (TREE_CODE (cur_type) != POINTER_TYPE
-+ || TYPE_MAIN_VARIANT (TREE_TYPE (cur_type))
-+ != unsigned_char_type_node)
-+ {
-+ status_warning (status,
-+ "ethernet address is not type unsigned char * (arg %d)",
-+ arg_num);
-+ }
-+ }
-+ }
-+
- format_char = *format_chars;
- if (format_char == 0
- || (!(fki->flags & (int) FMT_FLAG_FANCY_PERCENT_OK)
-@@ -2112,7 +2194,7 @@
- else if (strchr (fci->flags2, '2') != 0)
- y2k_level = 2;
- if (y2k_level == 3)
-- status_warning (status, "`%%%c' yields only last 2 digits of year in some locales",
-+ status_warning (status, "`%%%c' yields only last 2 digits of year in some locales on non-BSD systems",
- format_char);
- else if (y2k_level == 2)
- status_warning (status, "`%%%c' yields only last 2 digits of year", format_char);
--- lang/gcc32/files/patch-vc
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Mon Oct 7 13:47:05 2002
-+++ Makefile.in Fri Nov 22 14:23:28 2002
-@@ -154,7 +154,7 @@
- then echo $$r/texinfo/makeinfo/makeinfo ; \
- else if (makeinfo --version \
- | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
-- then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
-+ then echo makeinfo --no-split ; else echo $$s/missing makeinfo; fi; fi`
-
- # This just becomes part of the MAKEINFO definition passed down to
- # sub-makes. It lets flags be given on the command line while still
--- lang/gcc32/files/patch-fb
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcc/flags.h.orig Sun Jan 31 09:46:18 1999
-+++ gcc/flags.h Tue Mar 30 13:17:11 1999
-@@ -137,6 +137,10 @@
-
- extern int warn_aggregate_return;
-
-+/* Nonzero means that -Wformat accepts certain non-ANSI formats. */
-+
-+extern int flag_format_extensions;
-+
- /* Nonzero if generating code to do profiling. */
-
- extern int profile_flag;
--- lang/gcc32/files/patch-gcc+config.gcc
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc/config.gcc.org Sat Mar 1 03:38:19 2003
-+++ gcc/config.gcc Sat Aug 13 10:11:06 2005
-@@ -445,6 +445,7 @@
- *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
- *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
- *-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";;
-+ *-*-freebsd7 | *-*-freebsd[7].*) fbsd_tm_file="freebsd7.h";;
- *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
- esac
- tmake_file="t-slibgcc-elf-ver t-freebsd"
--- lang/gcc32/files/opt.patch-bc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/bounds/lib/Makefile.orig Tue May 20 16:35:05 2003
-+++ gcc/bounds/lib/Makefile Tue May 20 16:35:19 2003
-@@ -14,7 +14,7 @@
- SUBDIR_INCLUDES = -I../.. -I$(srcdir)/bounds/lib -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
-
- # Use this on System V.
--CPPFLAGS = -DUSG
-+CPPFLAGS = -DBSD4_2
-
- .c.o:
- $(GCC_FOR_TARGET) -Wall $(OPTIMIZE) $(CPPFLAGS) \
--- lang/gcc32/files/patch-fc
+++ /dev/null
@@ -1,21 +0,0 @@
---- gcc/toplev.c.orig Tue Jun 6 13:11:39 2000
-+++ gcc/toplev.c Mon Jun 26 20:19:31 2000
-@@ -787,6 +787,9 @@
- /* Tag all structures with __attribute__(packed) */
- int flag_pack_struct = 0;
-
-+/* Nonzero means that -Wformat accepts certain system-dependent formats. */
-+int flag_format_extensions = 0;
-+
- /* Emit code to check for stack overflow; also may cause large objects
- to be allocated dynamically. */
- int flag_stack_check;
-@@ -1064,6 +1067,8 @@
- "Do the full regmove optimization pass"},
- {"pack-struct", &flag_pack_struct, 1,
- N_("Pack structure members together without holes") },
-+ {"format-extensions", &flag_format_extensions, 1,
-+ N_("-Wformat accepts certain FreeBSD system-dependent formats") },
- {"stack-check", &flag_stack_check, 1,
- N_("Insert stack checking code into the program") },
- {"argument-alias", &flag_argument_noalias, 0,
More information about the Midnightbsd-cvs
mailing list