This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH, libcpp] Fix thinko in _cpp_remaining_tokens_num_in_context (PR bootstrap/50801)
- From: Dodji Seketeli <dodji at redhat dot com>
- To: "Ulrich Weigand" <uweigand at de dot ibm dot com>
- Cc: gcc-patches at gcc dot gnu dot org (GCC Patches), tromey at redhat dot com (Tom Tromey), jason at redhat dot com (Jason Merrill)
- Date: Thu, 20 Oct 2011 10:39:45 +0200
- Subject: Re: [PATCH, libcpp] Fix thinko in _cpp_remaining_tokens_num_in_context (PR bootstrap/50801)
- References: <201110200823.p9K8Nb71029073@d06av02.portsmouth.uk.ibm.com>
"Ulrich Weigand" <uweigand@de.ibm.com> writes:
> I can confirm that the patch does fix the newlib build failure I was
> seeing on SPU.
Pheew, thank you.
Below is a better patch that I am bootstrapping at the moment.
From: Dodji Seketeli <dodji@redhat.com>
Date: Thu, 20 Oct 2011 09:43:49 +0200
Subject: [PATCH] Fix thinko in _cpp_remaining_tokens_num_in_context
libcpp/
* lex.c (_cpp_remaining_tokens_num_in_context): Fix computation of
number of tokens.
---
libcpp/ChangeLog | 6 ++++++
libcpp/lex.c | 6 ++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index bbb4085..128d3e1 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-20 Dodji Seketeli <dodji@redhat.com>
+
+ PR bootstrap/50801
+ * lex.c (_cpp_remaining_tokens_num_in_context): Fix computation of
+ number of tokens.
+
2011-10-18 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50760
diff --git a/libcpp/lex.c b/libcpp/lex.c
index cd6ae9f..527368b 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1710,12 +1710,10 @@ _cpp_remaining_tokens_num_in_context (cpp_reader *pfile)
{
cpp_context *context = pfile->context;
if (context->tokens_kind == TOKENS_KIND_DIRECT)
- return ((LAST (context).token - FIRST (context).token)
- / sizeof (cpp_token));
+ return (LAST (context).token - FIRST (context).token);
else if (context->tokens_kind == TOKENS_KIND_INDIRECT
|| context->tokens_kind == TOKENS_KIND_EXTENDED)
- return ((LAST (context).ptoken - FIRST (context).ptoken)
- / sizeof (cpp_token *));
+ return (LAST (context).ptoken - FIRST (context).ptoken);
else
abort ();
}
--
1.7.6.4
--
Dodji