From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 9 Dec 2022 06:55:52 +0000 (+0100)
Subject: Rename SUBTARGET_CC1_SPEC to OS_CC1_SPEC
X-Git-Tag: basepoints/gcc-14~2627
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e4b8dc477c12f303171ec7f0394c97494095545;p=thirdparty%2Fgcc.git

Rename SUBTARGET_CC1_SPEC to OS_CC1_SPEC

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.
---

diff --git a/gcc/config/rtems.h b/gcc/config/rtems.h
index 4742b1f37220..7ee68af243f6 100644
--- a/gcc/config/rtems.h
+++ b/gcc/config/rtems.h
@@ -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}"
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
index 2278e2b6bb15..2568d5411961 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -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;