From owner-freebsd-current Sat May 11 2:36: 2 2002 Delivered-To: freebsd-current@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 67BCB37B403; Sat, 11 May 2002 02:35:42 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g4B9ZcP96826; Sat, 11 May 2002 12:35:38 +0300 (EEST) (envelope-from ru) Date: Sat, 11 May 2002 12:35:38 +0300 From: Ruslan Ermilov To: "David O'Brien" , current@FreeBSD.org Cc: Peter Wemm Subject: Re: cvs commit: src/gnu/lib/csu Makefile src/gnu/lib/libgcc Makefile src/gnu/lib/libiberty Makefile src/gnu/lib/libobjc Makefile src/gnu/lib/libstdc++ Makefile config.h src/gnu/lib/libsupc++ Makefile src/gnu/usr.bin/cc Makefile Makefile.fe Makefile.inc ... Message-ID: <20020511093538.GB87663@sunbay.com> References: <200205100854.g4A8soc37068@freefall.freebsd.org> <20020510150427.GA14295@sunbay.com> <20020510164153.B1221@dragon.nuxi.com> <20020511074411.GA87663@sunbay.com> <20020511010027.A84223@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/WwmFnJnmDyWGHa4" Content-Disposition: inline In-Reply-To: <20020511010027.A84223@dragon.nuxi.com> User-Agent: Mutt/1.3.99i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --/WwmFnJnmDyWGHa4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 11, 2002 at 01:00:27AM -0700, David O'Brien wrote: > On Sat, May 11, 2002 at 10:44:11AM +0300, Ruslan Ermilov wrote: > > On Fri, May 10, 2002 at 04:41:53PM -0700, David O'Brien wrote: > > > On Fri, May 10, 2002 at 06:04:27PM +0300, Ruslan Ermilov wrote: > > > > > Bmake bits for Gcc 3.1. > > > > =20 > > > > This also vanished my YACC building fixes and broke world while > > > > attempting to build `cc1plus' in a cross-tools stage. The changes > > > > below fix this and CLEANFILES. > > >=20 > > > These changes are wrong. > > > =20 > > These changes have been verified to produce the same binaries > > (except for cc1plus which is just broken without them), and > > they are equivalent to what was already in -CURRENT before > > your WIP_GCC31 merge commit. >=20 > There is NO way you've bootstrapped GCC 3.1 using these patches. > Remember a full bootstrap is a `make world ; make buildworld'. >=20 > # cc -v > Using built-in specs. > Configured with: FreeBSD/i386 system compiler > Thread model: posix > gcc version 3.1 20020509 (prerelease) > # cd /usr/src/gnu/usr.bin/cc > # make > =3D=3D=3D> cc_fbsd > ... > =3D=3D=3D> cc_tools > ... > =3D=3D=3D> cc_int > ... > cc -O -pipe -march=3Dk6 -DIN_GCC -DHAVE_CONFIG_H -DPREFIX=3D\"/usr\" > -I/usr/obj/usr/src/gnu/usr.bin/for_ru/cc1/../cc_tools > -I/usr/src/gnu/usr.bin/for_ru/cc1/../cc_tools > -I/usr/src/gnu/usr.bin/for_ru/cc1/../../../../contrib/gcc > -I/usr/src/gnu/usr.bin/for_ru/cc1/../../../../contrib/gcc/config -I. > -c c-parse.c > c-parse.c:3047:29: attempt to use poisoned "realloc" > c-parse.c:3048:16: attempt to use poisoned "malloc" > c-parse.c:3053:31: attempt to use poisoned "realloc" > c-parse.c:3054:18: attempt to use poisoned "malloc" > *** Error code 1 >=20 >=20 > I say again, the malloc usage is not in c-parse.in, it is in the parser > driver produced by Byacc. >=20 OK, now that you've explained it: %%% Index: cc1/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- cc1/Makefile 10 May 2002 08:54:45 -0000 1.26 +++ cc1/Makefile 11 May 2002 09:33:44 -0000 @@ -2,7 +2,7 @@ =20 .include "../Makefile.inc" =20 -.PATH: ../cc_tools ${GCCDIR} +.PATH: ${GCCDIR} =20 PROG=3D cc1 SRCS=3D main.c c-parse.c c-lang.c c-decl.c @@ -17,17 +17,20 @@ =20 #----------------------------------------------------------------------- # C parser -.ORDER: c-parse.c -c-parse.c: c-parse.in + +YFLAGS=3D # don't need y.tab.h + +c-parse-in.y: c-parse.in sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \ -e "/^ifc$$/d" \ -e "/^end ifc$$/d" \ - ${GCCDIR}/c-parse.in > c-parse.y - ${YACC} -o c-parse.c.in c-parse.y + ${.ALLSRC} > ${.TARGET} + +c-parse.c: c-parse-in.c sed -e "s/malloc/xmalloc/g" \ -e "s/realloc/xrealloc/g" \ - c-parse.c.in >c-parse.c + ${.ALLSRC} > ${.TARGET} =20 -CLEANFILES+=3D c-parse.c c-parse.y # insurance +CLEANFILES=3D c-parse-in.y c-parse-in.c c-parse.c =20 .include Index: cc1obj/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1obj/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- cc1obj/Makefile 10 May 2002 08:54:46 -0000 1.20 +++ cc1obj/Makefile 11 May 2002 09:33:44 -0000 @@ -2,7 +2,7 @@ =20 .include "../Makefile.inc" =20 -.PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR} +.PATH: ${GCCDIR}/objc ${GCCDIR} =20 PROG=3D cc1obj SRCS=3D objc-parse.c objc-act.c objc-lang.c main.c c-decl.c @@ -17,18 +17,21 @@ =20 #----------------------------------------------------------------------- # objc parser -.ORDER: objc-parse.c -objc-parse.c: c-parse.in + +YFLAGS=3D # don't need y.tab.h + +objc-parse-in.y: c-parse.in sed -e "/^ifc$$/,/^end ifc$$/d" \ -e "/^ifobjc$$/d" \ -e "/^end ifobjc$$/d" \ - ${GCCDIR}/c-parse.in > objc-parse.y - ${YACC} -o objc-parse.c.in objc-parse.y + ${.ALLSRC} > ${.TARGET} + +objc-parse.c: objc-parse-in.c sed -e "s/malloc/xmalloc/g" \ -e "s/realloc/xrealloc/g" \ - objc-parse.c.in >objc-parse.c + ${.ALLSRC} > ${.TARGET} =20 -CLEANFILES+=3D objc-parse.c objc-parse.y # insurance +CLEANFILES=3D objc-parse-in.y objc-parse-in.c objc-parse.c =20 #----------------------------------------------------------------------- =20 Index: cc1plus/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- cc1plus/Makefile 10 May 2002 08:54:46 -0000 1.27 +++ cc1plus/Makefile 11 May 2002 09:33:44 -0000 @@ -5,7 +5,7 @@ .PATH: ${GCCDIR}/cp ${GCCDIR} =20 PROG=3D cc1plus -SRCS=3D parse.y cfns.h +SRCS=3D parse.c parse.h cfns.h SRCS+=3D main.c cp-lang.c SRCS+=3D call.c class.c cvt.c decl.c decl2.c error.c except.c expr= .c \ friend.c init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c \ @@ -20,21 +20,24 @@ DPADD+=3D ${LIBCC_INT}=20 LDADD+=3D ${LIBCC_INT} =20 -CLEANFILES+=3D parse.c parse.h y.tab.c y.tab.h cfns.h +parse-in.y: parse.y + cp -p ${.ALLSRC} ${.TARGET} =20 -.ORDER: parse.c parse.h -parse.c: parse.y - ${YACC} ${YFLAGS} ${GCCDIR}/cp/${.TARGET:S/c$/y/} +parse.c: parse-in.c sed -e "s/malloc/xmalloc/g" \ -e "s/realloc/xrealloc/g" \ - y.tab.c >${.TARGET} + parse-in.c > ${.TARGET} + +y.tab.h: parse-in.c =20 parse.h: parse.c y.tab.h - cp -pf y.tab.h ${.TARGET} - grep '^#define[ ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET} + cp -p y.tab.h ${.TARGET} + grep '^#define[ ]*YYEMPTY' parse.c >>${.TARGET} =20 -cfns.h: +cfns.h: cfns.gperf gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \ - ${GCCDIR}/cp/cfns.gperf > ${.TARGET} + ${.ALLSRC} > ${.TARGET} + +CLEANFILES=3D parse-in.y parse-in.c parse.c y.tab.h parse.h cfns.h =20 .include Index: cpp0/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/gnu/usr.bin/cc/cpp0/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- cpp0/Makefile 10 May 2002 08:54:47 -0000 1.3 +++ cpp0/Makefile 11 May 2002 09:33:44 -0000 @@ -16,18 +16,21 @@ =20 #----------------------------------------------------------------------- # C parser -.ORDER: c-parse.c -c-parse.c: c-parse.in + +YFLAGS=3D # don't need y.tab.h + +c-parse-in.y: c-parse.in sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \ -e "/^ifc$$/d" \ -e "/^end ifc$$/d" \ - ${GCCDIR}/c-parse.in > c-parse.y - ${YACC} -o c-parse.c.in c-parse.y + ${.ALLSRC} > ${.TARGET} + +c-parse.c: c-parse-in.c sed -e "s/malloc/xmalloc/g" \ -e "s/realloc/xrealloc/g" \ - c-parse.c.in >c-parse.c + ${.ALLSRC} > ${.TARGET} =20 -CLEANFILES+=3D c-parse.c c-parse.y # insurance +CLEANFILES=3D c-parse-in.y c-parse-in.c c-parse.c =20 #----------------------------------------------------------------------- =20 Index: tradcpp0/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/gnu/usr.bin/cc/tradcpp0/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- tradcpp0/Makefile 11 May 2002 00:15:45 -0000 1.4 +++ tradcpp0/Makefile 11 May 2002 09:33:44 -0000 @@ -12,11 +12,16 @@ DPADD+=3D ${LIBCC_INT} LDADD+=3D ${LIBCC_INT} =20 -# ${YACC} ${GCCDIR}/tradcif.y -tradcif.c: tradcif.y - ${YACC} ${.ALLSRC} +YFLAGS=3D # don't need y.tab.h + +tradcif-in.y: tradcif.y + cp -p ${.ALLSRC} ${.TARGET} + +tradcif.c: tradcif-in.c sed -e "s/malloc/xmalloc/g" \ -e "s/realloc/xrealloc/g" \ - y.tab.c >${.TARGET} + tradcif-in.c > ${.TARGET} + +CLEANFILES=3D tradcif-in.y tradcif-in.c tradcif.c =20 .include %%% --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --/WwmFnJnmDyWGHa4 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQE83OXqUkv4P6juNwoRAmBPAJsFfe02ToFYiPQZZ0tCED+nzgykEgCeJhwX QCkIMIWaRUy9RuqXExwtFZU= =8QYI -----END PGP SIGNATURE----- --/WwmFnJnmDyWGHa4-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message