diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-10-27 08:47:25 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-10-27 08:47:25 -0700 |
| commit | a6d3012b274f38b20e2a57162106f625746af6c6 (patch) | |
| tree | 09ff8b13eb8ff7594c27dc8812efbf696dc97484 /libcpp | |
| parent | cd2fd5facb5e1882d3f338ed456ae9536f7c0593 (diff) | |
| parent | 99b1021d21e5812ed01221d8fca8e8a32488a934 (diff) | |
| download | gcc-a6d3012b274f38b20e2a57162106f625746af6c6.zip gcc-a6d3012b274f38b20e2a57162106f625746af6c6.tar.gz gcc-a6d3012b274f38b20e2a57162106f625746af6c6.tar.bz2 | |
Merge from trunk revision 99b1021d21e5812ed01221d8fca8e8a32488a934.
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 9 | ||||
| -rw-r--r-- | libcpp/Makefile.in | 3 | ||||
| -rw-r--r-- | libcpp/charset.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 3fca7fd..32c91eb 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,12 @@ +2021-10-22 Eric Gallager <egallager@gcc.gnu.org> + + PR other/102663 + * Makefile.in: Add dummy install-dvi target. + +2021-10-18 Martin Liska <mliska@suse.cz> + + * charset.c (convert_oct): Remove unused but set variable. + 2021-10-06 Jakub Jelinek <jakub@redhat.com> * init.c (lang_defaults): Implement P2334R1, enable elifdef for diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in index 6c403a8..34e4206 100644 --- a/libcpp/Makefile.in +++ b/libcpp/Makefile.in @@ -195,6 +195,7 @@ html: info: install-info: install-pdf: +install-dvi: install-man: install-html: @@ -202,7 +203,7 @@ update-po: $(CATALOGS:.gmo=.pox) .PHONY: installdirs install install-strip mostlyclean clean distclean \ maintainer-clean check installcheck dvi pdf html info install-info \ - install-man update-po install-html + install-man update-po install-html install-pdf install-dvi # Dependency rule. COMPILE.base = $(COMPILER) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(COMPILER_FLAGS) -c diff --git a/libcpp/charset.c b/libcpp/charset.c index b84a974..e4e45f6 100644 --- a/libcpp/charset.c +++ b/libcpp/charset.c @@ -1464,7 +1464,6 @@ convert_oct (cpp_reader *pfile, const uchar *from, const uchar *limit, cppchar_t c, n = 0; size_t width = cvt.width; size_t mask = width_to_mask (width); - bool overflow = false; /* loc_reader and ranges must either be both NULL, or both be non-NULL. */ gcc_assert ((loc_reader != NULL) == (ranges != NULL)); @@ -1477,7 +1476,6 @@ convert_oct (cpp_reader *pfile, const uchar *from, const uchar *limit, from++; if (loc_reader) char_range.m_finish = loc_reader->get_next ().m_finish; - overflow |= n ^ (n << 3 >> 3); n = (n << 3) + c - '0'; } |