From 19f3a868f4c3074aca17a2a46985b4c00ca56490 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 14 Aug 2011 14:12:34 +0200
Subject: [PATCH] update makepkg.conf from pacman 3.5.4-4

---
 makepkg-i686.conf   | 6 +++---
 makepkg-x86_64.conf | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/makepkg-i686.conf b/makepkg-i686.conf
index 73c7fbf..9120183 100644
--- a/makepkg-i686.conf
+++ b/makepkg-i686.conf
@@ -29,9 +29,9 @@ CHOST="i686-pc-linux-gnu"
 #-- Exclusive: will only run on i686
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
index 005cafb..052cf3f 100644
--- a/makepkg-x86_64.conf
+++ b/makepkg-x86_64.conf
@@ -29,9 +29,9 @@ CHOST="x86_64-unknown-linux-gnu"
 #-- Exclusive: will only run on x86_64
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
-- 
GitLab