Skip to content

R
riscv-gcc-1
Commit 8d12174d by David S. Miller Committed by David S. Miller
Options

Move target CPP macro handling to C file and add __VIS/__VIS__. 

	* config/sparc/sparc-c.c: New file implementing sparc_target_macros,
	which will now define __VIS and __VIS__ when -mvis is enabled.
	* config/sparc/t-sparc: Likewise.
	* config.gcc: Add sparc-c.o to c_target_objs and cxx_target_objs,
	and add t-sparc to tmake_file for all sparc targets.
	* config/sparc/sparc-protos.h (sparc_target_macros): Declare.
	* config/sparc/sparc.h (TARGE_CPU_CPP_BUILTINS): Call it.

From-SVN: r179210
parent 6cb1ef51
Showing with 119 additions and 31 deletions
gcc/ChangeLog
2011-09-26 David S. Miller <davem@davemloft.net>
* config/sparc/sparc-c.c: New file implementing sparc_target_macros,
which will now define __VIS and __VIS__ when -mvis is enabled.
* config/sparc/t-sparc: Likewise.
* config.gcc: Add sparc-c.o to c_target_objs and cxx_target_objs,
and add t-sparc to tmake_file for all sparc targets.
* config/sparc/sparc-protos.h (sparc_target_macros): Declare.
* config/sparc/sparc.h (TARGE_CPU_CPP_BUILTINS): Call it.
2011-09-26 Georg-Johann Lay <avr@gjlay.de> 2011-09-26 Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr.md (peephole casesi+2): Use -1 instead of 65536. * config/avr/avr.md (peephole casesi+2): Use -1 instead of 65536.
gcc/config.gcc
...@@ -422,6 +422,8 @@ score*-*-*) ...@@ -422,6 +422,8 @@ score*-*-*)
;; ;;
sparc*-*-*) sparc*-*-*)
cpu_type=sparc cpu_type=sparc
c_target_objs="sparc-c.o"
cxx_target_objs="sparc-c.o"
extra_headers="visintrin.h" extra_headers="visintrin.h"
need_64bit_hwint=yes need_64bit_hwint=yes
;; ;;
...@@ -2457,32 +2459,32 @@ sparc-*-elf*) ...@@ -2457,32 +2459,32 @@ sparc-*-elf*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp-elf.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp-elf.h"
case ${target} in case ${target} in
*-leon-*) *-leon-*)
tmake_file="sparc/t-leon" tmake_file="sparc/t-sparc sparc/t-leon"
;; ;;
*-leon[3-9]*) *-leon[3-9]*)
tmake_file="sparc/t-leon3" tmake_file="sparc/t-sparc sparc/t-leon3"
;; ;;
*) *)
tmake_file="sparc/t-elf" tmake_file="sparc/t-sparc sparc/t-elf"
;; ;;
esac esac
;; ;;
sparc-*-rtems*) sparc-*-rtems*)
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h" tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
tmake_file="sparc/t-elf t-rtems" tmake_file="sparc/t-sparc sparc/t-elf t-rtems"
;; ;;
sparc-*-linux*) sparc-*-linux*)
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h" tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
extra_options="${extra_options} sparc/long-double-switch.opt" extra_options="${extra_options} sparc/long-double-switch.opt"
case ${target} in case ${target} in
*-leon-*) *-leon-*)
tmake_file="${tmake_file} sparc/t-leon" tmake_file="${tmake_file} sparc/t-sparc sparc/t-leon"
;; ;;
*-leon[3-9]*) *-leon[3-9]*)
tmake_file="${tmake_file} sparc/t-leon3" tmake_file="${tmake_file} sparc/t-sparc sparc/t-leon3"
;; ;;
*) *)
tmake_file="${tmake_file} sparc/t-linux" tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux"
;; ;;
esac esac
if test x$enable_targets = xall; then if test x$enable_targets = xall; then
...@@ -2497,6 +2499,7 @@ sparc-*-netbsdelf*) ...@@ -2497,6 +2499,7 @@ sparc-*-netbsdelf*)
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h" tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt" extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
extra_options="${extra_options} sparc/long-double-switch.opt" extra_options="${extra_options} sparc/long-double-switch.opt"
tmake_file="${tmake_file} sparc/t-sparc"
;; ;;
sparc*-*-solaris2*) sparc*-*-solaris2*)
tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h" tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h"
...@@ -2508,25 +2511,26 @@ sparc*-*-solaris2*) ...@@ -2508,25 +2511,26 @@ sparc*-*-solaris2*)
test x$with_cpu != x || with_cpu=v9 test x$with_cpu != x || with_cpu=v9
;; ;;
esac esac
tmake_file="${tmake_file} sparc/t-sol2-64" tmake_file="${tmake_file} sparc/t-sparc sparc/t-sol2-64"
;; ;;
sparc-wrs-vxworks) sparc-wrs-vxworks)
tm_file="${tm_file} elfos.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h" tm_file="${tm_file} elfos.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
tmake_file="${tmake_file} sparc/t-vxworks" tmake_file="${tmake_file} sparc/t-sparc sparc/t-vxworks"
;; ;;
sparc64-*-elf*) sparc64-*-elf*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
extra_options="${extra_options} sparc/little-endian.opt" extra_options="${extra_options} sparc/little-endian.opt"
tmake_file="${tmake_file} sparc/t-sparc"
;; ;;
sparc64-*-rtems*) sparc64-*-rtems*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
extra_options="${extra_options} sparc/little-endian.opt" extra_options="${extra_options} sparc/little-endian.opt"
tmake_file="${tmake_file} t-rtems" tmake_file="${tmake_file} sparc/t-sparc t-rtems"
;; ;;
sparc64-*-linux*) sparc64-*-linux*)
tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h" tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default-64.h sparc/linux64.h"
extra_options="${extra_options} sparc/long-double-switch.opt" extra_options="${extra_options} sparc/long-double-switch.opt"
tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64" tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux sparc/t-linux64"
extra_parts="${extra_parts} crtfastmath.o" extra_parts="${extra_parts} crtfastmath.o"
;; ;;
sparc64-*-freebsd*|ultrasparc-*-freebsd*) sparc64-*-freebsd*|ultrasparc-*-freebsd*)
...@@ -2538,13 +2542,14 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*) ...@@ -2538,13 +2542,14 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
*) echo "$with_cpu not supported for freebsd target"; exit 1 ;; *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
esac esac
extra_parts="${extra_parts} crtfastmath.o" extra_parts="${extra_parts} crtfastmath.o"
tmake_file="${tmake_file} sparc/t-sparc"
;; ;;
sparc64-*-netbsd*) sparc64-*-netbsd*)
tm_file="sparc/biarch64.h ${tm_file}" tm_file="sparc/biarch64.h ${tm_file}"
tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h" tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
extra_options="${extra_options} netbsd.opt netbsd-elf.opt" extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
extra_options="${extra_options} sparc/long-double-switch.opt" extra_options="${extra_options} sparc/long-double-switch.opt"
tmake_file="${tmake_file} sparc/t-netbsd64" tmake_file="${tmake_file} sparc/t-sparc sparc/t-netbsd64"
;; ;;
sparc64-*-openbsd*) sparc64-*-openbsd*)
tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h" tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
...@@ -2553,6 +2558,7 @@ sparc64-*-openbsd*) ...@@ -2553,6 +2558,7 @@ sparc64-*-openbsd*)
extra_options="${extra_options} sparc/little-endian.opt" extra_options="${extra_options} sparc/little-endian.opt"
gas=yes gnu_ld=yes gas=yes gnu_ld=yes
with_cpu=ultrasparc with_cpu=ultrasparc
tmake_file="${tmake_file} sparc/t-sparc"
;; ;;
spu-*-elf*) spu-*-elf*)
tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h" tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
......
gcc/config/sparc/sparc-c.c 0 → 100644
/* Subroutines used for macro/preprocessor support on SPARC.
Copyright (C) 2011
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 3, 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 COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
#include "tm_p.h"
#include "flags.h"
#include "c-family/c-common.h"
#include "c-family/c-pragma.h"
#include "cpplib.h"
void
sparc_target_macros (void)
{
builtin_define_std ("sparc");
if (TARGET_64BIT)
{
cpp_assert (parse_in, "cpu=sparc64");
cpp_assert (parse_in, "machine=sparc64");
}
else
{
cpp_assert (parse_in, "cpu=sparc");
cpp_assert (parse_in, "machine=sparc");
}
if (TARGET_VIS)
{
cpp_define (parse_in, "__VIS__=0x100");
cpp_define (parse_in, "__VIS=0x100");
}
}
gcc/config/sparc/sparc-protos.h
...@@ -47,6 +47,7 @@ extern int short_branch (int, int); ...@@ -47,6 +47,7 @@ extern int short_branch (int, int);
extern void sparc_profile_hook (int); extern void sparc_profile_hook (int);
extern void sparc_override_options (void); extern void sparc_override_options (void);
extern void sparc_output_scratch_registers (FILE *); extern void sparc_output_scratch_registers (FILE *);
extern void sparc_target_macros (void);
#ifdef RTX_CODE #ifdef RTX_CODE
extern enum machine_mode select_cc_mode (enum rtx_code, rtx, rtx); extern enum machine_mode select_cc_mode (enum rtx_code, rtx, rtx);
......
gcc/config/sparc/sparc.h
...@@ -105,25 +105,7 @@ struct processor_costs { ...@@ -105,25 +105,7 @@ struct processor_costs {
extern const struct processor_costs *sparc_costs; extern const struct processor_costs *sparc_costs;
/* Target CPU builtins. FIXME: Defining sparc is for the benefit of #define TARGET_CPU_CPP_BUILTINS() sparc_target_macros ()
Solaris only; otherwise just define __sparc__. Sadly the headers
are such a mess there is no Solaris-specific header. */
#define TARGET_CPU_CPP_BUILTINS() \
do \
{ \
builtin_define_std ("sparc"); \
if (TARGET_64BIT) \
{ \
builtin_assert ("cpu=sparc64"); \
builtin_assert ("machine=sparc64"); \
} \
else \
{ \
builtin_assert ("cpu=sparc"); \
builtin_assert ("machine=sparc"); \
} \
} \
while (0)
/* Specify this in a cover file to provide bi-architecture (32/64) support. */ /* Specify this in a cover file to provide bi-architecture (32/64) support. */
/* #define SPARC_BI_ARCH */ /* #define SPARC_BI_ARCH */
......
gcc/config/sparc/t-sparc 0 → 100644
# General rules that all sparc/ targets must have.
#
# Copyright (C) 2011 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 3, 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 COPYING3. If not see
# <http://www.gnu.org/licenses/>.
sparc.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(RTL_H) $(REGS_H) hard-reg-set.h insn-config.h \
insn-codes.h conditions.h output.h $(INSN_ATTR_H) $(FLAGS_H) \
$(FUNCTION_H) $(EXCEPT_H) $(EXPR_H) $(OPTABS_H) $(RECOG_H) \
$(DIAGNOSTIC_CORE_H) $(GGC_H) $(TM_P_H) debug.h $(TARGET_H) \
$(TARGET_DEF_H) $(COMMON_TARGET_H) $(CFGLAYOUT_H) $(GIMPLE_H) \
langhooks.h reload.h $(PARAMS_H) $(DF_H) dwarf2out.h $(OPTS_H) \
gt-sparc.h
sparc-c.o: $(srcdir)/config/sparc/sparc-c.c \
$(srcdir)/config/sparc/sparc-protos.h \
$(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) $(FLAGS_H) \
$(TM_P_H) coretypes.h $(TM_H) $(TREE_H) \
$(C_COMMON_H) $(C_PRAGMA_H)
$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
$(srcdir)/config/sparc/sparc-c.c
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