From 8df6fff19b96deccd746b13e2a8d7cf669a42741 Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Fri, 29 Aug 2014 12:02:20 +0200
Subject: [PATCH] 8056246: Fix AIX build after the Modular Source Code change
 8054834

Reviewed-by: erikj, ihse
---
 common/autoconf/basics.m4              | 7 ++++++-
 common/autoconf/generated-configure.sh | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index ca88e9f14fa..1a8cb100d94 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -849,7 +849,12 @@ AC_DEFUN([BASIC_CHECK_FIND_DELETE],
   if test -f $DELETEDIR/TestIfFindSupportsDelete; then
     # No, it does not.
     rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
+      FIND_DELETE="-print | xargs rm"
+    else
+      FIND_DELETE="-exec rm \{\} \+"
+    fi
     AC_MSG_RESULT([no])
   else
     AC_MSG_RESULT([yes])
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 2328405280e..e45aaa0dee2 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4321,7 +4321,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1408660646
+DATE_WHEN_GENERATED=1409306485
 
 ###############################################################################
 #
@@ -17284,7 +17284,12 @@ $as_echo_n "checking if find supports -delete... " >&6; }
   if test -f $DELETEDIR/TestIfFindSupportsDelete; then
     # No, it does not.
     rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
+      FIND_DELETE="-print | xargs rm"
+    else
+      FIND_DELETE="-exec rm \{\} \+"
+    fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   else