mirror of
https://github.com/richfelker/musl-cross-make.git
synced 2025-04-19 15:34:58 +02:00
7b4c0f7abf
This fixes a couple merge errors in j2.diff in the first rebase on 7.2.0: - `sh[n1234]*eb-*-*` was written instead of `sh[j1234]*eb-*-*`. - The TARGET_ATOMIC_* defines got moved to gcc/config/sh/sh.h, so move TARGET_ATOMIC_HARD_CAS there as well.
15 lines
597 B
Diff
15 lines
597 B
Diff
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
|
index 9721f94b4f6..fba9bfed930 100644
|
|
--- a/gcc/gcc.c
|
|
+++ b/gcc/gcc.c
|
|
@@ -863,7 +863,8 @@ proper position among the other output files. */
|
|
#ifndef LINK_SSP_SPEC
|
|
#ifdef TARGET_LIBC_PROVIDES_SSP
|
|
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
|
- "|fstack-protector-strong|fstack-protector-explicit:}"
|
|
+ "|fstack-protector-strong|fstack-protector-explicit" \
|
|
+ ":-lssp_nonshared}"
|
|
#else
|
|
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
|
"|fstack-protector-strong|fstack-protector-explicit" \
|