From 6f25cf682a722cee2da47dc2e4845dae6d842e78 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 18 Oct 2017 05:55:12 -0400
Subject: [PATCH] Improve 64-bit support for GCC on AIX

---
 GNUmakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 5f69cc44..e7f0a2d5 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -397,20 +397,20 @@ ifeq ($(XLC_COMPILER),1)
       CXXFLAGS := $(CXXFLAGS:-fPIC=-qpic)
   endif
   HAVE_BITS=$(shell echo $(CXXFLAGS) | $(GREP) -i -c -E '\-q32|\-q64')
-  ifeq ($(IS_PPC64)$(HAVE_BITS),10)
+  ifeq ($(IS_PPC64)$(XLC_COMPILER)$(HAVE_BITS),110)
     CXXFLAGS += -q64
   else
-  ifeq ($(IS_PPC32)$(HAVE_BITS),10)
+  ifeq ($(IS_PPC32)$(XLC_COMPILER)$(HAVE_BITS),110)
     CXXFLAGS += -q32
   endif
   endif
   ifeq ($(findstring -q64,$(CXXFLAGS)),-q64)
-    ifeq ($(findstring -X64,$(CXXFLAGS)),-X64)
+    ifeq ($(findstring -X64,$(ARFLAGS)),)
       ARFLAGS := -r -X64
     endif
   else
   ifeq ($(findstring -q32,$(CXXFLAGS)),-q32)
-    ifeq ($(findstring -X32,$(CXXFLAGS)),-X32)
+    ifeq ($(findstring -X32,$(ARFLAGS)),)
       ARFLAGS := -r -X32
     endif
   endif