summaryrefslogtreecommitdiffstats
path: root/debian/patches/pr79724-revert.diff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 13:58:36 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 13:58:36 +0000
commit1d3b23e6bdbf53eb74161c37d8c355c2ec858a19 (patch)
treee279a67ec4f447e99b0754e7964666f7b48b5c05 /debian/patches/pr79724-revert.diff
parentAdding upstream version 14-20240201. (diff)
downloadgcc-14-debian.tar.xz
gcc-14-debian.zip
Adding debian version 14-20240201-3.debian/14-20240201-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/patches/pr79724-revert.diff24
1 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/pr79724-revert.diff b/debian/patches/pr79724-revert.diff
new file mode 100644
index 0000000..1bfbc0e
--- /dev/null
+++ b/debian/patches/pr79724-revert.diff
@@ -0,0 +1,24 @@
+# DP: Revert PR ada/79724, handling of suffixes (conflicts with local ada-gcc-name patch)
+
+--- a/src/gcc/ada/osint.adb
++++ b/src/gcc/ada/osint.adb
+@@ -2277,6 +2277,8 @@ package body Osint is
+
+ Find_Program_Name;
+
++ Start_Of_Suffix := Name_Len + 1;
++
+ -- Find the target prefix if any, for the cross compilation case.
+ -- For instance in "powerpc-elf-gcc" the target prefix is
+ -- "powerpc-elf-"
+@@ -2300,7 +2302,9 @@ package body Osint is
+ end if;
+ end loop;
+
+- Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
++ if End_Of_Prefix > 1 then
++ Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
++ end if;
+
+ -- Create the new program name
+