From: Camm Maguire <camm@debian.org>
Date: Sun, 25 Dec 2022 12:14:33 +0000 (+0000)
Subject: <short summary of the patch>
X-Git-Tag: archive/raspbian/2.7.1-4+rpi1~2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b084e332c17b8aac744dbe23de0c094f87ba5040;p=gcl27.git

<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.13-5) unstable; urgency=medium

  * Version_2_6_14pre4

Gbp-Pq: Name Version_2_6_14pre4
---

diff --git a/configure b/configure
index 041c95d..396c910 100755
--- a/configure
+++ b/configure
@@ -4888,6 +4888,17 @@ if test "$FOMITF" != "" ; then
     TO3FLAGS="$TO3FLAGS $FOMITF"
 fi
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gcc version 12" >&5
+printf %s "checking gcc version 12... " >&6; }
+if $CC -v 2>&1|grep gcc |grep -q 'version 12'; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+   assert_arg_to_cflags -fno-tree-vrp #Bug workaround
+else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
 # Step 1: set the variable "system" to hold the name and version number
 # for the system.  This can usually be done via the "uname" command, but
 # there are a few systems, like Next, where this doesn't work.
diff --git a/configure.in b/configure.in
index 12b8abe..3f12ec7 100644
--- a/configure.in
+++ b/configure.in
@@ -491,6 +491,14 @@ if test "$FOMITF" != "" ; then
     TO3FLAGS="$TO3FLAGS $FOMITF"
 fi
 
+AC_MSG_CHECKING([gcc version 12])
+if $CC -v 2>&1|grep gcc |grep -q 'version 12'; then
+   AC_MSG_RESULT([yes])
+   assert_arg_to_cflags -fno-tree-vrp #Bug workaround
+else
+   AC_MSG_RESULT([no])
+fi
+
 # Step 1: set the variable "system" to hold the name and version number
 # for the system.  This can usually be done via the "uname" command, but
 # there are a few systems, like Next, where this doesn't work.
diff --git a/git.tag b/git.tag
index 17cfbdf..922ff21 100644
--- a/git.tag
+++ b/git.tag
@@ -1,2 +1,2 @@
-"Version_2_6_14pre3"
+"Version_2_6_14pre4"
 
diff --git a/h/elf64_riscv64_reloc.h b/h/elf64_riscv64_reloc.h
index 1ddc37e..c2f8232 100644
--- a/h/elf64_riscv64_reloc.h
+++ b/h/elf64_riscv64_reloc.h
@@ -13,6 +13,7 @@
       store_val(where,MASK(7)<<25,(s+a)<<20);
       break;
     case R_RISCV_CALL:
+    case R_RISCV_CALL_PLT:
       store_val(where,MASK(20)<<12,riscv_high(s+a-p));
       store_val((void *)where+4,MASK(12)<<20,(s+a-p)<<20);
       break;