From d33fffce04ebba93ef4305d2bee0fd4219dbf09e Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Thu, 17 Sep 2015 18:04:53 +0200
Subject: [PATCH] 8136690: AIX: libjimage should be linked with the C++
 compiler

Reviewed-by: ihse
---
 jdk/make/lib/CoreLibraries.gmk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk
index b9ba250367e..e6138e26e1e 100644
--- a/jdk/make/lib/CoreLibraries.gmk
+++ b/jdk/make/lib/CoreLibraries.gmk
@@ -239,8 +239,13 @@ TARGETS += $(BUILD_LIBZIP)
 
 ##########################################################################################
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX
+endif # OPENJDK_TARGET_OS aix
+
 $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
     LIBRARY := jimage, \
+    TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
     OPTIMIZATION := LOW, \
     SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \