From: Jeffrey A Law <law@cygnus.com>
Date: Mon, 20 Jul 1998 23:57:20 +0000 (+0000)
Subject: configure.in: Fix minor problems with gas feature detection code.
X-Git-Tag: prereleases/egcs-1.1-prerelease~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b69426b229617af9f33695eefd4a526a50b03e;p=thirdparty%2Fgcc.git

configure.in: Fix minor problems with gas feature detection code.

        * configure.in: Fix minor problems with gas feature detection code.
        * configure: Rebuilt.

From-SVN: r21316
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4159d8dc1042..e92f02e50329 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Tue Jul 21 00:31:01 1998  Jeffrey A Law  (law@cygnus.com)
 
+	* configure.in: Fix minor problems with gas feature detection code.
+	* configure: Rebuilt.
+
 	* gcc.c (do_spec): Issue a warning for '%[]' usage.
 
 	* Undo this change.
diff --git a/gcc/configure b/gcc/configure
index d6a5a056a5ea..d8f1cc30e3fc 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5246,23 +5246,25 @@ elif [ -f $gcc_cv_as_gas_srcdir/configure.in ]; then
 	done
 	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
 	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
-	# Gas version 2.6 and later support for .balign and .p2align.
-	# bytes to skip when using .p2align.
-	if [ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2 ]; then
-		gcc_cv_as_alignment_features=".balign and .p2align"
-		cat >> confdefs.h <<\EOF
+	if [ x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x ]; then
+		# Gas version 2.6 and later support for .balign and .p2align.
+		# bytes to skip when using .p2align.
+		if [ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2 ]; then
+			gcc_cv_as_alignment_features=".balign and .p2align"
+			cat >> confdefs.h <<\EOF
 #define HAVE_GAS_BALIGN_AND_P2ALIGN 1
 EOF
 
-	fi
-	# Gas version 2.8 and later support specifying the maximum
-	# bytes to skip when using .p2align.
-	if [ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2 ]; then
-		gcc_cv_as_alignment_features=".p2align including maximum skip"
-		cat >> confdefs.h <<\EOF
+		fi
+		# Gas version 2.8 and later support specifying the maximum
+		# bytes to skip when using .p2align.
+		if [ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2 ]; then
+			gcc_cv_as_alignment_features=".p2align including maximum skip"
+			cat >> confdefs.h <<\EOF
 #define HAVE_GAS_MAX_SKIP_P2ALIGN 1
 EOF
 
+		fi
 	fi
 elif [ x$host = x$target ]; then
 	# Native build.
diff --git a/gcc/configure.in b/gcc/configure.in
index 6791547ec87b..ec5e2563ae15 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3341,17 +3341,19 @@ elif [[ -f $gcc_cv_as_gas_srcdir/configure.in ]]; then
 	done
 	gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"`
 	gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"`
-	# Gas version 2.6 and later support for .balign and .p2align.
-	# bytes to skip when using .p2align.
-	if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
-		gcc_cv_as_alignment_features=".balign and .p2align"
-		AC_DEFINE(HAVE_GAS_BALIGN_AND_P2ALIGN)
-	fi
-	# Gas version 2.8 and later support specifying the maximum
-	# bytes to skip when using .p2align.
-	if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
-		gcc_cv_as_alignment_features=".p2align including maximum skip"
-		AC_DEFINE(HAVE_GAS_MAX_SKIP_P2ALIGN)
+	if [[ x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x ]]; then
+		# Gas version 2.6 and later support for .balign and .p2align.
+		# bytes to skip when using .p2align.
+		if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
+			gcc_cv_as_alignment_features=".balign and .p2align"
+			AC_DEFINE(HAVE_GAS_BALIGN_AND_P2ALIGN)
+		fi
+		# Gas version 2.8 and later support specifying the maximum
+		# bytes to skip when using .p2align.
+		if [[ "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2 ]]; then
+			gcc_cv_as_alignment_features=".p2align including maximum skip"
+			AC_DEFINE(HAVE_GAS_MAX_SKIP_P2ALIGN)
+		fi
 	fi
 elif [[ x$host = x$target ]]; then
 	# Native build.