aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-25 10:22:04 +0000
committerDavid S. Miller <davem@gcc.gnu.org>2010-01-25 02:22:04 -0800
commit00f88f071eb35d2cbc91823a192b054c3232d0ee (patch)
tree4dac4a2691ce835803409b27d679d9fbc2f20444 /gcc
parentd147cbd9029c1079d33efccc2b2dcfb98dd8b48d (diff)
downloadgcc-00f88f071eb35d2cbc91823a192b054c3232d0ee.zip
gcc-00f88f071eb35d2cbc91823a192b054c3232d0ee.tar.gz
gcc-00f88f071eb35d2cbc91823a192b054c3232d0ee.tar.bz2
sysv4.h (TARGET_ASM_NAMED_SECTION): Only define if not using GAS.
2010-01-24 David S. Miller <davem@davemloft.net> * gcc/config/sparc/sysv4.h (TARGET_ASM_NAMED_SECTION): Only define if not using GAS. * gcc/config/sparc/sparc.c (sparc_elf_asm_named_section): Likewise. Delete SECTION_MERGE code, which is only applicable when using GAS. From-SVN: r156203
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/sparc/sparc.c12
-rw-r--r--gcc/config/sparc/sysv4.h5
3 files changed, 14 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c590273..3af8ee3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-24 David S. Miller <davem@davemloft.net>
+
+ * gcc/config/sparc/sysv4.h (TARGET_ASM_NAMED_SECTION): Only
+ define if not using GAS.
+ * gcc/config/sparc/sparc.c (sparc_elf_asm_named_section):
+ Likewise. Delete SECTION_MERGE code, which is only applicable
+ when using GAS.
+
2010-01-24 Mark Mitchell <mark@codesourcery.com>
PR c++/42748
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 4b904b4..d0a5d2b 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -368,7 +368,7 @@ static int save_or_restore_regs (int, int, rtx, int, int);
static void emit_save_or_restore_regs (int);
static void sparc_asm_function_prologue (FILE *, HOST_WIDE_INT);
static void sparc_asm_function_epilogue (FILE *, HOST_WIDE_INT);
-#ifdef OBJECT_FORMAT_ELF
+#if defined (OBJECT_FORMAT_ELF) && !defined (HAVE_GNU_AS)
static void sparc_elf_asm_named_section (const char *, unsigned int, tree);
#endif
@@ -7986,19 +7986,11 @@ sparc_profile_hook (int labelno)
}
}
-#ifdef OBJECT_FORMAT_ELF
+#if defined (OBJECT_FORMAT_ELF) && !defined (HAVE_GNU_AS)
static void
sparc_elf_asm_named_section (const char *name, unsigned int flags,
tree decl)
{
- if (flags & SECTION_MERGE)
- {
- /* entsize cannot be expressed in this section attributes
- encoding style. */
- default_elf_asm_named_section (name, flags, decl);
- return;
- }
-
fprintf (asm_out_file, "\t.section\t\"%s\"", name);
if (!(flags & SECTION_DEBUG))
diff --git a/gcc/config/sparc/sysv4.h b/gcc/config/sparc/sysv4.h
index edfe59b..fa04985 100644
--- a/gcc/config/sparc/sysv4.h
+++ b/gcc/config/sparc/sysv4.h
@@ -1,5 +1,6 @@
/* Target definitions for GNU compiler for SPARC running System V.4
- Copyright (C) 1991, 1992, 1995, 1996, 1997, 1998, 2000, 2002, 2007, 2009
+ Copyright (C) 1991, 1992, 1995, 1996, 1997, 1998, 2000, 2002, 2007, 2009,
+ 2010
Free Software Foundation, Inc.
Contributed by Ron Guilmette (rfg@monkeys.com).
@@ -126,9 +127,11 @@ do { ASM_OUTPUT_ALIGN ((FILE), Pmode == SImode ? 2 : 3); \
#undef DTORS_SECTION_ASM_OP
#define DTORS_SECTION_ASM_OP "\t.section\t\".dtors\",#alloc,#write"
+#ifndef HAVE_GNU_AS
/* Switch into a generic section. */
#undef TARGET_ASM_NAMED_SECTION
#define TARGET_ASM_NAMED_SECTION sparc_elf_asm_named_section
+#endif
#undef ASM_OUTPUT_ALIGNED_BSS
#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \