From 6fa0629718e7dd50b359a3132c7ed382c696553c Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 14 Aug 2014 15:23:59 +0000 Subject: Move GCC optimisation bug workaround to hacks.mk --- graphics/GraphicsMagick/Makefile | 9 +-------- graphics/GraphicsMagick/hacks.mk | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 graphics/GraphicsMagick/hacks.mk (limited to 'graphics/GraphicsMagick') diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 18bdf7c0915..d561e826ed2 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2014/08/14 10:28:28 jperkin Exp $ +# $NetBSD: Makefile,v 1.68 2014/08/14 15:23:59 jperkin Exp $ .include "Makefile.common" @@ -32,13 +32,6 @@ TEST_TARGET= check FIND_PREFIX:= URW_FONTS_DIR=urw-fonts .include "../../mk/find-prefix.mk" -# Gain 2-3X speedup by working around GCC optimisation bug -# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53967 -.include "../../mk/compiler.mk" -.if !empty(CC_VERSION:Mgcc-4.*) && ${MACHINE_ARCH} == "x86_64" -CFLAGS+= -frename-registers -.endif - .include "options.mk" .include "../../devel/libltdl/buildlink3.mk" diff --git a/graphics/GraphicsMagick/hacks.mk b/graphics/GraphicsMagick/hacks.mk new file mode 100644 index 00000000000..faa7a749690 --- /dev/null +++ b/graphics/GraphicsMagick/hacks.mk @@ -0,0 +1,14 @@ +# $NetBSD: hacks.mk,v 1.1 2014/08/14 15:23:59 jperkin Exp $ + +.if !defined(GRAPHICSMAGICK_HACKS_MK) +GRAPHICSMAGICK_HACKS_MK= # defined + +# Gain 2-3X speedup by working around GCC optimisation bug +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53967 +.include "../../mk/compiler.mk" +.if !empty(CC_VERSION:Mgcc-4.*) && ${MACHINE_ARCH} == "x86_64" +PKG_HACKS+= frename-registers +CFLAGS+= -frename-registers +.endif + +.endif -- cgit v1.2.3