Graphite optimizations, also from qqbuild.

A little toned down. The Graphite flags are not entirely stable.

3 files changed, 20 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fd6c8aeab45..bc4e09a5fc81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Mar 20 15:05:53 UTC 2016
+# Sun Mar 20 16:07:48 UTC 2016
 pkgbase = makepkg-optimize
 	pkgdesc = Additional package optimization routines for makepkg
 	pkgver = 1
@@ -15,6 +15,7 @@ pkgbase = makepkg-optimize
 	source = 01.upx.patch
 	source = 02.lto.patch
 	source = 03.pgo.patch
+	source = 04.graphite.patch
 	source = upx.sh
 	source = optipng.sh
 	source = conf.pgo-lto.patch
@@ -26,6 +27,7 @@ pkgbase = makepkg-optimize
 	sha512sums = b4896082fd7fc4a69abc5fc98bf22c92a94cef9ccae5d3e5d1825cd3f04dcff1bce622a3f7fdc00bd43b5e1d091825d119b3a91d354f1ab58e6a8fe3af72b0e2
 	sha512sums = e8d9112c8ff66136451d2746a91c2c43083541322ca5430a0bc6bf03e65ace5ff00296ffea4582075a325d02ddf1d880483025d1fcfba2ce749e12d6418b413b
 	sha512sums = fa2a5aea8df56e0427c0fc37c7bb48ba4314176024177aebb8b890a415b23d7306a90f8987ab05e3b4f8e448ebf2475531970f7c161fe7088b37ac908b778850
+	sha512sums = 87fb65d5fb1d984b2f852d425bbe40a8eb9f487ebbe44dd7755acb705e731dd9e91f236c5c229c4feece9ecd1c081698518868909312480d22f8331d944d5d9f
 	sha512sums = db55e9d4302035447854ec34d44d454a1a68882437129c00de388f56413cff71e133848df5a09962c40f2bd0203f5e5c692af4e100e67072da4b504ef4752ca4
 	sha512sums = 60ca209609ddbf617e63c7103d675da17671efc91db066a1e11dd1df78f9c8abf267f1cd417ff3b5db59411cf6e7df134e6bd8b06c73442410f14c13b1f5dd53
 	sha512sums = de9fd2a9f394250e841a8e5228a180dad9e04aceb1427843056e6c4a4c6b066d36f607eb7493527258741c9521dcd58f3dd1e2191e5add5db0c871eee9e6e133
diff --git a/04.graphite.patch b/04.graphite.patch
new file mode 100644
index 000000000000..e71240865966
--- /dev/null
+++ b/04.graphite.patch
@@ -0,0 +1,14 @@
+--- src/makepkg-optimize/makepkg-optimize	2016-03-21 00:29:54.233122651 +0900
++++ src/makepkg-optimize+graphite	2016-03-21 01:04:16.403122620 +0900
+@@ -891,6 +891,11 @@
+ 		fi
+ 	fi
+ 
++	# Utilize graphite if it is requested (check buildenv and PKGBUILD opts)
++	if check_buildoption "graphite" "y"; then
++		CFLAGS+="-fgraphite-identity -floop-nest-optimize -ftree-loop-distribution -ftree-vectorize"
++		CXXFLAGS+="-fgraphite-identity -floop-nest-optimize -ftree-loop-distribution -ftree-vectorize"
++        fi
+ 
+ 	run_function_safe "build"
+ }
diff --git a/PKGBUILD b/PKGBUILD
index fe2c48fe0530..15a67105b9eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL')
 url='https://projects.archlinux.org/pacman.git/'
 depends=('pacman' 'upx' 'optipng')
 makedepends=('pacman')
-source=('00.optipng.patch' '01.upx.patch' '02.lto.patch' '03.pgo.patch'
+source=('00.optipng.patch' '01.upx.patch' '02.lto.patch' '03.pgo.patch' '04.graphite.patch'
         'upx.sh' 'optipng.sh'
         'conf.pgo-lto.patch' 'conf.optipng-upx.patch' 'opticonf.patch'
         'makepkg' 'makepkg.conf')
@@ -17,6 +17,7 @@ sha512sums=('67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c
             'b4896082fd7fc4a69abc5fc98bf22c92a94cef9ccae5d3e5d1825cd3f04dcff1bce622a3f7fdc00bd43b5e1d091825d119b3a91d354f1ab58e6a8fe3af72b0e2'
             'e8d9112c8ff66136451d2746a91c2c43083541322ca5430a0bc6bf03e65ace5ff00296ffea4582075a325d02ddf1d880483025d1fcfba2ce749e12d6418b413b'
             'fa2a5aea8df56e0427c0fc37c7bb48ba4314176024177aebb8b890a415b23d7306a90f8987ab05e3b4f8e448ebf2475531970f7c161fe7088b37ac908b778850'
+            '87fb65d5fb1d984b2f852d425bbe40a8eb9f487ebbe44dd7755acb705e731dd9e91f236c5c229c4feece9ecd1c081698518868909312480d22f8331d944d5d9f'
             'db55e9d4302035447854ec34d44d454a1a68882437129c00de388f56413cff71e133848df5a09962c40f2bd0203f5e5c692af4e100e67072da4b504ef4752ca4'
             '60ca209609ddbf617e63c7103d675da17671efc91db066a1e11dd1df78f9c8abf267f1cd417ff3b5db59411cf6e7df134e6bd8b06c73442410f14c13b1f5dd53'
             'de9fd2a9f394250e841a8e5228a180dad9e04aceb1427843056e6c4a4c6b066d36f607eb7493527258741c9521dcd58f3dd1e2191e5add5db0c871eee9e6e133'
@@ -46,6 +47,7 @@ prepare() {
   patch -Np0 < ../01.upx.patch
   patch -Np0 < ../02.lto.patch
   patch -Np0 < ../03.pgo.patch
+  patch -Np0 < ../04.graphite.patch
 }
 
 package() {