This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Using elfos.h for mips*-elf targets
- From: Richard Sandiford <rsandifo at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: echristo at redhat dot com
- Date: Sat, 31 Jul 2004 09:57:58 +0100
- Subject: Using elfos.h for mips*-elf targets
This patch converts the mips*-elf targets to use elfos.h, removes some
unneeded gunk from mips/elf.h, and deletes mips/elf64.h altogether.
As well as the clean-up factor, the main motivation was to use:
.local foo
.comm foo,...
instead of:
.lcomm foo,...
The first is better because, unlike .lcomm, .comm takes a third
alignment parameter[*]. At the moment, we have to round up the
size of .lcomm to the alignment boundary and hope for the best
(see the fix for PR16407).
[*] At least when using GAS or the n32/n64 SGI assemblers.
The o32 SGI assembler doesn't accept the alignment even
for .comm, but that's not an issue for mips*-elf targets.
The mips/elf.h definitions of the following macros were the same
as those in elfos.h:
MAX_OFILE_ALIGNMENT
TARGET_ASM_NAMED_SECTION
TYPE_OPERAND_FMT
TYPE_ASM_OP
SIZE_ASM_OP
MAKE_DECL_ONE_ONLY
INIT_SECTION_ASM_OP
FINI_SECTION_ASM_OP
HANDLE_SYSV_PRAGMA
The handling of weak symbols was slightly different:
#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,0)
#define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE) \
do { \
if (TARGET_GAS) \
fputs ("\t.weak\t", FILE); \
else \
fputs ("\t.weakext\t", FILE); \
assemble_name (FILE, NAME); \
if (VALUE) \
{ \
fputc (' ', FILE); \
assemble_name (FILE, VALUE); \
} \
fputc ('\n', FILE); \
} while (0)
but (a) !TARGET_GAS isn't a consideration for mips*-elf these days and
(b) '.weak' doesn't accept the '.weak foo bar' syntax. That didn't
matter because we were using:
.weak foo
foo = bar
anyway. And that's what you get with the elfos.h definition and
mips-specific ASM_OUTPUT_DEF.
Finally, mips/elf.h (unlike mips/elf64.h) defined BSS_SECTION_ASM_OP
and ASM_OUTPUT_ALIGNED_BSS. BSS_SECTION_ASM_OP isn't in itself
very useful; it just means we write:
.section .bss
instead of:
.section .bss,"aw",@nobits
It was needed for ASM_OUTPUT_ALIGNED_BSS though.
The MIPS version of ASM_OUTPUT_ALIGNED_BSS handles sbss stuff, but that's
been superceded by the more recent target-independent small data handling
in varasm.c. We can now leave varasm.c to choose .sbss when appropriate.
I tested this patch by compiling cc1, xgcc, etc., for the following targets:
mips-netbsd mipsisa32-elf mipsisa32r2el-elf mipsisa64-elf
mipsisa64sr71k-elf mipsisa64sb1el-elf mips-elf mips64-elf
mips64vr-elf mips64orion-elf mips-rtems mips-wrs-vxworks
mips-wrs-windiss mipstx39-elf
The vxworks target didn't build (ISTR there wsa a patch from cgd to
fix that). The others built fine. I diffed the configure and build
logs to make sure there were no new warnings. I also diffed the
gcc-c-torture and gcc.dg output for each target.
Apart from the hoped-for .lcomm differences, the new output has .size
directives for functions and .ident strings at the end of each file.
Both of these are harmless.
The only other difference, and perhaps a more worrying one, is that
zero-length structures are now assembled to nothing. Code like:
struct {} s = {};
used to produce:
.section .bss,"aw",@nobits
.align 3
.type s, @object
.size s, 0
s:
.space 1
but we no longer emit the ".space 1" directive. This means that
two zero-length structures could potentially have the same address.
Zero-length structures are a GNU extension, and I'm not sure whether
we guarantee that they have unique addresses. If we do, then the
bug is in the call to assemble_zeros() in varasm.c:assemble_variable();
we should pass 1 rather than 0 for zero-length variables.
Regression tested on mips64-elf. Also bootstrapped (as a sanity check)
on mips-sgi-irix6.5. Eric, is this OK with you?
Richard
* config.gcc (mips*-*-elf*, mips*-*-rtems*): Add elfos.h to tm_file.
Replace uses of mips/elf64.h with mips/elf.h
* config/mips/elf.h (MAX_OFILE_ALIGNMENT, TARGET_ASM_NAMED_SECTION)
(TYPE_OPERAND_FMT, TYPE_ASM_OP, SIZE_ASM_OP, BSS_SECTION_ASM_OP)
(ASM_OUTPUT_ALIGNED_BSS, ASM_WEAKEN_LABEL, ASM_OUTPUT_WEAK_ALIAS)
(MAKE_DECL_ONE_ONLY, INIT_SECTION_ASM_OP, FINI_SECTION_ASM_OP)
(HANDLE_SYSV_PRAGMA): Delete.
(ASM_OUTPUT_DEF): Fix formatting.
* config/mips/elf64.h: Delete.
Index: config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.471
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.471 config.gcc
--- config.gcc 29 Jul 2004 06:10:02 -0000 1.471
+++ config.gcc 29 Jul 2004 19:50:27 -0000
@@ -1367,64 +1367,64 @@ mips*-*-openbsd*)
esac
;;
mipsisa32-*-elf* | mipsisa32el-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-isa3264
tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
use_fixproto=yes
;;
mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-isa3264
tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
use_fixproto=yes
;;
mipsisa64-*-elf* | mipsisa64el-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-isa3264
target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
use_fixproto=yes
;;
mipsisa64sr71k-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-sr71k
target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
use_fixproto=yes
;;
mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-elf
target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
use_fixproto=yes
;;
mips-*-elf* | mipsel-*-elf*)
- tm_file="${tm_file} mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-elf
use_fixproto=yes
;;
mips64-*-elf* | mips64el-*-elf*)
- tm_file="${tm_file} mips/elf64.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-elf
target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
use_fixproto=yes
;;
mips64vr-*-elf* | mips64vrel-*-elf*)
- tm_file="mips/vr.h ${tm_file} mips/elf64.h"
+ tm_file="mips/vr.h elfos.h ${tm_file} mips/elf.h"
tmake_file=mips/t-vr
use_fixproto=yes
;;
mips64orion-*-elf* | mips64orionel-*-elf*)
- tm_file="${tm_file} mips/elforion.h mips/elf64.h"
+ tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
tmake_file=mips/t-elf
target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
use_fixproto=yes
;;
mips*-*-rtems*)
- tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
+ tm_file="elfos.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
tmake_file="mips/t-elf t-rtems mips/t-rtems"
;;
mips-wrs-vxworks)
@@ -1442,7 +1442,7 @@ mips-wrs-windiss) # Instruction-level si
thread_file=
;;
mipstx39-*-elf* | mipstx39el-*-elf*)
- tm_file="${tm_file} mips/r3900.h mips/elf.h"
+ tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
tmake_file=mips/t-r3900
use_fixproto=yes
;;
@@ -2633,7 +2633,7 @@ fi
;;
esac
case $tm_file in
- *mips/elf.h* | *mips/elf64.h*)
+ *mips/elf.h*)
tm_defines="OBJECT_FORMAT_ELF $tm_defines"
;;
esac
Index: config/mips/elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/elf.h,v
retrieving revision 1.61
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.61 elf.h
--- config/mips/elf.h 31 Jan 2004 02:07:02 -0000 1.61
+++ config/mips/elf.h 29 Jul 2004 19:50:27 -0000
@@ -1,5 +1,4 @@
-/* Definitions of target machine for GNU compiler. MIPS R3000 version with
- GOFAST floating point library.
+/* Target macros for mips*-elf targets.
Copyright (C) 1994, 1997, 1999, 2000, 2002, 2003, 2004
Free Software Foundation, Inc.
@@ -20,52 +19,19 @@ along with GCC; see the file COPYING. I
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* Biggest alignment supported by the object file format of this
- machine. Use this macro to limit the alignment which can be
- specified using the `__attribute__ ((aligned (N)))' construct. If
- not defined, the default value is `BIGGEST_ALIGNMENT'. */
-
-#undef MAX_OFILE_ALIGNMENT
-#define MAX_OFILE_ALIGNMENT (32768*8)
-
-/* Switch into a generic section. */
-#undef TARGET_ASM_NAMED_SECTION
-#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section
-
-/* The following macro defines the format used to output the second
- operand of the .type assembler directive. Different svr4 assemblers
- expect various different forms for this operand. The one given here
- is just a default. You may need to override it in your machine-
- specific tm.h file (depending upon the particulars of your assembler). */
-
-#define TYPE_OPERAND_FMT "@%s"
-
-/* Define the strings used for the special svr4 .type and .size directives.
- These strings generally do not vary from one system running svr4 to
- another, but if a given system (e.g. m88k running svr) needs to use
- different pseudo-op names for these, they may be overridden in the
- file which includes this one. */
-
-#undef TYPE_ASM_OP
-#undef SIZE_ASM_OP
-#define TYPE_ASM_OP "\t.type\t"
-#define SIZE_ASM_OP "\t.size\t"
-
-/* If defined, a C expression whose value is a string containing the
- assembler operation to identify the following data as
- uninitialized global data. If not defined, and neither
- `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined,
- uninitialized global data will be output in the data section if
- `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be
- used. */
-
-#ifndef BSS_SECTION_ASM_OP
-#define BSS_SECTION_ASM_OP "\t.section\t.bss"
-#endif
-
-#ifndef ASM_OUTPUT_ALIGNED_BSS
-#define ASM_OUTPUT_ALIGNED_BSS mips_output_aligned_bss
-#endif
+/* MIPS assemblers don't have the usual .set foo,bar construct;
+ .set is used for assembler options instead. */
+#undef SET_ASM_OP
+#define ASM_OUTPUT_DEF(FILE, LABEL1, LABEL2) \
+ do \
+ { \
+ fputc ('\t', FILE); \
+ assemble_name (FILE, LABEL1); \
+ fputs (" = ", FILE); \
+ assemble_name (FILE, LABEL2); \
+ fputc ('\n', FILE); \
+ } \
+ while (0)
#undef ASM_DECLARE_OBJECT_NAME
#define ASM_DECLARE_OBJECT_NAME mips_declare_object_name
@@ -73,52 +39,7 @@ #define ASM_DECLARE_OBJECT_NAME mips_dec
#undef ASM_FINISH_DECLARE_OBJECT
#define ASM_FINISH_DECLARE_OBJECT mips_finish_declare_object
-#define ASM_OUTPUT_DEF(FILE,LABEL1,LABEL2) \
- do { fputc ( '\t', FILE); \
- assemble_name (FILE, LABEL1); \
- fputs ( " = ", FILE); \
- assemble_name (FILE, LABEL2); \
- fputc ( '\n', FILE); \
- } while (0)
-
-/* Note about .weak vs. .weakext
- The mips native assemblers support .weakext, but not .weak.
- mips-elf gas supports .weak, but not .weakext.
- mips-elf gas has been changed to support both .weak and .weakext,
- but until that support is generally available, the 'if' below
- should serve. */
-
-#undef ASM_WEAKEN_LABEL
-#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,0)
-#define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE) \
- do { \
- if (TARGET_GAS) \
- fputs ("\t.weak\t", FILE); \
- else \
- fputs ("\t.weakext\t", FILE); \
- assemble_name (FILE, NAME); \
- if (VALUE) \
- { \
- fputc (' ', FILE); \
- assemble_name (FILE, VALUE); \
- } \
- fputc ('\n', FILE); \
- } while (0)
-
-#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
-
-/* On elf, we *do* have support for the .init and .fini sections, and we
- can put stuff in there to be executed before and after `main'. We let
- crtstuff.c and other files know this by defining the following symbols.
- The definitions say how to change sections to the .init and .fini
- sections. This is the same for all known elf assemblers. */
-
-#undef INIT_SECTION_ASM_OP
-#define INIT_SECTION_ASM_OP "\t.section\t.init"
-#undef FINI_SECTION_ASM_OP
-#define FINI_SECTION_ASM_OP "\t.section\t.fini"
-
-/* Don't set the target flags, this is done by the linker script */
+/* Leave the linker script to choose the appropriate libraries. */
#undef LIB_SPEC
#define LIB_SPEC ""
@@ -127,6 +48,3 @@ #define STARTFILE_SPEC "crti%O%s crtbegi
#undef ENDFILE_SPEC
#define ENDFILE_SPEC "crtend%O%s crtn%O%s"
-
-/* We support #pragma. */
-#define HANDLE_SYSV_PRAGMA 1
Index: config/mips/elf64.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/elf64.h,v
retrieving revision 1.63
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.63 elf64.h
--- config/mips/elf64.h 31 Jan 2004 02:07:02 -0000 1.63
+++ config/mips/elf64.h 29 Jul 2004 19:50:27 -0000
@@ -1,116 +0,0 @@
-/* Definitions of target machine for GNU compiler. MIPS R4000 version with
- GOFAST floating point library.
- Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2004
- Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Biggest alignment supported by the object file format of this
- machine. Use this macro to limit the alignment which can be
- specified using the `__attribute__ ((aligned (N)))' construct. If
- not defined, the default value is `BIGGEST_ALIGNMENT'. */
-
-#undef MAX_OFILE_ALIGNMENT
-#define MAX_OFILE_ALIGNMENT (32768*8)
-
-/* Switch into a generic section. */
-#undef TARGET_ASM_NAMED_SECTION
-#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section
-
-/* The following macro defines the format used to output the second
- operand of the .type assembler directive. Different svr4 assemblers
- expect various different forms for this operand. The one given here
- is just a default. You may need to override it in your machine-
- specific tm.h file (depending upon the particulars of your assembler). */
-
-#define TYPE_OPERAND_FMT "@%s"
-
-/* Define the strings used for the special svr4 .type and .size directives.
- These strings generally do not vary from one system running svr4 to
- another, but if a given system (e.g. m88k running svr) needs to use
- different pseudo-op names for these, they may be overridden in the
- file which includes this one. */
-
-#undef TYPE_ASM_OP
-#undef SIZE_ASM_OP
-#define TYPE_ASM_OP "\t.type\t"
-#define SIZE_ASM_OP "\t.size\t"
-
-#undef ASM_DECLARE_OBJECT_NAME
-#define ASM_DECLARE_OBJECT_NAME mips_declare_object_name
-
-#undef ASM_FINISH_DECLARE_OBJECT
-#define ASM_FINISH_DECLARE_OBJECT mips_finish_declare_object
-
-#define ASM_OUTPUT_DEF(FILE,LABEL1,LABEL2) \
- do { fputc ( '\t', FILE); \
- assemble_name (FILE, LABEL1); \
- fputs ( " = ", FILE); \
- assemble_name (FILE, LABEL2); \
- fputc ( '\n', FILE); \
- } while (0)
-
-/* Note about .weak vs. .weakext
- The mips native assemblers support .weakext, but not .weak.
- mips-elf gas supports .weak, but not .weakext.
- mips-elf gas has been changed to support both .weak and .weakext,
- but until that support is generally available, the 'if' below
- should serve. */
-
-#undef ASM_WEAKEN_LABEL
-#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,0)
-#define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE) \
- do { \
- if (TARGET_GAS) \
- fputs ("\t.weak\t", FILE); \
- else \
- fputs ("\t.weakext\t", FILE); \
- assemble_name (FILE, NAME); \
- if (VALUE) \
- { \
- fputc (' ', FILE); \
- assemble_name (FILE, VALUE); \
- } \
- fputc ('\n', FILE); \
- } while (0)
-
-#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
-
-/* On elf, we *do* have support for the .init and .fini sections, and we
- can put stuff in there to be executed before and after `main'. We let
- crtstuff.c and other files know this by defining the following symbols.
- The definitions say how to change sections to the .init and .fini
- sections. This is the same for all known elf assemblers. */
-
-#undef INIT_SECTION_ASM_OP
-#define INIT_SECTION_ASM_OP "\t.section\t.init"
-#undef FINI_SECTION_ASM_OP
-#define FINI_SECTION_ASM_OP "\t.section\t.fini"
-
-/* Don't set the target flags, this is done by the linker script */
-#undef LIB_SPEC
-#define LIB_SPEC ""
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "crti%O%s crtbegin%O%s"
-
-#undef ENDFILE_SPEC
-#define ENDFILE_SPEC "crtend%O%s crtn%O%s"
-
-/* We support #pragma. */
-#define HANDLE_SYSV_PRAGMA 1