From ab2cd4e1a672ce1fa4801b6b66e9f7a0e62652c6 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 29 Dec 2020 14:18:38 +0100
Subject: [PATCH] makepkg: sync harding flags to the clang config

---
 pacman/PKGBUILD             | 4 ++--
 pacman/makepkg_clang32.conf | 4 +---
 pacman/makepkg_clang64.conf | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD
index 9025e3d3..2f60f5d0 100644
--- a/pacman/PKGBUILD
+++ b/pacman/PKGBUILD
@@ -68,8 +68,8 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@a
 sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             '7849538ac2b89f4e9881ad5db78a2aa37a2ddb936f87a0ede1c2322e515918fe'
             '822af13248f04690377cd193370f33ac2f00a41234ead9cf3b7e5d5aba8bd0c5'
-            '914e63e0cd7cd18969b4df99af826db7a523b0307c3c63bbbc3970280fd23f6a'
-            'cf665e64e2f27e1b0261e5e5148c3d9cf701c9e924533422edcab95a289eb836'
+            '26737fc161b8ebb31ea14708c5cbc628d6da23b26c3dcaf383e1c457a97dabe7'
+            'c0091421bb949e4596cdffb7d3312f4dac222904185f809188ab40ce9a430fa1'
             '0e484f00a427f030c95f7ebcab3e0de1e637e55d01531438de9165d1f520cf81'
             'c26dba8f9ac285efa33708e58ca29b4ad0fd9a1d6f4e82cbe433782b180799ee'
             '041deae4524b7ec52b5b3d867a6988f240cef3e22997acbf46aff2d6e6e8cb01'
diff --git a/pacman/makepkg_clang32.conf b/pacman/makepkg_clang32.conf
index 42e66fc5..57edd6db 100644
--- a/pacman/makepkg_clang32.conf
+++ b/pacman/makepkg_clang32.conf
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase,--no-seh"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags
diff --git a/pacman/makepkg_clang64.conf b/pacman/makepkg_clang64.conf
index 84f33603..b7997be3 100644
--- a/pacman/makepkg_clang64.conf
+++ b/pacman/makepkg_clang64.conf
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, High entropy ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags