This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Fix to treelang to work with current MAIN cvs. Restore regressed ChangeLog
- From: Tim Josling <tej at melbpc dot org dot au>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 11 May 2002 10:59:51 +1000
- Subject: Fix to treelang to work with current MAIN cvs. Restore regressed ChangeLog
- Organization: Melbourne PC User Group
I will commit this shortly. I left the CVS conflict in the patch to show
the regression.
Tim Josling
diff -r -c cvs.old/gcc/ChangeLog cvs/gcc/ChangeLog
*** cvs.old/gcc/ChangeLog Sat May 11 07:33:28 2002
--- cvs/gcc/ChangeLog Sat May 11 09:51:27 2002
***************
*** 1,9 ****
- <<<<<<< ChangeLog
- 2002-05-07 Tim Josling <tej@melbpc.org.au>
-
- * MAINTAINERS: Add self.
-
- =======
2002-05-09 Federico G. Schwindt <fgsch@olimpo.com.br>
* Makefile.in: Honour DESTDIR.
--- 1,3 ----
***************
*** 17,23 ****
* config-ml.in: Allow for PWDCMD to determine ML_POPDIR.
! >>>>>>> 1.507
2002-05-06 Loren J. Rittle <ljrittle@acm.org>
* ltmain.sh: Detect and handle object name conflicts
--- 11,20 ----
* config-ml.in: Allow for PWDCMD to determine ML_POPDIR.
! 2002-05-07 Tim Josling <tej@melbpc.org.au>
!
! * MAINTAINERS: Add self.
!
2002-05-06 Loren J. Rittle <ljrittle@acm.org>
* ltmain.sh: Detect and handle object name conflicts
diff -r -c cvs.old/gcc/gcc/treelang/ChangeLog
cvs/gcc/gcc/treelang/ChangeLog
*** cvs.old/gcc/gcc/treelang/ChangeLog Tue May 7 07:34:04 2002
--- cvs/gcc/gcc/treelang/ChangeLog Sat May 11 10:40:03 2002
***************
*** 1,3 ****
--- 1,8 ----
+ 2002-05-11 Tim Josling <tej@melbpc.org.au>
+
+ * treetree.c: (cpp_define) Add.
+ (cpp_get_callbacks) Add.
+
2002-05-07 Tim Josling <tej@melbpc.org.au>
* treetree.c: (cpp_get_options) Add.
diff -r -c cvs.old/gcc/gcc/treelang/treetree.c
cvs/gcc/gcc/treelang/treetree.c
*** cvs.old/gcc/gcc/treelang/treetree.c Tue May 7 07:38:21 2002
--- cvs/gcc/gcc/treelang/treetree.c Sat May 11 09:58:44 2002
***************
*** 1135,1140 ****
--- 1135,1156 ----
abort ();
}
+ /* Should not be called for treelang. */
+
+ void
+ cpp_define (cpp_reader * cr ATTRIBUTE_UNUSED, const char * c
ATTRIBUTE_UNUSED)
+ {
+ abort ();
+ }
+
+ /* Should not be called for treelang. */
+
+ cpp_callbacks *
+ cpp_get_callbacks (cpp_reader * cr ATTRIBUTE_UNUSED)
+ {
+ abort ();
+ }
+
/* Create the predefined scalar types of C,
and some nodes representing standard constants (0, 1, (void *) 0).
Initialize the global binding level.