updated branch diff; rel 2

updated branch diff; rel 2

manually modified since patch tries to apply "hunks" quoted in commit
message:

@@ -515116,8 +515116,8 @@
     The fix can be either the patch below, return true for builtin macros,
     or we could instead return false for builtin macros, or the fix could
     be also (untested):
-    --- libcpp/expr.c       2021-05-07 10:34:46.345122608 +0200
-    +++ libcpp/expr.c       2021-08-12 09:54:01.837556365 +0200
+    \--- libcpp/expr.c       2021-05-07 10:34:46.345122608 +0200
+    \+++ libcpp/expr.c       2021-08-12 09:54:01.837556365 +0200
     @@ -783,13 +783,13 @@ cpp_classify_number (cpp_reader *pfile,

            /* Traditional C only accepted the 'L' suffix.
@@ -543596,8 +543596,8 @@

     My first attempt to fix this was instead of dropping the MO_VAL_SET add
     a MO_CLOBBER operation:
-    --- gcc/var-tracking.c.jj       2021-05-04 21:02:24.196799586 +0200
-    +++ gcc/var-tracking.c  2021-09-24 19:23:16.420154828 +0200
+    \--- gcc/var-tracking.c.jj       2021-05-04 21:02:24.196799586 +0200
+    \+++ gcc/var-tracking.c  2021-09-24 19:23:16.420154828 +0200
     @@ -6133,7 +6133,9 @@ add_stores (rtx loc, const_rtx expr, voi
          {
            if (preserve)