d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc: ssp: remove some GCC 4.2 remnants

Browse Source 
With GCC 4.2 out of the tree for a while now and no sign of it
returning, we don't really need to support older versions that don't
allow us to specify a ctor priority anymore.

Noticed by:	mjg
This commit is contained in:
Kyle Evans 2023-02-09 22:08:07 -06:00
parent dc1b8c9a84
commit f44df7959a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/secure/stack_protector.c
View File

@ -47,23 +47,15 @@ __FBSDID("$FreeBSD$");
* they're either not usually statically linked or they simply don't do things
* in constructors that would be adversely affected by their positioning with
* respect to this initialization.
*
* This conditional should be removed when GCC 4.2 is removed.
*/
#if __has_attribute(__constructor__) || __GNUC_PREREQ__(4, 3)
#define _GUARD_SETUP_CTOR_ATTR \
static void __guard_setup(void)
__attribute__((__constructor__ (200), __used__));
#else
#define _GUARD_SETUP_CTOR_ATTR \
__attribute__((__constructor__, __used__));
#endif
extern long __stack_chk_guard[8];
extern int __sysctl(const int *name, u_int namelen, void *oldp,
size_t *oldlenp, void *newp, size_t newlen);
long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
static void __guard_setup(void) _GUARD_SETUP_CTOR_ATTR;
static void __fail(const char *) __dead2;
void __stack_chk_fail(void) __dead2;
void __chk_fail(void) __dead2;