From 88dbb21c8e12f0761519ac4449001d90a9698add100b3885262efb91b808a7e6 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 28 Oct 2020 10:40:07 +0000
Subject: [PATCH] Accepting request 844127 from
 home:rguenther:branches:Base:System

- Use --enable-cet on x86_64 to instrument glibc for indirect branch
  tracking and shadow stack use.  Enable indirect branch tracking
  and shadow stack in the dynamic loader.  [jsc#PM-2110] [bsc#1175154]

OBS-URL: https://build.opensuse.org/request/show/844127
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=570
---
 glibc.changes | 7 +++++++
 glibc.spec    | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/glibc.changes b/glibc.changes
index 8047811..e0e9cc5 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 26 07:07:38 UTC 2020 - Richard Biener <rguenther@suse.com>
+
+- Use --enable-cet on x86_64 to instrument glibc for indirect branch
+  tracking and shadow stack use.  Enable indirect branch tracking
+  and shadow stack in the dynamic loader.  [jsc#PM-2110] [bsc#1175154]
+
 -------------------------------------------------------------------
 Tue Sep  8 08:00:33 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index 73a179d..c96d012 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -630,6 +630,11 @@ configure_and_build_glibc() {
 %ifarch ppc64p7
 		--with-cpu=power7 \
 %endif
+%ifarch x86_64
+%if %suse_version > 1500
+		--enable-cet \
+%endif
+%endif
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif