From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id EFD873887CDA; Fri, 9 Dec 2022 07:02:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFD873887CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670569361; bh=CFLohnB62fqmAe/Pn1vsBCDc1P5AIz+Hp1l7JoGo+r4=; h=From:To:Subject:Date:From; b=P0EvZsCh635h0tjwsCb+/shucjBPSigp6tllpqAPIppMpRlh/G2KBFCZ/MsPZhmey 6PMLdfNxcpObItTs8EZFal0CxsKaJICq3BT8t0YctWVj+6SYoxXLwPOc+zyUy65xWF XtEcb7z4pSw6TB1kBgnksOZzd6ZHnJUBHljFOcz0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Sebastian Huber To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4580] Rename SUBTARGET_CC1_SPEC to OS_CC1_SPEC X-Act-Checkin: gcc X-Git-Author: Sebastian Huber X-Git-Refname: refs/heads/master X-Git-Oldrev: 63a42ffc0833553fbcb84b50cf0fd2d867b8a92f X-Git-Newrev: 3e4b8dc477c12f303171ec7f0394c97494095545 Message-Id: <20221209070241.EFD873887CDA@sourceware.org> Date: Fri, 9 Dec 2022 07:02:41 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3e4b8dc477c12f303171ec7f0394c97494095545 commit r13-4580-g3e4b8dc477c12f303171ec7f0394c97494095545 Author: Sebastian Huber Date: Fri Dec 9 07:55:52 2022 +0100 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: --- gcc/config/rtems.h | 4 ++-- gcc/gcc.cc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/config/rtems.h b/gcc/config/rtems.h index 4742b1f3722..7ee68af243f 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 2278e2b6bb1..2568d541196 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;