[gcc/devel/omp/gcc-9] backport: re PR target/80672 (gcc/config/sh/sh.c:716: prefer compare to find.)

Tobias Burnus burnus@gcc.gnu.org
Thu Mar 5 14:06:00 GMT 2020


https://gcc.gnu.org/g:7f3471d204808a03dcece94bf71b5365ca78784d

commit 7f3471d204808a03dcece94bf71b5365ca78784d
Author: Oleg Endo <olegendo@gcc.gnu.org>
Date:   Sat Sep 28 08:37:23 2019 +0000

    backport: re PR target/80672 (gcc/config/sh/sh.c:716: prefer compare to find.)
    
    gcc/
    2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>
    
    	Backport from mainline
    	2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>
    
    	PR target/80672
    	* config/sh/sh.c (parse_validate_atomic_model_option): Use
    	std::string::compare instead of std::string::find.
    
    From-SVN: r276241

Diff:
---
 gcc/ChangeLog      | 9 +++++++++
 gcc/config/sh/sh.c | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4cd6e2..762c2c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>
+
+	Backport from mainline
+	2019-09-28  Oleg Endo  <olegendo@gcc.gnu.org>
+
+	PR target/80672
+	* config/sh/sh.c (parse_validate_atomic_model_option): Use
+	std::string::compare instead of std::string::find.
+
 2019-09-25  Kyrylo Tkachov <kyrylo.tkachov@arm.com>
 
 	Backport from mainline
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 8dc79a7..912ff97 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -737,7 +737,7 @@ got_mode_name:;
     {
       if (tokens[i] == "strict")
 	ret.strict = true;
-      else if (tokens[i].find ("gbr-offset=") == 0)
+      else if (!tokens[i].compare (0, strlen ("gbr-offset="), "gbr-offset="))
 	{
 	  std::string offset_str = tokens[i].substr (strlen ("gbr-offset="));
 	  ret.tcb_gbr_offset = integral_argument (offset_str.c_str ());



More information about the Gcc-cvs mailing list