diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f54b09405c592806ae9418b649db184166ee8fe9..da2a69ffce4a2953a5be790d2bd6253bd9a50083 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09  Michael Meissner  <michael.meissner@amd.com>
+
+	* config.gcc (i[34567]86-*-*): Put test in quotes to prevent
+	failure on some Bourne shells.
+	(x86_64-*-*): Ditto.
+
 2008-06-09  Kai Tietz  <kai.tietz@onevision.com>
 
 	* config/i386/cygming.h (TARGET_SUBTARGET64_DEFAULT): New.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a18ba974847c4e7248cc979680d650a861c468be..735013ee2ac7ab5ddc49bf65a61717a529a7a34a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -360,13 +360,13 @@ fi
 
 case ${target} in
 i[34567]86-*-*)
-	if test $enable_cld = yes; then
+	if test "x$enable_cld" = xyes; then
 		tm_defines="${tm_defines} USE_IX86_CLD=1"
 	fi
 	;;
 x86_64-*-*)
 	tm_file="i386/biarch64.h ${tm_file}"
-	if test $enable_cld = yes; then
+	if test "x$enable_cld" = xyes; then
 		tm_defines="${tm_defines} USE_IX86_CLD=1"
 	fi
 	;;