Dear,
The patch git-updates.diff including bug fixes from release/gcc-12 branch have
not been enabled in rules.patch, for gcc-12-12.2.0-14 and -17 (sid and exp).
( see
https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules.patch
line 15~17 )
To enable git-updates.diff, some of debian patches need to be updated :
debian/patches/gcc-distro-specs.diff
and
debian/patches/gcc-multilib-multiarch.diff
I made a patch to update these debian patches, so that the build of
gcc-12-12.2.0-14 and -17 work normally, and PR 106322 is included.
[https://salsa.debian.org/assets/twitter_card-570ddb06edf56a2312253c5872489847a0f385112ddbcd71ccfa1570febab5d2.jpg]<https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules.patch>
debian/rules.patch · gcc-12-debian · Debian GCC Maintainers / GCC ·
GitLab<https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules.patch>
Debian Salsa Gitlab
salsa.debian.org
Thanks,
Best Regards,
Ricky X.Y. LIU
________________________________
CONFIDENTIALITY NOTICE:
The content of this email and any attachments (“Email”) is confidential, may be
privileged, subject to copyright and may be read, copied and used only by the
intended recipient.
If you are not the intended recipient, please notify the sender by return email
or telephone immediately and erase all copies (including any attachments) and
do not disclose the Email or any part of it to any person. Any use, retention,
disclosure, copying, printing, forwarding or dissemination of the Email is
strictly prohibited if you are not the intended recipient.
ASTRI reserve the right to monitor all email communications through ASTRI’s
networks.
________________________________
diff -Narup a/debian/patches/gcc-distro-specs.diff b/debian/patches/gcc-distro-specs.diff
--- a/debian/patches/gcc-distro-specs.diff 2022-10-31 21:50:28.000000000 +0800
+++ b/debian/patches/gcc-distro-specs.diff 2023-04-07 09:57:08.034297864 +0800
@@ -1,20 +1,19 @@
# DP: Add empty distro and hardening specs
---- a/src/gcc/gcc.cc
-+++ b/src/gcc/gcc.cc
-@@ -27,6 +27,11 @@ CC recognizes how to compile each input
- Once it knows which kind of compilation to perform, the procedure for
+--- a/src/gcc/gcc.cc 2023-04-06 08:20:07.000000000 +0800
++++ b/src/gcc/gcc.cc 2023-04-07 09:54:02.948157378 +0800
+@@ -28,6 +28,10 @@ Once it knows which kind of compilation
compilation is specified by a string called a "spec". */
+ #define INCLUDE_STRING
+/* Inject some default compilation flags which are used as the default.
+ Done by the packaging build system. Should that be done in the headers
+ gcc/config/<arch>/*.h instead? */
+#include "distro-defaults.h"
-+
#include "config.h"
#include "system.h"
#include "coretypes.h"
-@@ -984,6 +989,90 @@ proper position among the other output f
+@@ -986,6 +990,90 @@ proper position among the other output f
#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
#endif
@@ -105,7 +104,7 @@
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1040,7 +1129,7 @@ proper position among the other output f
+@@ -1042,7 +1130,7 @@ proper position among the other output f
#ifndef LINK_PIE_SPEC
#ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC
@@ -114,7 +113,7 @@
#endif
#else
#define LD_PIE_SPEC ""
-@@ -1157,6 +1246,7 @@ proper position among the other output f
+@@ -1159,6 +1247,7 @@ proper position among the other output f
"%{flto|flto=*:%<fcompare-debug*} \
%{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
"%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
@@ -122,7 +121,7 @@
"%X %{o*} %{e*} %{N} %{n} %{r}\
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
%{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-@@ -1197,6 +1287,7 @@ static const char *cpp_spec = CPP_SPEC;
+@@ -1199,6 +1288,7 @@ static const char *cpp_spec = CPP_SPEC;
static const char *cc1_spec = CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
@@ -130,7 +129,7 @@
static const char *link_ssp_spec = LINK_SSP_SPEC;
static const char *asm_spec = ASM_SPEC;
static const char *asm_final_spec = ASM_FINAL_SPEC;
-@@ -1255,7 +1346,7 @@ static const char *cpp_options =
+@@ -1257,7 +1347,7 @@ static const char *cpp_options =
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
%{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -139,7 +138,7 @@
/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
-@@ -1444,9 +1535,9 @@ static const struct compiler default_com
+@@ -1446,9 +1536,9 @@ static const struct compiler default_com
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -151,7 +150,7 @@
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
{"-",
"%{!E:%e-E or -x required when input is from standard input}\
-@@ -1460,18 +1551,18 @@ static const struct compiler default_com
+@@ -1462,18 +1552,18 @@ static const struct compiler default_com
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -173,7 +172,7 @@
{".s", "@assembler", 0, 0, 0},
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1703,6 +1794,7 @@ static struct spec_list static_specs[] =
+@@ -1705,6 +1795,7 @@ static struct spec_list static_specs[] =
INIT_STATIC_SPEC ("cc1_options", &cc1_options),
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
diff -Narup a/debian/patches/gcc-multilib-multiarch.diff b/debian/patches/gcc-multilib-multiarch.diff
--- a/debian/patches/gcc-multilib-multiarch.diff 2023-01-02 23:29:18.000000000 +0800
+++ b/debian/patches/gcc-multilib-multiarch.diff 2023-04-07 10:22:29.080305683 +0800
@@ -112,8 +112,8 @@
else
MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
endif
---- a/src/gcc/config/loongarch/t-linux
-+++ b/src/gcc/config/loongarch/t-linux
+--- a/src/gcc/config/loongarch/t-linux 2023-04-07 10:17:51.289598785 +0800
++++ b/src/gcc/config/loongarch/t-linux 2023-04-07 10:21:09.940083732 +0800
@@ -32,22 +32,19 @@ ifneq ($(call if_multiarch,yes),yes)
else
# Only define MULTIARCH_DIRNAME when multiarch is enabled,
@@ -127,7 +127,7 @@
MULTILIB_OSDIRNAMES = \
- mabi.lp64d=../lib64$\
-- $(call if_multiarch,:loongarch64-linux-gnuf64)
+- $(call if_multiarch,:loongarch64-linux-gnu)
+ mabi.lp64d=../lib$(call if_multiarch,:loongarch64-linux-gnuf64)
MULTILIB_OSDIRNAMES += \
