diff options
author | Sam James <sam@gentoo.org> | 2024-09-29 19:45:37 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-09-29 19:45:37 +0100 |
commit | 3089cfb10e4f1acd30a280b40d4190e4cbe63ad6 (patch) | |
tree | 0be84b6dda0557e7f571dcf3c2bc12f9360a58e7 | |
parent | 12.4.0: add, clone of 12.3.0 with ada patch (diff) | |
download | gcc-patches-3089cfb10e4f1acd30a280b40d4190e4cbe63ad6.tar.gz gcc-patches-3089cfb10e4f1acd30a280b40d4190e4cbe63ad6.tar.bz2 gcc-patches-3089cfb10e4f1acd30a280b40d4190e4cbe63ad6.zip |
12.3.0: drop Ada patch from here
... as we're putting it in 12.4.0 instead.
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | 12.3.0/gentoo/78_all_PR115917-ada-lto.patch | 52 | ||||
-rw-r--r-- | 12.3.0/gentoo/README.history | 4 |
2 files changed, 0 insertions, 56 deletions
diff --git a/12.3.0/gentoo/78_all_PR115917-ada-lto.patch b/12.3.0/gentoo/78_all_PR115917-ada-lto.patch deleted file mode 100644 index 2e25ddf..0000000 --- a/12.3.0/gentoo/78_all_PR115917-ada-lto.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dd97dff998c9fc35e36397fc647f7360e1cadf70 Mon Sep 17 00:00:00 2001 -Message-ID: <dd97dff998c9fc35e36397fc647f7360e1cadf70.1727635310.git.sam@gentoo.org> -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me> -Date: Thu, 15 Aug 2024 19:17:41 +0200 -Subject: [PATCH] gnat: fix lto-type-mismatch between C_Version_String and - gnat_version_string [PR115917] - -gcc/ada/ChangeLog: - - PR ada/115917 - * gnatvsn.ads: Add note about the duplication of this value in - version.c. - * version.c (VER_LEN_MAX): Define to the same value as - Gnatvsn.Ver_Len_Max. - (gnat_version_string): Use VER_LEN_MAX as bound. - -(cherry picked from commit 9cbcf8d1de159e6113fafb5dc2feb4a7e467a302) ---- - gcc/ada/gnatvsn.ads | 3 ++- - gcc/ada/version.c | 5 ++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads -index 47a06b96c3cf..99d06c7e5aa4 100644 ---- a/gcc/ada/gnatvsn.ads -+++ b/gcc/ada/gnatvsn.ads -@@ -83,7 +83,8 @@ package Gnatvsn is - -- space to store any possible version string value for checks. This - -- value should never be decreased in the future, but it would be - -- OK to increase it if absolutely necessary. If it is increased, -- -- be sure to increase GNAT.Compiler.Version.Ver_Len_Max as well. -+ -- be sure to increase GNAT.Compiler.Version.Ver_Len_Max, and to update -+ -- the VER_LEN_MAX define in version.c as well. - - Ver_Prefix : constant String := "GNAT Version: "; - -- Prefix generated by binder. If it is changed, be sure to change -diff --git a/gcc/ada/version.c b/gcc/ada/version.c -index 5e64edd0b17d..2fa9b8c2c859 100644 ---- a/gcc/ada/version.c -+++ b/gcc/ada/version.c -@@ -31,4 +31,7 @@ - - #include "version.h" - --char gnat_version_string[] = version_string; -+/* Logically a reference to Gnatvsn.Ver_Len_Max. Please keep in sync. */ -+#define VER_LEN_MAX 256 -+ -+char gnat_version_string[VER_LEN_MAX] = version_string; --- -2.46.2 - diff --git a/12.3.0/gentoo/README.history b/12.3.0/gentoo/README.history index 899d235..6699fd4 100644 --- a/12.3.0/gentoo/README.history +++ b/12.3.0/gentoo/README.history @@ -1,7 +1,3 @@ -4 29 Sept 2024 - - + 78_all_PR115917-ada-lto.patch - 3 28 Feb 2024 + 77_all_riscv_PR106271-multilib-bootstrap.patch |