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 ...
On Sat, May 11, 2002 at 10:33:03AM -0700, David O'Brien wrote: On Sat, May 11, 2002 at 12:35:38PM +0300, Ruslan Ermilov wrote: I say again, the malloc usage is not in c-parse.in, it is in the parser driver produced by Byacc. OK, now that you've explained it: I'll look this patch over carefully, but at first glance it all seems like stylistic changes. Does it fix a bug, or you just don't like how I did things? The changes are mostly _not_ stylistic like .ORDER with one argument not making any sense. The reason of this patch is as before -- to avoid redefining system Yacc building rules. The changes also fix the -j buildworld breakage in gnu/usr.bin/cc/cc1plus: # cd gnu/usr.bin/cc/cc1plus # make -j8 depend make: don't know how to make y.tab.h. Stop There're also some unrelated changes sitting in my tree like removing old cruft, which I will submit later when the dust settles down. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age msg38230/pgp0.pgp Description: PGP signature
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 ...
On Sat, May 11, 2002 at 10:33:03AM -0700, David O'Brien wrote: I'll look this patch over carefully, but at first glance it all seems like stylistic changes. Does it fix a bug, or you just don't like how I did things? The changes are mostly _not_ stylistic like .ORDER with one argument not making any sense. The reason of this patch is as before -- to avoid redefining system Yacc building rules. The changes also fix the -j buildworld breakage in gnu/usr.bin/cc/cc1plus: Maybe they are cleaner to you -- but the YACC rules for GCC are rather complicated and what I use is much more direct. You way requires me to remember the 3-4 different ways the YACC _implicit_ rules can affect the build. I feel that for every except you (and maybe BDE) the explicit rules are clearer and more straight forward. I do not see anything wrong with redefining system implicit YACC rules. You have repeatedly hounded me for quite a while about GCC. Since so much of my blood and sweat are not acceptable to you, I encourage you to become the GCC maintainer and do everything to your heart's desire. People are really making me regret that I sweated over GCC 3 to bring it into our tree for all of our architectures and to get many serious bugs fixed in the FSF CVS repository. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
On Sun, May 12, 2002 at 04:43:33AM -0700, David O'Brien wrote: On Sat, May 11, 2002 at 10:33:03AM -0700, David O'Brien wrote: I'll look this patch over carefully, but at first glance it all seems like stylistic changes. Does it fix a bug, or you just don't like how I did things? The changes are mostly _not_ stylistic like .ORDER with one argument not making any sense. The reason of this patch is as before -- to avoid redefining system Yacc building rules. The changes also fix the -j buildworld breakage in gnu/usr.bin/cc/cc1plus: Maybe they are cleaner to you -- but the YACC rules for GCC are rather complicated and what I use is much more direct. You way requires me to remember the 3-4 different ways the YACC _implicit_ rules can affect the build. I feel that for every except you (and maybe BDE) the explicit rules are clearer and more straight forward. I do not see anything wrong with redefining system implicit YACC rules. They are not wrong, they are just redundant for most of the part. My changes tell how to build FreeBSD versions of YACC input (.y) files, and how to build FreeBSD versions of YACC output (.c and .h) files. This is only different from your version by letting sys.mk rules run yacc(1), in one well defined way. These changes also resemble those that were before your WIP_GCC31 merge, and for which you already agreed by committing them. Not to say they fix a real bug in the -j case and fix CLEANFILES. You have repeatedly hounded me for quite a while about GCC. Since so much of my blood and sweat are not acceptable to you, I encourage you to become the GCC maintainer and do everything to your heart's desire. Sorry I was working on cross-platform building issues in the past that also needed some changes in GCC and Binutils. Sorry I sent you too many patches which fixed bugs or added features. Sorry you can't hold an exclusive lock on the whole FreeBSD. Is this really your sight at things? I'm amazed. What you call hounding would better be classified as a pure technical feedback including patches and asking related questions, and maintainer is excepted to deal with this load, either accepting patches or rejecting them (giving valid technical reasons). If you aren't capable of accepting useful critics (in the form of patches and answering questions), I think you should seriously reconsider whether you really want to continue be a MAINTAINER. (I say critics because that's how you probably take what I call feedback.) People are really making me regret that I sweated over GCC 3 to bring it into our tree for all of our architectures and to get many serious bugs fixed in the FSF CVS repository. What reward do you need for this? So that nobody reviews your commits, or looks to anything you are maintaining? You want the god mode in FreeBSD? Sorry but I'm affraid this is not possible, or FreeBSD should be renamed to ObrienBSD. GCC and Binutils are essential part of FreeBSD, sitting in its heart, and many other folks including me work on related issues, and apparently look to the work you're doing. From my first days in the project, I took it as a joint effort thing, in fact that's one of the reasons I agreed to become a committer, but behavior like you are demonstrating doesn't fold into this. What you don't seem to realize is that people like me and BDE _don't_ blame you but are just trying to help you do the work done. It's a real pita you see the things in a different light. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age msg38234/pgp0.pgp Description: PGP signature
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 ...
David O'Brien wrote: People are really making me regret that I sweated over GCC 3 to bring it into our tree for all of our architectures and to get many serious bugs fixed in the FSF CVS repository. Really? It must be in private email... from what I've seen, everything went incredibly smoothly -- moreso than could be reasonably expected. The only think I personally saw that was anywhere close to a real problem was the 96 byte boot bloat, which I think can be resolved with explicit aligns/#pragma pack(1), and disabling one of the speed vs. space optimizations (the instruction pipelining). The mailing lists have been, as far as I could tell, blissfully silent on the subject. -- Terry To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
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. 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. These changes are wrong. 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. RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v ... -c-parse.c: c-parse.in +c-parse.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 - sed -e s/malloc/xmalloc/g \ + -e s/malloc/xmalloc/g \ -e s/realloc/xrealloc/g \ - c-parse.c.in c-parse.c + ${.ALLSRC} ${.TARGET} The malloc usage is in the Byacc output, not the input. There's no difference, [b]yacc just copies C code blocks intact. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age msg38170/pgp0.pgp Description: PGP signature
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 ...
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. 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. These changes are wrong. 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. There is NO way you've bootstrapped GCC 3.1 using these patches. Remember a full bootstrap is a `make world ; make buildworld'. # 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 === cc_fbsd ... === cc_tools ... === cc_int ... cc -O -pipe -march=k6 -DIN_GCC -DHAVE_CONFIG_H -DPREFIX=\/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 I say again, the malloc usage is not in c-parse.in, it is in the parser driver produced by Byacc. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
On Sat, May 11, 2002 at 10:44:11AM +0300, Ruslan Ermilov wrote: The malloc usage is in the Byacc output, not the input. There's no difference, [b]yacc just copies C code blocks intact. No. Byacc copies C code blocks from the input grammer intact. It also adds more C code to the output. See src/usr.bin/yacc/skeleton.c. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
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. I dont think you've tested them properly. They will not work. RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v ... -c-parse.c: c-parse.in +c-parse.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 - sed -e s/malloc/xmalloc/g \ + -e s/malloc/xmalloc/g \ -e s/realloc/xrealloc/g \ - c-parse.c.in c-parse.c + ${.ALLSRC} ${.TARGET} =20 The malloc usage is in the Byacc output, not the input. =20 There's no difference, [b]yacc just copies C code blocks intact. Do not forget the driver code. There are malloc/calloc calls in the byacc generated c-parse.c.. There are no malloc/calloc calls in the c-parse.in file (see for yourself). If you actually test this, you will get a failure due to 'poisoned' malloc/calloc/etc calls. Cheers, -Peter -- Peter Wemm - [EMAIL PROTECTED]; [EMAIL PROTECTED]; [EMAIL PROTECTED] All of this is for nothing if we don't go to the stars - JMS/B5 To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
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. 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. These changes are wrong. 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. There is NO way you've bootstrapped GCC 3.1 using these patches. Remember a full bootstrap is a `make world ; make buildworld'. # 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 === cc_fbsd ... === cc_tools ... === cc_int ... cc -O -pipe -march=k6 -DIN_GCC -DHAVE_CONFIG_H -DPREFIX=\/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 I say again, the malloc usage is not in c-parse.in, it is in the parser driver produced by Byacc. OK, now that you've explained it: %%% Index: cc1/Makefile === RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- cc1/Makefile10 May 2002 08:54:45 - 1.26 +++ cc1/Makefile11 May 2002 09:33:44 - @@ -2,7 +2,7 @@ .include ../Makefile.inc -.PATH: ../cc_tools ${GCCDIR} +.PATH: ${GCCDIR} PROG= cc1 SRCS= main.c c-parse.c c-lang.c c-decl.c @@ -17,17 +17,20 @@ #--- # C parser -.ORDER: c-parse.c -c-parse.c: c-parse.in + +YFLAGS=# 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} -CLEANFILES+= c-parse.c c-parse.y # insurance +CLEANFILES= c-parse-in.y c-parse-in.c c-parse.c .include bsd.prog.mk Index: cc1obj/Makefile === 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 - 1.20 +++ cc1obj/Makefile 11 May 2002 09:33:44 - @@ -2,7 +2,7 @@ .include ../Makefile.inc -.PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR} +.PATH: ${GCCDIR}/objc ${GCCDIR} PROG= cc1obj SRCS= objc-parse.c objc-act.c objc-lang.c main.c c-decl.c @@ -17,18 +17,21 @@ #--- # objc parser -.ORDER: objc-parse.c -objc-parse.c: c-parse.in + +YFLAGS=# 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} -CLEANFILES+= objc-parse.c objc-parse.y # insurance +CLEANFILES= objc-parse-in.y objc-parse-in.c objc-parse.c #--- Index: cc1plus/Makefile === RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- cc1plus/Makefile10 May 2002 08:54:46 - 1.27 +++ cc1plus/Makefile11 May 2002 09:33:44 - @@ -5,7 +5,7 @@ .PATH: ${GCCDIR}/cp ${GCCDIR} PROG= cc1plus -SRCS= parse.y cfns.h +SRCS= parse.c parse.h cfns.h SRCS+= main.c cp-lang.c SRCS+= call.c class.c cvt.c decl.c decl2.c error.c except.c expr.c \ friend.c init.c lex.c mangle.c
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 ...
On Sat, May 11, 2002 at 12:35:38PM +0300, Ruslan Ermilov wrote: I say again, the malloc usage is not in c-parse.in, it is in the parser driver produced by Byacc. OK, now that you've explained it: I'll look this patch over carefully, but at first glance it all seems like stylistic changes. Does it fix a bug, or you just don't like how I did things? To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message
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 ...
On Fri, May 10, 2002 at 01:54:50AM -0700, David E. O'Brien wrote: obrien 2002/05/10 01:54:50 PDT Modified files: gnu/lib/csu Makefile gnu/lib/libgcc Makefile gnu/lib/libibertyMakefile gnu/lib/libobjc Makefile gnu/lib/libstdc++Makefile config.h gnu/lib/libsupc++Makefile gnu/usr.bin/cc Makefile Makefile.fe Makefile.inc Makefile.tgt gnu/usr.bin/cc/c++ Makefile gnu/usr.bin/cc/c++filt Makefile gnu/usr.bin/cc/ccMakefile gnu/usr.bin/cc/cc1 Makefile gnu/usr.bin/cc/cc1obj Makefile gnu/usr.bin/cc/cc1plus Makefile gnu/usr.bin/cc/cc_drv Makefile gnu/usr.bin/cc/cc_fbsd Makefile gnu/usr.bin/cc/cc_int Makefile gnu/usr.bin/cc/cc_tools Makefile auto-host.h freebsd-native.h gnu/usr.bin/cc/cccp Makefile gnu/usr.bin/cc/collect2 Makefile gnu/usr.bin/cc/cpp Makefile gnu/usr.bin/cc/cpp0 Makefile gnu/usr.bin/cc/doc Makefile gnu/usr.bin/cc/f77 Makefile gnu/usr.bin/cc/f771 Makefile gnu/usr.bin/cc/f77doc Makefile gnu/usr.bin/cc/gcov Makefile gnu/usr.bin/cc/protoize Makefile gnu/usr.bin/cc/tradcpp0 Makefile Log: Bmake bits for Gcc 3.1. Partially made possible by: [EMAIL PROTECTED] 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. (David, I'm copying -current so that others may benefit from this patch while you're asleep.) %%% Index: cc1/Makefile === RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- cc1/Makefile10 May 2002 08:54:45 - 1.26 +++ cc1/Makefile10 May 2002 14:54:51 - @@ -2,10 +2,10 @@ .include ../Makefile.inc -.PATH: ../cc_tools ${GCCDIR} +.PATH: ${GCCDIR} PROG= cc1 -SRCS= main.c c-parse.c c-lang.c c-decl.c +SRCS= main.c c-parse.y c-lang.c c-decl.c BINDIR=/usr/libexec NOMAN= 1 NOSHARED?=yes @@ -17,17 +17,14 @@ #--- # C parser -.ORDER: c-parse.c -c-parse.c: c-parse.in +c-parse.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 - sed -e s/malloc/xmalloc/g \ + -e s/malloc/xmalloc/g \ -e s/realloc/xrealloc/g \ - c-parse.c.in c-parse.c + ${.ALLSRC} ${.TARGET} -CLEANFILES+= c-parse.c c-parse.y # insurance +CLEANFILES= c-parse.y .include bsd.prog.mk Index: cc1obj/Makefile === 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 - 1.20 +++ cc1obj/Makefile 10 May 2002 14:54:51 - @@ -2,10 +2,10 @@ .include ../Makefile.inc -.PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR} +.PATH: ${GCCDIR}/objc ${GCCDIR} PROG= cc1obj -SRCS= objc-parse.c objc-act.c objc-lang.c main.c c-decl.c +SRCS= objc-parse.y objc-act.c objc-lang.c main.c c-decl.c BINDIR=/usr/libexec NOMAN= 1 NOSHARED?=yes @@ -17,18 +17,16 @@ #--- # objc parser -.ORDER: objc-parse.c -objc-parse.c: c-parse.in + +objc-parse.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 - sed -e s/malloc/xmalloc/g \ + -e s/malloc/xmalloc/g \ -e s/realloc/xrealloc/g \ - objc-parse.c.in objc-parse.c + ${.ALLSRC} ${.TARGET} -CLEANFILES+= objc-parse.c objc-parse.y # insurance +CLEANFILES+= objc-parse.y #--- Index: cc1plus/Makefile === RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- cc1plus/Makefile10 May 2002 08:54:46 - 1.27 +++ cc1plus/Makefile10 May 2002 14:54:51 - @@ -5,7 +5,7 @@ .PATH: ${GCCDIR}/cp ${GCCDIR} PROG= cc1plus -SRCS= parse.y cfns.h +SRCS= parse.y y.tab.h parse.h cfns.h SRCS+= main.c cp-lang.c SRCS+= 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,19 @@ DPADD+=${LIBCC_INT} LDADD+=${LIBCC_INT} -CLEANFILES+= parse.c parse.h y.tab.c y.tab.h cfns.h +CLEANFILES= parse.y parse.h
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 ...
On Fri, May 10, 2002 at 06:04:27PM +0300, Ruslan Ermilov wrote: Bmake bits for Gcc 3.1. 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. These changes are wrong. RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v ... -c-parse.c: c-parse.in +c-parse.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 - sed -e s/malloc/xmalloc/g \ + -e s/malloc/xmalloc/g \ -e s/realloc/xrealloc/g \ - c-parse.c.in c-parse.c + ${.ALLSRC} ${.TARGET} The malloc usage is in the Byacc output, not the input. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-current in the body of the message