This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] PR preprocessor/35379
- From: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 27 Feb 2008 19:29:03 +0100
- Subject: [PATCH] PR preprocessor/35379
Besides fixing 35379, this patch also avoid some more superfluous
whitespace in the output. regtest is running. OK for trunk if it
passes?
Thanks,
Ralf
libcpp/ChangeLog:
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.
diff --git a/libcpp/mkdeps.c b/libcpp/mkdeps.c
index 8aa96c5..11488ce 100644
--- a/libcpp/mkdeps.c
+++ b/libcpp/mkdeps.c
@@ -1,5 +1,5 @@
/* 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
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]);
column += size;
- if (colmax && column > colmax)
- {
- fputs (" \\\n ", fp);
- column = 1 + size;
- }
if (i)
{
- putc (' ', fp);
- column++;
+ if (colmax && column > colmax)
+ {
+ fputs (" \\\n ", fp);
+ column = 1 + size;
+ }
+ else
+ {
+ putc (' ', fp);
+ column++;
+ }
}
fputs (d->targetv[i], fp);
}
putc (':', fp);
- putc (' ', fp);
- column += 2;
+ column++;
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);
column = 1 + size;
}
- if (i)
+ else
{
putc (' ', fp);
column++;