Skip to content

R
riscv-gcc-1
Commit 0df965d7 by Steven Bosscher
Options

cris.h (TARGET_ELF): Remove. 

	* config/cris/cris.h (TARGET_ELF): Remove.
	(FORCE_EH_FRAME_INFO_IN_DATA_SECTION): Remove.
	(CRIS_ASM_OUTPUT_ALIGNED_DECL_COMMON): Simpify using TARGET_ELF==1.
	(LOCAL_LABEL_PREFIX): Likewise.
	* config/cris/cris.c (cris_target_asm_named_section): Remove.
	(cris_option_override): Simpify using TARGET_ELF==1.
	(cris_file_start): Likewise.
	* config/cris/cris-protos.h (cris_target_asm_named_section): Remove.

From-SVN: r188709
parent 9a575e05
Showing with 25 additions and 61 deletions
gcc/ChangeLog
2012-06-17 Steven Bosscher <steven@gcc.gnu.org>
* config/cris/cris.h (TARGET_ELF): Remove.
(FORCE_EH_FRAME_INFO_IN_DATA_SECTION): Remove.
(CRIS_ASM_OUTPUT_ALIGNED_DECL_COMMON): Simpify using TARGET_ELF==1.
(LOCAL_LABEL_PREFIX): Likewise.
* config/cris/cris.c (cris_target_asm_named_section): Remove.
(cris_option_override): Simpify using TARGET_ELF==1.
(cris_file_start): Likewise.
* config/cris/cris-protos.h (cris_target_asm_named_section): Remove.
2012-06-17 Uros Bizjak <ubizjak@gmail.com>
* config/i386/sse.md (vcvtph2ps): Fix vec_select selector.
......
gcc/config/cris/cris-protos.h
......@@ -52,7 +52,6 @@ extern void cris_order_for_addsi3 (rtx *, int);
extern void cris_emit_trap_for_misalignment (rtx);
#endif /* RTX_CODE */
extern void cris_asm_output_label_ref (FILE *, char *);
extern void cris_target_asm_named_section (const char *, unsigned int, tree);
extern void cris_expand_prologue (void);
extern void cris_expand_epilogue (void);
extern void cris_expand_return (bool);
......
gcc/config/cris/cris.c
......@@ -2359,19 +2359,6 @@ cris_reg_overlap_mentioned_p (rtx x, rtx in)
return reg_overlap_mentioned_p (x, in);
}
/* The TARGET_ASM_NAMED_SECTION worker.
We just dispatch to the functions for ELF and a.out. */
void
cris_target_asm_named_section (const char *name, unsigned int flags,
tree decl)
{
if (! TARGET_ELF)
default_no_named_section (name, flags, decl);
else
default_elf_asm_named_section (name, flags, decl);
}
/* Return TRUE iff X is a CONST valid for e.g. indexing.
ANY_OPERAND is 0 if X is in a CALL_P insn or movsi, 1
elsewhere. */
......@@ -2634,12 +2621,6 @@ cris_option_override (void)
flag_no_function_cse = 1;
}
if (write_symbols == DWARF2_DEBUG && ! TARGET_ELF)
{
warning (0, "that particular -g option is invalid with -maout and -melinux");
write_symbols = DBX_DEBUG;
}
/* Set the per-function-data initializer. */
init_machine_status = cris_init_machine_status;
}
......@@ -2696,16 +2677,13 @@ cris_asm_output_mi_thunk (FILE *stream,
NO_APP *only at file start* means faster assembly. It also means
comments are not allowed. In some cases comments will be output
for debugging purposes. Make sure they are allowed then.
We want a .file directive only if TARGET_ELF. */
for debugging purposes. Make sure they are allowed then. */
static void
cris_file_start (void)
{
/* These expressions can vary at run time, so we cannot put
them into TARGET_INITIALIZER. */
targetm.asm_file_start_app_off = !(TARGET_PDEBUG || flag_print_asm_name);
targetm.asm_file_start_file_directive = TARGET_ELF;
default_file_start ();
}
......
gcc/config/cris/cris.h
......@@ -33,9 +33,9 @@ along with GCC; see the file COPYING3. If not see
the section-comment is present. */
/* Note that other header files (e.g. config/elfos.h, config/linux.h,
config/cris/linux.h and config/cris/aout.h) are responsible for lots of
settings not repeated below. This file contains general CRIS
definitions and definitions for the cris-*-elf subtarget. */
and config/cris/linux.h) are responsible for lots of settings not
repeated below. This file contains general CRIS definitions
and definitions for the cris-*-elf subtarget. */
/* We don't want to use gcc_assert for everything, as that can be
compiled out. */
......@@ -92,8 +92,7 @@ extern int cris_cpu_version;
/* Node: Driver */
/* Also provide canonical vN definitions when user specifies an alias.
Note that -melf overrides -maout. */
/* Also provide canonical vN definitions when user specifies an alias. */
#define CPP_SPEC \
"%{mtune=*:-D__tune_%* %{mtune=v*:-D__CRIS_arch_tune=%*}\
......@@ -204,11 +203,7 @@ extern int cris_cpu_version;
"emulation" unless a linker script is provided (-T*), but I don't know
how to do that if either of -Ttext, -Tdata or -Tbss is given but no
linker script, as is usually the case. Leave it to the user for the
time being.
Note that -melf overrides -maout except that a.out-compiled libraries
are linked in (multilibbing). We'd need some %s-variant that
checked for existence of some specific file. */
time being. */
#undef LINK_SPEC
#define LINK_SPEC \
"%{v:--verbose}\
......@@ -266,9 +261,6 @@ extern int cris_cpu_version;
} \
while (0)
/* Previously controlled by target_flags. */
#define TARGET_ELF 1
/* Previously controlled by target_flags. Note that this is *not* set
for -melinux. */
#define TARGET_LINUX 0
......@@ -825,8 +817,6 @@ struct cum_args {int regs;};
#define DATA_SECTION_ASM_OP "\t.data"
#define FORCE_EH_FRAME_INFO_IN_DATA_SECTION (! TARGET_ELF)
/* The jump table is immediately connected to the preceding insn. */
#define JUMP_TABLES_IN_TEXT_SECTION 1
......@@ -878,7 +868,7 @@ enum cris_pic_symbol_type
are used on the object files. Since ".global ... .lcomm ..." works, we
use that. Use .._ALIGNED_COMMON, since gcc whines when we only have
..._COMMON, and we prefer to whine ourselves; BIGGEST_ALIGNMENT is not
the one to check. This done for a.out only. */
the one to check. */
/* FIXME: I suspect a bug in gcc with alignment. Do not warn until
investigated; it mucks up the testsuite results. */
#define CRIS_ASM_OUTPUT_ALIGNED_DECL_COMMON(FILE, DECL, NAME, SIZE, ALIGN, LOCAL) \
......@@ -893,29 +883,15 @@ enum cris_pic_symbol_type
else if (align_ < 1) \
align_ = 1; \
\
if (TARGET_ELF) \
{ \
if (LOCAL) \
{ \
fprintf ((FILE), "%s", LOCAL_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), "\n"); \
} \
fprintf ((FILE), "%s", COMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), ",%u,%u\n", (int)(SIZE), align_); \
} \
else \
if (LOCAL) \
{ \
/* We can't tell a one-only or weak COMM from a "global \
COMM" so just make all non-locals weak. */ \
if (! (LOCAL)) \
ASM_WEAKEN_LABEL (FILE, NAME); \
fputs ("\t.lcomm ", (FILE)); \
fprintf ((FILE), "%s", LOCAL_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), ",%u\n", \
((int)(SIZE) + (align_ - 1)) & ~(align_ - 1)); \
fprintf ((FILE), "\n"); \
} \
fprintf ((FILE), "%s", COMMON_ASM_OP); \
assemble_name ((FILE), (NAME)); \
fprintf ((FILE), ",%u,%u\n", (int)(SIZE), align_); \
} \
while (0)
......@@ -963,7 +939,7 @@ enum cris_pic_symbol_type
#define DBR_OUTPUT_SEQEND(FILE) \
fprintf (FILE, "\n")
#define LOCAL_LABEL_PREFIX (TARGET_ELF ? "." : "")
#define LOCAL_LABEL_PREFIX "."
/* cppinit.c initializes a const array from this, so it must be constant,
can't have it different based on options. Luckily, the prefix is
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment