procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename SUBTARGET_CC1_SPEC to OS_CC1_SPEC

Browse source 
This change resolves a naming conflict introduced by the recently added
SUBTARGET_CC1_SPEC to gcc.cc.  Some targets (mips and loongarch) aready used
a SUBTARGET_CC1_SPEC define.  Rename the define used by gcc.cc to OS_CC1_SPEC.

gcc/ChangeLog:

	* config/rtems.h (SUBTARGET_CC1_SPEC): Rename to...
	(OS_CC1_SPEC): ...this.
	* gcc.cc (SUBTARGET_CC1_SPEC): Rename to...
	(OS_CC1_SPEC): ...this.
This commit is contained in:
Sebastian Huber 2022-12-09 07:55:52 +01:00
parent 63a42ffc08
commit 3e4b8dc477
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/config/rtems.h
View file

@ -58,5 +58,5 @@
#define STDINT_LONG32 (INT_TYPE_SIZE != 32 && LONG_TYPE_SIZE == 32)
/* Default to local-exec TLS model. */
#undef SUBTARGET_CC1_SPEC
#define SUBTARGET_CC1_SPEC " %{!ftls-model=*:-ftls-model=local-exec}"
#undef OS_CC1_SPEC
#define OS_CC1_SPEC " %{!ftls-model=*:-ftls-model=local-exec}"

10
gcc/gcc.cc
View file

@ -706,11 +706,11 @@ proper position among the other output files. */
#define CPP_SPEC ""
#endif
/* Subtargets can define SUBTARGET_CC1_SPEC to provide extra args to cc1 and
cc1plus or extra switch-translations. The SUBTARGET_CC1_SPEC is appended
/* Operating systems can define OS_CC1_SPEC to provide extra args to cc1 and
cc1plus or extra switch-translations. The OS_CC1_SPEC is appended
to CC1_SPEC in the initialization of cc1_spec. */
#ifndef SUBTARGET_CC1_SPEC
#define SUBTARGET_CC1_SPEC ""
#ifndef OS_CC1_SPEC
#define OS_CC1_SPEC ""
#endif
/* config.h can define CC1_SPEC to provide extra args to cc1 and cc1plus
@ -1181,7 +1181,7 @@ proper position among the other output files. */
static const char *asm_debug = ASM_DEBUG_SPEC;
static const char *asm_debug_option = ASM_DEBUG_OPTION_SPEC;
static const char *cpp_spec = CPP_SPEC;
static const char *cc1_spec = CC1_SPEC SUBTARGET_CC1_SPEC;
static const char *cc1_spec = CC1_SPEC OS_CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
static const char *link_ssp_spec = LINK_SSP_SPEC;