From 3fe3efe5c141a88a80c1ecc6aebc7f15d6426f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 7 Sep 2020 13:18:42 +0200
Subject: [PATCH] gcc: Make strchr return value pointers const
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixes compilation of codepaths for dos-like filesystems
with Clang. When built with clang, it treats C input files as C++
when the compiler driver is invoked in C++ mode, triggering errors
when the return value of strchr() on a pointer to const is assigned
to a pointer to non-const variable.
This matches similar variables outside of the ifdefs for dos-like
path handling.
2020-09-07 Martin Storsjö <martin@martin.st>
gcc/
* dwarf2out.c (file_name_acquire): Make a strchr return value
pointer to const.
libcpp/
* files.c (remap_filename): Make a strchr return value pointer
to const.
---
gcc/dwarf2out.c | 2 +-
libcpp/files.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index b6ab49bb5482..4096c0c0d69f 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12118,7 +12118,7 @@ file_name_acquire (dwarf_file_data **slot, file_name_acquire_data *fnad)
f = strrchr (f, DIR_SEPARATOR);
#if defined (DIR_SEPARATOR_2)
{
- char *g = strrchr (fi->path, DIR_SEPARATOR_2);
+ const char *g = strrchr (fi->path, DIR_SEPARATOR_2);
if (g != NULL)
{
diff --git a/libcpp/files.c b/libcpp/files.c
index 3d48c38fc0a8..b890b8ebf1e0 100644
--- a/libcpp/files.c
+++ b/libcpp/files.c
@@ -1693,7 +1693,7 @@ remap_filename (cpp_reader *pfile, _cpp_file *file)
p = strchr (fname, '/');
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
{
- char *p2 = strchr (fname, '\\');
+ const char *p2 = strchr (fname, '\\');
if (!p || (p > p2))
p = p2;
}
--
GitLab