From 7cf13d1f46fcf4e5fe83e79f75fd943c0cc29295 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Wed, 22 Jun 2011 17:01:17 +0000
Subject: [PATCH] arm.h (OPTION_DEFAULT_SPECS): Fix -mtls-dialect typo.

	* config/arm/arm.h (OPTION_DEFAULT_SPECS): Fix -mtls-dialect
	typo.
	* config.gcc (arm*-*-linux*): Default to gnu tls.
	(arm*-*-*): Add --with-tls option.
	(all_defaults): Add 'tls'.

From-SVN: r175298
---
 gcc/ChangeLog        | 11 ++++++++---
 gcc/config.gcc       | 16 ++++++++++++++--
 gcc/config/arm/arm.h |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f487bd2ff31..ea2042157ae 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-22  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config/arm/arm.h (OPTION_DEFAULT_SPECS): Fix -mtls-dialect
+	typo.
+	* config.gcc (arm*-*-linux*): Default to gnu tls.
+	(arm*-*-*): Add --with-tls option.
+	(all_defaults): Add 'tls'.
+
 2011-06-22  Richard Henderson  <rth@redhat.com>
 
 	* reg-notes.def (REG_CFA_WINDOW_SAVE): New.
@@ -152,9 +160,6 @@
 
 	* doc/invoke.texi (ARM Options): Document -mtls-dialect option.
 	* doc/install.texi (Configuration): Document --with-tls.
-	* config.gcc (arm*-*-linux*): Default to gnu tls.
-	(arm*-*-*): Add --with-tls option.
-	(all_defaults): Add 'tls'.
 	* config/arm/arm.c (enum tls_reloc): Add TLS_DESCSEQ.
 	(arm_call_tls_get_addr): Clean up. Assert not tls descriptor.
 	(arm_tls_descseq_addr): New.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index f5037b3cba4..a1dbd1a8139 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -863,6 +863,7 @@ arm*-*-linux*)			# ARM GNU/Linux with ELF
 	    tmake_file="$tmake_file arm/t-linux"
 	    ;;
 	esac
+	with_tls=${with_tls:-gnu}
 	tm_file="$tm_file arm/aout.h arm/arm.h"
 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
 	;;
@@ -3039,7 +3040,7 @@ case "${target}" in
 		;;
 
 	arm*-*-*)
-		supported_defaults="arch cpu float tune fpu abi mode"
+		supported_defaults="arch cpu float tune fpu abi mode tls"
 		for which in cpu tune; do
 			# See if it matches any of the entries in arm-cores.def
 			eval "val=\$with_$which"
@@ -3122,6 +3123,17 @@ case "${target}" in
 			;;
 		esac
 
+		case "$with_tls" in
+		"" \
+		| gnu | gnu2)
+			# OK
+			;;
+		*)
+			echo "Unknown TLS method used in --with-tls=$with_tls" 1>&2
+			exit 1
+			;;
+		esac
+
 		if test "x$with_arch" != x && test "x$with_cpu" != x; then
 			echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
 		fi
@@ -3601,7 +3613,7 @@ case ${target} in
 esac
 
 t=
-all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci"
+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci tls"
 for option in $all_defaults
 do
 	eval "val=\$with_"`echo $option | sed s/-/_/g`
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index f030f418b8a..b0d26259a08 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -324,7 +324,7 @@ extern void (*arm_lang_output_object_attributes_hook)(void);
   {"fpu", "%{!mfpu=*:-mfpu=%(VALUE)}"}, \
   {"abi", "%{!mabi=*:-mabi=%(VALUE)}"}, \
   {"mode", "%{!marm:%{!mthumb:-m%(VALUE)}}"}, \
-  {"tls", "%{!mtls-dialect:-mtls-dialect=%(VALUE)}"},
+  {"tls", "%{!mtls-dialect=*:-mtls-dialect=%(VALUE)}"},
 
 /* Which floating point model to use.  */
 enum arm_fp_model
-- 
2.30.2