From: Ramana Radhakrishnan <ramana.radhakrishnan@linaro.org>
Date: Thu, 15 Mar 2012 10:50:58 +0000 (+0000)
Subject: Fix gnu_unique_object handling for arm-linux-gnueabi
X-Git-Tag: misc/gccgo-go1_1_2~3963
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ab228501e6340fff0ab619d40d22594e08255da;p=thirdparty%2Fgcc.git

Fix gnu_unique_object handling for arm-linux-gnueabi

2012-03-15  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>

	* config.gcc (target_type_format_char): New. Document it. Set it for
        arm*-*-* .
	* configure.ac (gnu_unique_option): Use target_type_format_char in test.
        Comment rationale.
	* configure: Regenerate .

From-SVN: r185428
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 208227d328b1..4bc8629a82d2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-13  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
+
+	* config.gcc (target_type_format_char): New. Document it. Set it for
+        arm*-*-* .
+	* configure.ac (gnu_unique_option): Use target_type_format_char in test.
+        Comment rationale.
+	* configure: Regenerate .
+
 2012-03-15  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/52267
diff --git a/gcc/config.gcc b/gcc/config.gcc
index ebeb5e6d67e4..a1f080aaf23c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -182,6 +182,11 @@
 #			the --with-sysroot configure option or the
 #			--sysroot command line option is used this
 #			will be relative to the sysroot.
+# target_type_format_char 
+# 			The default character to be used for formatting
+#			the attribute in a
+#			.type symbol_name, ${t_t_f_c}<property>
+#			directive.
 
 # The following variables are used in each case-construct to build up the
 # outgoing variables:
@@ -232,6 +237,7 @@ target_gtfiles=
 need_64bit_hwint=
 need_64bit_isa=
 native_system_header_dir=/usr/include
+target_type_format_char='@'
 
 # Don't carry these over build->host->target.  Please.
 xm_file=
@@ -314,6 +320,7 @@ am33_2.0-*-linux*)
 arm*-*-*)
 	cpu_type=arm
 	extra_headers="mmintrin.h arm_neon.h"
+	target_type_format_char='%'
 	c_target_objs="arm-c.o"
 	cxx_target_objs="arm-c.o"
 	extra_options="${extra_options} arm/arm-tables.opt"
diff --git a/gcc/configure b/gcc/configure
index 9bf2298e4fc7..6dd0f98bde25 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -26081,7 +26081,7 @@ else
   then gcc_cv_as_gnu_unique_object=yes
 fi
   elif test x$gcc_cv_as != x; then
-    $as_echo '.type foo, @gnu_unique_object' > conftest.s
+    $as_echo '.type foo, '$target_type_format_char'gnu_unique_object' > conftest.s
     if { ac_try='$gcc_cv_as $gcc_cv_as_flags  -o conftest.o conftest.s >&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
@@ -26100,7 +26100,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gnu_unique_object" >&5
 $as_echo "$gcc_cv_as_gnu_unique_object" >&6; }
 if test $gcc_cv_as_gnu_unique_object = yes; then
-  # Also check for ld.so support, i.e. glibc 2.11 or higher.
+  # We need to unquote above to to use the definition from config.gcc.
+# Also check for ld.so support, i.e. glibc 2.11 or higher.
    if test x$host = x$build -a x$host = x$target &&
        ldd --version 2>/dev/null &&
        glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 807a4104dfd5..30a73866538b 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4113,7 +4113,8 @@ Valid choices are 'yes' and 'no'.]) ;;
   esac],
  [gcc_GAS_CHECK_FEATURE([gnu_unique_object], gcc_cv_as_gnu_unique_object,
    [elf,2,19,52],,
-   [.type foo, @gnu_unique_object],,
+   [.type foo, '$target_type_format_char'gnu_unique_object],,
+# We need to unquote above to to use the definition from config.gcc.
 # Also check for ld.so support, i.e. glibc 2.11 or higher.
    [[if test x$host = x$build -a x$host = x$target &&
        ldd --version 2>/dev/null &&