From 2f6cdf65c79e3ed5e976b44efd07a09e94cfad0c Mon Sep 17 00:00:00 2001
From: dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 21 Jan 2016 18:50:17 +0000
Subject: [PATCH]         * configure.ac (gcc_cv_as_powerpc_mfcrf,
 gcc_cv_as_machine_directive):         Detangle.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232697 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog    |  5 +++++
 gcc/configure    | 13 +++++++++----
 gcc/configure.ac | 13 +++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b12ff9fe98..07e2057edb6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-21  David Edelsohn  <dje.gcc@gmail.com>
+
+	* configure.ac (gcc_cv_as_powerpc_mfcrf, gcc_cv_as_machine_directive):
+	Detangle.
+
 2016-01-21  Pat Haugen  <pthaugen@us.ibm.com>
 
 	* config/rs6000/aix71.h (ASM_CPU_SPEC): Add entry for Power9.
diff --git a/gcc/configure b/gcc/configure
index 73c1850ee26..ff646e8fcac 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -25904,10 +25904,8 @@ fi
     ;;
 
   powerpc*-*-*)
+
     case $target in
-      *-*-aix*) conftest_s='	.machine "pwr5"
-	.csect .text[PR]
-	mfcr 3,128';;
       *-*-darwin*)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for .machine directive support" >&5
 $as_echo_n "checking assembler for .machine directive support... " >&6; }
@@ -25940,7 +25938,14 @@ $as_echo "$gcc_cv_as_machine_directive" >&6; }
 	  echo you can get it from: ftp://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
 	  test x$build = x$target && exit 1
 	fi
-	conftest_s='	.text
+        ;;
+    esac
+
+    case $target in
+      *-*-aix*) conftest_s='	.machine "pwr5"
+	.csect .text[PR]
+	mfcr 3,128';;
+      *-*-darwin*) conftest_s='	.text
 	mfcr r3,128';;
       *) conftest_s='	.machine power4
 	.text
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4727b2ad6a9..4dc7c109a26 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4172,10 +4172,8 @@ value:'
     ;;
 
   powerpc*-*-*)
+
     case $target in
-      *-*-aix*) conftest_s='	.machine "pwr5"
-	.csect .text[[PR]]
-	mfcr 3,128';;
       *-*-darwin*)
 	gcc_GAS_CHECK_FEATURE([.machine directive support],
 	  gcc_cv_as_machine_directive,,,
@@ -4185,7 +4183,14 @@ value:'
 	  echo you can get it from: ftp://gcc.gnu.org/pub/gcc/infrastructure/cctools-528.5.dmg >&2
 	  test x$build = x$target && exit 1
 	fi
-	conftest_s='	.text
+        ;;
+    esac
+
+    case $target in
+      *-*-aix*) conftest_s='	.machine "pwr5"
+	.csect .text[[PR]]
+	mfcr 3,128';;
+      *-*-darwin*) conftest_s='	.text
 	mfcr r3,128';;
       *) conftest_s='	.machine power4
 	.text
-- 
2.11.4.GIT