Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gcc7 for openSUSE:Factory checked in
at 2025-04-08 17:52:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcc7 (Old)
and /work/SRC/openSUSE:Factory/.gcc7.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc7"
Tue Apr 8 17:52:11 2025 rev:45 rq:1267852 version:7.5.0+r278197
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcc7/gcc7.changes 2025-03-11
20:46:56.594267026 +0100
+++ /work/SRC/openSUSE:Factory/.gcc7.new.1907/gcc7.changes 2025-04-08
17:53:03.239080881 +0200
@@ -1,0 +2,17 @@
+Mon Apr 7 12:36:11 UTC 2025 - Richard Biener <rguent...@suse.com>
+
+- Make sure link editing is done against our own shared library
+ copy rather than the installed system runtime. [bsc#1240788]
+- Disable MPX for SLE16 and Factory builds, modern binutils dropped
+ support for it.
+- Add gcc7-enable-mpx-in-as.patch to enable MPX support in the
+ assembler (disabled by default with binutils 2.44) when -mmpx
+ is specified. Fixup libmpx assembler configure check.
+
+-------------------------------------------------------------------
+Thu Mar 13 13:42:56 UTC 2025 - Richard Biener <rguent...@suse.com>
+
+- Add gcc7-bsc1239566.patch to also record -D_FORTIFY_SOURCE=2
+ in the DWARF debug info DW_AT_producer string. [bsc#1239566]
+
+-------------------------------------------------------------------
New:
----
gcc7-bsc1239566.patch
gcc7-enable-mpx-in-as.patch
BETA DEBUG BEGIN:
New:
- Add gcc7-bsc1239566.patch to also record -D_FORTIFY_SOURCE=2
in the DWARF debug info DW_AT_producer string. [bsc#1239566]
New: support for it.
- Add gcc7-enable-mpx-in-as.patch to enable MPX support in the
assembler (disabled by default with binutils 2.44) when -mmpx
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-aarch64-gcc7.spec ++++++
--- /var/tmp/diff_new_pack.Yhd9zg/_old 2025-04-08 17:53:05.055157062 +0200
+++ /var/tmp/diff_new_pack.Yhd9zg/_new 2025-04-08 17:53:05.059157229 +0200
@@ -156,6 +156,8 @@
Patch46: gcc7-bsc1216488.patch
Patch47: gcc7-pr87723.patch
Patch48: gcc7-pr82463.patch
+Patch49: gcc7-bsc1239566.patch
+Patch50: gcc7-enable-mpx-in-as.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@@ -358,6 +360,8 @@
%patch -P 46 -p1
%patch -P 47 -p1
%patch -P 48 -p1
+%patch -P 49 -p1
+%patch -P 50 -p1
%patch -P 51
%patch -P 60
%patch -P 61
cross-arm-gcc7.spec: same change
cross-arm-none-gcc7-bootstrap.spec: same change
cross-arm-none-gcc7.spec: same change
cross-avr-gcc7-bootstrap.spec: same change
cross-avr-gcc7.spec: same change
cross-hppa-gcc7.spec: same change
cross-i386-gcc7.spec: same change
cross-m68k-gcc7.spec: same change
cross-mips-gcc7.spec: same change
cross-nvptx-gcc7.spec: same change
cross-ppc64-gcc7.spec: same change
cross-ppc64le-gcc7.spec: same change
cross-rx-gcc7-bootstrap.spec: same change
cross-rx-gcc7.spec: same change
cross-s390x-gcc7.spec: same change
cross-sparc-gcc7.spec: same change
cross-sparc64-gcc7.spec: same change
cross-x86_64-gcc7.spec: same change
++++++ gcc7-testresults.spec ++++++
--- /var/tmp/diff_new_pack.Yhd9zg/_old 2025-04-08 17:53:05.579179043 +0200
+++ /var/tmp/diff_new_pack.Yhd9zg/_new 2025-04-08 17:53:05.583179211 +0200
@@ -66,7 +66,7 @@
%define vtv_arch x86_64 %ix86
%endif
%define cilkrts_arch x86_64 %ix86
-%if %{suse_version} >= 1310
+%if %{suse_version} >= 1310 && %{suse_version} < 1600
%define mpx_arch x86_64 %ix86
%endif
@@ -357,6 +357,8 @@
Patch46: gcc7-bsc1216488.patch
Patch47: gcc7-pr87723.patch
Patch48: gcc7-pr82463.patch
+Patch49: gcc7-bsc1239566.patch
+Patch50: gcc7-enable-mpx-in-as.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@@ -544,6 +546,8 @@
%patch -P 46 -p1
%patch -P 47 -p1
%patch -P 48 -p1
+%patch -P 49 -p1
+%patch -P 50 -p1
%patch -P 51
%patch -P 60
%patch -P 61
++++++ gcc7.spec ++++++
--- /var/tmp/diff_new_pack.Yhd9zg/_old 2025-04-08 17:53:05.607180218 +0200
+++ /var/tmp/diff_new_pack.Yhd9zg/_new 2025-04-08 17:53:05.607180218 +0200
@@ -45,7 +45,7 @@
%define vtv_arch x86_64 %ix86
%endif
%define cilkrts_arch x86_64 %ix86
-%if %{suse_version} >= 1310
+%if %{suse_version} >= 1310 && %{suse_version} < 1600
%define mpx_arch x86_64 %ix86
%endif
@@ -336,6 +336,8 @@
Patch46: gcc7-bsc1216488.patch
Patch47: gcc7-pr87723.patch
Patch48: gcc7-pr82463.patch
+Patch49: gcc7-bsc1239566.patch
+Patch50: gcc7-enable-mpx-in-as.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@@ -1881,6 +1883,8 @@
%patch -P 46 -p1
%patch -P 47 -p1
%patch -P 48 -p1
+%patch -P 49 -p1
+%patch -P 50 -p1
%patch -P 51
%patch -P 60
%patch -P 61
@@ -2323,7 +2327,8 @@
fi
%endif
-# move shared libs from versionspecific dir to main libdir
+# move shared libs from versionspecific dir to main libdir, keep a copy
+# for link-editing in the .so
for libname in \
%if %{build_fortran}
libgfortran \
@@ -2379,8 +2384,16 @@
mv $lib $RPM_BUILD_ROOT%{mainlibdir}/
done
if test -L $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so; then
- ln -sf %{mainlibdir}/`readlink
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e
's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ cp $RPM_BUILD_ROOT%{mainlibdir}/`readlink
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so` \
+ $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so.tem
+ rm $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ mv $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so.tem
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ else
+ if test -e $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so; then
+ echo ERROR: unexpected linker script for $libname.so
+ exit 1
+ fi
fi
%if %{biarch}
if test -d $RPM_BUILD_ROOT%{versmainlibdirbi}; then
@@ -2388,8 +2401,16 @@
mv $lib $RPM_BUILD_ROOT%{mainlibdirbi}/
done
if test -L $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so; then
- ln -sf %{mainlibdirbi}/`readlink
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so | sed -e
's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ cp $RPM_BUILD_ROOT%{mainlibdirbi}/`readlink
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so` \
+ $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so.tem
+ rm $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ mv $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so.tem
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ else
+ if test -e $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so; then
+ echo ERROR: unexpected linker script for $libname.so
+ exit 1
+ fi
fi
fi
%endif
@@ -2409,34 +2430,44 @@
%endif
%endif
-# Move libgcc_s around
+# Move libgcc_s around, make sure a version specific copy is available
+# for link editing
+chmod a+x $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so
- ln -sf /%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdir}/
+ cp $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so.%{libgcc_s}
fi
-chmod a+x $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
%if %{biarch}
%if %{build_primary_64bit}
+chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/lib/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/lib/libgcc_s.so
- ln -sf /lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/lib/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdirbi32}/
+ cp $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so.%{libgcc_s}
fi
ln -sf %{versmainlibdirbi32}/libgcc_s.so
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s_32.so
-chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
%else
# 32-bit biarch systems
+chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/lib64/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/lib64/libgcc_s.so
- ln -sf /lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/lib64/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdirbi64}/
+ cp $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so.%{libgcc_s}
fi
ln -sf %{versmainlibdirbi64}/libgcc_s.so
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s_64.so
-chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
%endif
%endif
@@ -2740,6 +2771,7 @@
%versmainlib libgcc*.a
%versmainlib libgcov.a
%versmainlib libgcc_s*.so
+%versmainlib libgcc_s.so.%{libgcc_s}
%versmainlib libgomp.so
%versmainlib libgomp.a
%versmainlib libgomp.spec
@@ -2811,6 +2843,7 @@
%versbiarchlib libgcc*.a
%versbiarchlib libgcov.a
%versbiarchlib libgcc_s*.so
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%versbiarchlib libgomp.so
%versbiarchlib libgomp.a
%versbiarchlib libgomp.spec
++++++ gcc.spec.in ++++++
--- /var/tmp/diff_new_pack.Yhd9zg/_old 2025-04-08 17:53:05.751186259 +0200
+++ /var/tmp/diff_new_pack.Yhd9zg/_new 2025-04-08 17:53:05.755186427 +0200
@@ -47,7 +47,7 @@
%define vtv_arch x86_64 %ix86
%endif
%define cilkrts_arch x86_64 %ix86
-%if %{suse_version} >= 1310
+%if %{suse_version} >= 1310 && %{suse_version} < 1600
%define mpx_arch x86_64 %ix86
%endif
@@ -343,6 +343,8 @@
Patch46: gcc7-bsc1216488.patch
Patch47: gcc7-pr87723.patch
Patch48: gcc7-pr82463.patch
+Patch49: gcc7-bsc1239566.patch
+Patch50: gcc7-enable-mpx-in-as.patch
# A set of patches from the RH srpm
Patch51: gcc41-ppc32-retaddr.patch
# Some patches taken from Debian
@@ -1155,6 +1157,8 @@
%patch -P 46 -p1
%patch -P 47 -p1
%patch -P 48 -p1
+%patch -P 49 -p1
+%patch -P 50 -p1
%patch -P 51
%patch -P 60
%patch -P 61
@@ -1600,7 +1604,8 @@
fi
%endif
-# move shared libs from versionspecific dir to main libdir
+# move shared libs from versionspecific dir to main libdir, keep a copy
+# for link-editing in the .so
for libname in \
%if %{build_fortran}
libgfortran \
@@ -1656,8 +1661,16 @@
mv $lib $RPM_BUILD_ROOT%{mainlibdir}/
done
if test -L $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so; then
- ln -sf %{mainlibdir}/`readlink
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e
's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ cp $RPM_BUILD_ROOT%{mainlibdir}/`readlink
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so` \
+ $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so.tem
+ rm $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ mv $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so.tem
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
+ else
+ if test -e $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so; then
+ echo ERROR: unexpected linker script for $libname.so
+ exit 1
+ fi
fi
%if %{biarch}
if test -d $RPM_BUILD_ROOT%{versmainlibdirbi}; then
@@ -1665,8 +1678,16 @@
mv $lib $RPM_BUILD_ROOT%{mainlibdirbi}/
done
if test -L $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so; then
- ln -sf %{mainlibdirbi}/`readlink
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so | sed -e
's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ cp $RPM_BUILD_ROOT%{mainlibdirbi}/`readlink
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so` \
+ $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so.tem
+ rm $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ mv $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so.tem
$RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
+ else
+ if test -e $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so; then
+ echo ERROR: unexpected linker script for $libname.so
+ exit 1
+ fi
fi
fi
%endif
@@ -1686,34 +1707,44 @@
%endif
%endif
-# Move libgcc_s around
+# Move libgcc_s around, make sure a version specific copy is available
+# for link editing
+chmod a+x $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so
- ln -sf /%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdir}/
+ cp $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdir}/libgcc_s.so.%{libgcc_s}
fi
-chmod a+x $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.%{libgcc_s}
%if %{biarch}
%if %{build_primary_64bit}
+chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/lib/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/lib/libgcc_s.so
- ln -sf /lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/lib/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdirbi32}/
+ cp $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so.%{libgcc_s}
fi
ln -sf %{versmainlibdirbi32}/libgcc_s.so
$RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s_32.so
-chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
%else
# 32-bit biarch systems
+chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
if test -L $RPM_BUILD_ROOT/lib64/libgcc_s.so; then
rm -f $RPM_BUILD_ROOT/lib64/libgcc_s.so
- ln -sf /lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
+ cp $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
else
mv $RPM_BUILD_ROOT/lib64/libgcc_s.so $RPM_BUILD_ROOT%{versmainlibdirbi64}/
+ cp $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so.%{libgcc_s}
+ strip -g $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so.%{libgcc_s}
fi
ln -sf %{versmainlibdirbi64}/libgcc_s.so
$RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s_64.so
-chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
%endif
%endif
@@ -2021,6 +2052,7 @@
%versmainlib libgcc*.a
%versmainlib libgcov.a
%versmainlib libgcc_s*.so
+%versmainlib libgcc_s.so.%{libgcc_s}
%versmainlib libgomp.so
%versmainlib libgomp.a
%versmainlib libgomp.spec
@@ -2092,6 +2124,7 @@
%versbiarchlib libgcc*.a
%versbiarchlib libgcov.a
%versbiarchlib libgcc_s*.so
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%versbiarchlib libgomp.so
%versbiarchlib libgomp.a
%versbiarchlib libgomp.spec
++++++ gcc7-bsc1239566.patch ++++++
>From eb8b3209074d91f27b725681d0328c4a75cf7cdb Mon Sep 17 00:00:00 2001
From: Richard Biener <rguent...@suse.de>
Date: Thu, 13 Mar 2025 14:41:36 +0100
Subject: [PATCH] bsc#1239566 - add -[DU]_FORTIFY_SOURCE[=n] to DW_AT_producer
To: gcc-patc...@gcc.gnu.org
The following makes sure to record -D_FORTIFY_SOURCE=n and
-U_FORTIFY_SOURCE in the DW_AT_producer debuginfo attribute when
present on the compiler command line.
* dwarf2out.c (gen_producer_string): Record -D and -U
with _FORTIFY_SOURCE prefix.
---
gcc/dwarf2out.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 5590845d2a4..317fd84b9de 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -23428,9 +23428,7 @@ gen_producer_string (void)
case OPT_v:
case OPT_w:
case OPT_L:
- case OPT_D:
case OPT_I:
- case OPT_U:
case OPT_SPECIAL_unknown:
case OPT_SPECIAL_ignore:
case OPT_SPECIAL_program_name:
@@ -23453,6 +23451,16 @@ gen_producer_string (void)
case OPT_fdebug_prefix_map_:
/* Ignore these. */
continue;
+ case OPT_D:
+ case OPT_U:
+ if (strncmp (save_decoded_options[j].arg, "_FORTIFY_SOURCE",
+ strlen ("_FORTIFY_SOURCE")) == 0)
+ {
+ switches.safe_push
(save_decoded_options[j].orig_option_with_args_text);
+ len += strlen (save_decoded_options[j].orig_option_with_args_text)
+ 1;
+ }
+ /* Otherwise ignore these. */
+ continue;
default:
if (cl_options[save_decoded_options[j].opt_index].flags
& CL_NO_DWARF_RECORD)
--
2.43.0
++++++ gcc7-enable-mpx-in-as.patch ++++++
diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
index 911fbd4651c..c7f65148ec7 100644
--- a/gcc/config/i386/gnu-user64.h
+++ b/gcc/config/i386/gnu-user64.h
@@ -50,7 +50,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
#define ASM_SPEC "%{" SPEC_32 ":--32} \
%{" SPEC_64 ":--64} \
%{" SPEC_X32 ":--x32} \
- %{msse2avx:%{!mavx:-msse2avx}}"
+ %{msse2avx:%{!mavx:-msse2avx}} \
+ %{mmpx:-march=+mpx}"
#define GNU_USER_TARGET_LINK_SPEC \
"%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
diff --git a/libmpx/configure b/libmpx/configure
index 2fd71ca89f6..90ed6ec2149 100644
--- a/libmpx/configure
+++ b/libmpx/configure
@@ -5135,7 +5135,7 @@ fi
# Check we may build wrappers library
echo "test: bndmov %bnd0, %bnd1" > conftest.s
-if { ac_try='$AS -o conftest.o conftest.s 1>&5'
+if { ac_try='$AS -march=+mpx -o conftest.o conftest.s 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
diff --git a/libmpx/configure.ac b/libmpx/configure.ac
index baa882b16b0..32c5c8f4aa0 100644
--- a/libmpx/configure.ac
+++ b/libmpx/configure.ac
@@ -100,7 +100,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
# Check we may build wrappers library
echo "test: bndmov %bnd0, %bnd1" > conftest.s
-if AC_TRY_COMMAND([$AS -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])
+if AC_TRY_COMMAND([$AS -march=+mpx -o conftest.o conftest.s
1>&AS_MESSAGE_LOG_FD])
then
mpx_as=yes
else
