From f80578dc89c11f4f80024e35504fdbce550da19e Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jan 30 2018 18:31:15 +0000
Subject: Disable -fstack-clash-protection on riscv64:

not supported even by GCC 7.3.1 on this architecture.

Apparently it requires architecture-specific support.  In any case it
does not work with GCC 7.3.1 on riscv64:

stage3:/# gcc --version
gcc (GCC) 7.3.1 20180129
Copyright (C) 2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
stage3:/# gcc -fstack-clash-protection
gcc: error: unrecognized command line option '-fstack-clash-protection'; did you mean '-fstack-protector'?
gcc: fatal error: no input files
compilation terminated.

---

diff --git a/glibc.spec b/glibc.spec
index 9ad2271..361a7df 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.26.9000-1217-gcdd14619a7
 %define glibcversion 2.26.9000
-%define glibcrelease 51%{?dist}
+%define glibcrelease 52%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -907,7 +907,7 @@ build()
 	mkdir $builddir
 	pushd $builddir
 	build_CFLAGS="$BuildFlags -g -O2 $*"
-%ifnarch %{arm}
+%ifnarch %{arm} riscv64
 	build_CFLAGS="$build_CFLAGS -fstack-clash-protection"
 %endif
 	# Some configure checks can spuriously fail for some architectures if
@@ -2001,6 +2001,10 @@ fi
 %endif
 
 %changelog
+* Tue Jan 30 2018 Florian Weimer <fweimer@redhat.com> - 2.26.9000-52
+- Disable -fstack-clash-protection on riscv64:
+  not supported even by GCC 7.3.1 on this architecture.
+
 * Mon Jan 29 2018 Florian Weimer <fweimer@redhat.com> - 2.26.9000-51
 - Explicitly run ldconfig in the buildroot
 - Do not run ldconfig from scriptlets