From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id B5317385841A; Thu, 25 Aug 2022 10:43:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5317385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661424232; bh=lFNuPu3qNQ/9Gye0pGwR1aSMYzcoZfNgO1eKZG7vzIw=; h=From:To:Subject:Date:From; b=v42+flRYH0X6eqhQj5dwdM02zczhjzJsdl1X0mUu9EjFx9Jb2nEJuzN4ctlDQQvDs o/sCGXV1B6m2WPZS0q4ZdOV9G4XB1b4iwQdI904PT00K6FZNalXh1lOVH0uS4rx09a ZZvPORykECiiuyil3YBH1ucoWVgK0WTPS39VMmqU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/hpux-remove-port)] Fix inclhack.def. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/hpux-remove-port X-Git-Oldrev: 5eb6d6b165b2638d55b281b53aa115e9b176d837 X-Git-Newrev: 7b72f71069266481b6a050d9550cab8239e365ea Message-Id: <20220825104352.B5317385841A@sourceware.org> Date: Thu, 25 Aug 2022 10:43:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7b72f71069266481b6a050d9550cab8239e365ea commit 7b72f71069266481b6a050d9550cab8239e365ea Author: Martin Liska Date: Thu Aug 25 12:43:31 2022 +0200 Fix inclhack.def. Diff: --- fixincludes/fixincl.x | 36 ++++++++++++++++++------------------ fixincludes/inclhack.def | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 8f8430b7c91..93343c8f5a6 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed August 25, 2022 at 11:23:48 AM by AutoGen 5.18.16 + * It has been AutoGen-ed August 25, 2022 at 12:43:22 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 25 11:23:48 CEST 2022 +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Aug 25 12:43:22 CEST 2022 * * You must regenerate it. Use the ./genfixes script. * @@ -4446,37 +4446,37 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Hpux11_Cpp_Pow_Inline fix + * Description of Hpux11_2_Cpp_Pow_Inline fix */ -tSCC zHpux11_Cpp_Pow_InlineName[] = - "hpux11_cpp_pow_inline"; +tSCC zHpux11_2_Cpp_Pow_InlineName[] = + "hpux11_2_cpp_pow_inline"; /* * File name selection pattern */ -tSCC zHpux11_Cpp_Pow_InlineList[] = +tSCC zHpux11_2_Cpp_Pow_InlineList[] = "math.h\0"; /* * Machine/OS name selection pattern */ -#define apzHpux11_Cpp_Pow_InlineMachs (const char**)NULL +#define apzHpux11_2_Cpp_Pow_InlineMachs (const char**)NULL /* * content selection pattern - do fix if pattern found */ -tSCC zHpux11_Cpp_Pow_InlineSelect0[] = +tSCC zHpux11_2_Cpp_Pow_InlineSelect0[] = " +inline double pow\\(double d,int expon\\) \\{\n\ +return pow\\(d, \\(double\\)expon\\);\n\ +\\}\n"; -#define HPUX11_CPP_POW_INLINE_TEST_CT 1 -static tTestDesc aHpux11_Cpp_Pow_InlineTests[] = { - { TT_EGREP, zHpux11_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; +#define HPUX11_2_CPP_POW_INLINE_TEST_CT 1 +static tTestDesc aHpux11_2_Cpp_Pow_InlineTests[] = { + { TT_EGREP, zHpux11_2_Cpp_Pow_InlineSelect0, (regex_t*)NULL }, }; /* - * Fix Command Arguments for Hpux11_Cpp_Pow_Inline + * Fix Command Arguments for Hpux11_2_Cpp_Pow_Inline */ -static const char* apzHpux11_Cpp_Pow_InlinePatch[] = { +static const char* apzHpux11_2_Cpp_Pow_InlinePatch[] = { "format", "", (char*)NULL }; @@ -9994,7 +9994,7 @@ typedef enum { HP_SYSFILE_FIXIDX, HPPA_HPUX_FP_MACROS_FIXIDX, HPUX11_CPP_POW_INLINE_FIXIDX, - HPUX11_CPP_POW_INLINE_FIXIDX, + HPUX11_2_CPP_POW_INLINE_FIXIDX, HPUX_MATH_CONSTEXPR_FIXIDX, HPUX_EXTERN_ERRNO_FIXIDX, HPUX_HTONL_FIXIDX, @@ -10659,10 +10659,10 @@ tFixDesc fixDescList[ FIX_COUNT ] = { HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 }, - { zHpux11_Cpp_Pow_InlineName, zHpux11_Cpp_Pow_InlineList, - apzHpux11_Cpp_Pow_InlineMachs, - HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 }, + { zHpux11_2_Cpp_Pow_InlineName, zHpux11_2_Cpp_Pow_InlineList, + apzHpux11_2_Cpp_Pow_InlineMachs, + HPUX11_2_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aHpux11_2_Cpp_Pow_InlineTests, apzHpux11_2_Cpp_Pow_InlinePatch, 0 }, { zHpux_Math_ConstexprName, zHpux_Math_ConstexprList, apzHpux_Math_ConstexprMachs, diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 92fefd54f5a..efd757ecc21 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2255,7 +2255,7 @@ fix = { }; fix = { - hackname = hpux11_cpp_pow_inline; + hackname = hpux11_2_cpp_pow_inline; files = math.h; select = " +inline double pow\\(double d,int expon\\) \\{\n" " +return pow\\(d, \\(double\\)expon\\);\n"