(find_barrier): Always use get_attr_length to compute length of

[pf3gnuchains/gcc-fork.git] / gcc / cpplib.c

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index aad2bdc..1891c20 100644 (file)
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
  In other words, you are welcome to use, share and improve this program.
  You are forbidden to forbid anyone else to use, share and improve
@@ -239,10 +239,6 @@ struct assertion_hashnode {
     while ((C) == '\\' && PEEKC() == '\n') { FORWARD(1); (C) = GETC(); }\
   } while(0)
 
-/* Name under which this program was invoked.  */
-
-char *progname;
-
 struct cpp_pending {
   struct cpp_pending *next;
   char *cmd;
@@ -2114,8 +2110,7 @@ output_line_command (pfile, conditional, file_change)
   long line, col;
   cpp_buffer *ip = CPP_BUFFER (pfile);
 
-  if (CPP_OPTIONS (pfile)->no_line_commands
-      || ip->fname == NULL || CPP_OPTIONS (pfile)->no_output) {
+  if (ip->fname == NULL || CPP_OPTIONS (pfile)->no_output) {
     return;
   }
 
@@ -2124,6 +2119,9 @@ output_line_command (pfile, conditional, file_change)
   col = CPP_BUFFER (pfile)->colno;
   adjust_position (CPP_LINE_BASE (ip), ip->cur, &line, &col);
 
+  if (CPP_OPTIONS (pfile)->no_line_commands)
+    return;
+
   if (conditional) {
     if (line == pfile->lineno)
       return;