Patchwork [ARM] Backport fix for gnu_unique_object to 4.7 branch

login
register
mail settings
Submitter Ramana Radhakrishnan
Date June 29, 2012, 10:04 a.m.
Message ID <CACUk7=U85bQunHv1WJYOOb=83ZwA=mu2-+Lx6gtxZpuTZsODZA@mail.gmail.com>
Download mbox | patch
Permalink /patch/168031/
State New
Headers show

Comments

Ramana Radhakrishnan - June 29, 2012, 10:04 a.m.
Hi,

Taking Richi's statement here
http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01399.html as an approval
- I've backported the comment character fix for gnu_unique_object on
ARM to the FSF 4.7 branch.

regards,
Ramana

2012-06-29  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>

	* configure: Regenerate.
	Backport from mainline.
        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.
Property changes on: .

Patch

Index: gcc/configure
===================================================================
--- gcc/configure	(revision 189069)
+++ gcc/configure	(revision 189071)
@@ -26179,7 +26179,7 @@ 
   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
@@ -26198,7 +26198,8 @@ 
 { $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
Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac	(revision 189069)
+++ gcc/configure.ac	(revision 189071)
@@ -4188,7 +4188,8 @@ 
   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 &&
Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 189069)
+++ gcc/config.gcc	(revision 189071)
@@ -184,6 +184,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:
@@ -235,6 +240,7 @@ 
 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=
@@ -321,6 +327,7 @@ 
 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"