git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR preprocessor/35379 (-MT generates a target string too long over two lines) 

libcpp:
	PR preprocessor/35379
	* mkdeps.c (deps_write): Ensure the first target always appears
	in the first column, without leading backslash newline.  Avoid
	some more extra whitespace.

From-SVN: r132727
This commit is contained in:
Ralf Wildenhues 2008-02-27 21:42:23 +00:00
parent 296746bda3
commit d482a07324
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcpp/ChangeLog
View File

@ -1,6 +1,13 @@
2008-02-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR preprocessor/35379
* mkdeps.c (deps_write): Ensure the first target always appears
in the first column, without leading backslash newline. Avoid
some more extra whitespace.
2008-02-25 Thiemo Seufer <ths@mips.com> 2008-02-25 Thiemo Seufer <ths@mips.com>
Makefile.in ($(srcdir)/config.in): Depend on configure.ac. * Makefile.in ($(srcdir)/config.in): Depend on configure.ac.
2008-02-19 Tom Tromey <tromey@redhat.com> 2008-02-19 Tom Tromey <tromey@redhat.com>

24
libcpp/mkdeps.c
View File

@ -1,5 +1,5 @@
/* Dependency generator for Makefile fragments. /* Dependency generator for Makefile fragments.
Copyright (C) 2000, 2001, 2003, 2007 Free Software Foundation, Inc. Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
Contributed by Zack Weinberg, Mar 2000 Contributed by Zack Weinberg, Mar 2000
This program is free software; you can redistribute it and/or modify it This program is free software; you can redistribute it and/or modify it
@ -298,22 +298,24 @@ deps_write (const struct deps *d, FILE *fp, unsigned int colmax)
{ {
size = strlen (d->targetv[i]); size = strlen (d->targetv[i]);
column += size; column += size;
if (colmax && column > colmax)
{
fputs (" \\\n ", fp);
column = 1 + size;
}
if (i) if (i)
{ {
putc (' ', fp); if (colmax && column > colmax)
column++; {
fputs (" \\\n ", fp);
column = 1 + size;
}
else
{
putc (' ', fp);
column++;
}
} }
fputs (d->targetv[i], fp); fputs (d->targetv[i], fp);
} }
putc (':', fp); putc (':', fp);
putc (' ', fp); column++;
column += 2;
for (i = 0; i < d->ndeps; i++) for (i = 0; i < d->ndeps; i++)
{ {
@ -324,7 +326,7 @@ deps_write (const struct deps *d, FILE *fp, unsigned int colmax)
fputs (" \\\n ", fp); fputs (" \\\n ", fp);
column = 1 + size; column = 1 + size;
} }
if (i) else
{ {
putc (' ', fp); putc (' ', fp);
column++; column++;