From c1453de14e5eecd3ee0f566e4b6a9ec7d49dd2a8 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 29 Feb 2016 09:03:24 +0000
Subject: [PATCH] build: Improve -momit-leaf-frame-pointer usage

-momit-leaf-frame-pointer is only supported on certain archs.
Detect this automatically based on which flags the compiler
understands.

(cherry picked from commit 7ca731b12ce69596d7b9fec4a72d44ca8a3913c3)

Conflicts:
	Makefile (trivial resolution)
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c64ea366..31ac6508 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,8 @@ endif
 # compile with -O2 if debug level is not 2
 ifneq ($(DEBUG_LEVEL), 2)
 OPT += -O2 -fno-omit-frame-pointer
-ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
+# Skip for archs that don't support -momit-leaf-frame-pointer
+ifeq (,$(shell $(CXX) -fsyntax-only -momit-leaf-frame-pointer -xc /dev/null 2>&1))
 OPT += -momit-leaf-frame-pointer
 endif
 endif
-- 
2.47.3