diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-28 08:36:43 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-28 08:37:01 +0000 |
| commit | 6f70a8ffce550175305d9e208168af3aed1ae523 (patch) | |
| tree | 7dbb4e674b8ceedab055a09bacd12d8353b6dd79 /dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch | |
| parent | net-analyzer/nagios-check_multiple: fix VariableInHomepage CI issue (diff) | |
| download | gentoo-6f70a8ffce550175305d9e208168af3aed1ae523.tar.gz gentoo-6f70a8ffce550175305d9e208168af3aed1ae523.tar.bz2 gentoo-6f70a8ffce550175305d9e208168af3aed1ae523.zip | |
dev-util/mingw64-runtime: avoid libssp references without -fstack-protector
mingw64-runtime-7.0.0 added basic support of _FORTIFY_SOURCE to harden
strcpy() and memcpy() via __strcpy_chk() __memcpy_chk() similar to glibc.
Unfortunately that imposes a new dependency on every caller that defines
_FORTIFY_SOURCE to link against libssp as minw64-runtime does not provide
__strcpy_chk() and friends. For comparison glibc does provide __strcpy_chk.
To avoid widespread breakage (including build failure of USE=ssp gcc itself)
we enable __strcpy_chk() checks only when -fstack-protector* options are set.
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch')
| -rw-r--r-- | dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch new file mode 100644 index 000000000000..72ddd775a2ea --- /dev/null +++ b/dev-util/mingw64-runtime/files/mingw64-runtime-7.0.0-fortify-only-ssp.patch @@ -0,0 +1,16 @@ +--- a/mingw-w64-headers/crt/_mingw_mac.h ++++ b/mingw-w64-headers/crt/_mingw_mac.h +@@ -301,7 +301,12 @@ + # define __mingw_attribute_artificial + #endif + +-#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) ++/* __SSP__ is a workaround to avoid reference to libssp when user did not request it: ++ * https://sourceforge.net/p/mingw-w64/bugs/818/ ++ * Otherwise it breaks both USE=ssp gcc bootstrap and projects that happen to use ++ * strcpy/memcpy. ++ */ ++#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __MINGW_GNUC_PREREQ(4, 1) && __SSP__ > 0 + # if _FORTIFY_SOURCE > 1 + # define __MINGW_FORTIFY_LEVEL 2 + # else |