mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-26 21:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixincludes: bypass the math_exception fix on __cplusplus

Browse Source 
fixincludes/ChangeLog:

	* fixincl.x: Regenerate.
	* inclhack.def (math_exception): Bypass on __cplusplus.
	* tests/base/math.h: Regenerate.
This commit is contained in:
Francois-Xavier Coudert 2024-06-07 11:05:39 +02:00
parent 95161c6abf
commit 66d6b1861e
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed June 4, 2024 at 02:35:55 PM by AutoGen 5.18.16
* It has been AutoGen-ed June 7, 2024 at 11:03:58 AM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jun 4 14:35:55 CEST 2024
/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun 7 11:03:58 CEST 2024
*
* You must regenerate it. Use the ./genfixes script.
*
@ -6793,9 +6793,7 @@ tSCC zMath_ExceptionList[] =
/*
* Machine/OS name selection pattern
*/
tSCC* apzMath_ExceptionMachs[] = {
"*-*-solaris2.1[0-9]*",
(const char*)NULL };
#define apzMath_ExceptionMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
@ -6807,7 +6805,7 @@ tSCC zMath_ExceptionSelect0[] =
* content bypass pattern - skip fix if pattern found
*/
tSCC zMath_ExceptionBypass0[] =
"We have a problem when using C\\+\\+|for C\\+\\+, _[a-z0-9A-Z_]+_exception; for C, exception";
"__cplusplus";
#define MATH_EXCEPTION_TEST_CT 2
static tTestDesc aMath_ExceptionTests[] = {
@ -12304,7 +12302,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
{ zMath_ExceptionName, zMath_ExceptionList,
apzMath_ExceptionMachs,
MATH_EXCEPTION_TEST_CT, FD_MACH_IFNOT | FD_SUBROUTINE,
MATH_EXCEPTION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aMath_ExceptionTests, apzMath_ExceptionPatch, 0 },
{ zMath_Huge_Val_From_Dbl_MaxName, zMath_Huge_Val_From_Dbl_MaxList,

12
fixincludes/inclhack.def
View File

@ -3412,17 +3412,7 @@ fix = {
hackname = math_exception;
files = math.h;
select = "struct exception";
/*
* This should be bypassed on __cplusplus, but some supposedly C++
* aware headers, such as Solaris 8 and 9, don't wrap their struct
* exception either. So currently we bypass only for glibc, based on a
* comment in the fixed glibc header. Ick.
*/
bypass = 'We have a problem when using C\+\+|for C\+\+, '
'_[a-z0-9A-Z_]+_exception; for C, exception';
/* The Solaris 10 headers already get this right. */
mach = '*-*-solaris2.1[0-9]*';
not_machine = true;
bypass = '__cplusplus';
c_fix = wrap;
c_fix_arg = "#ifdef __cplusplus\n"

11
fixincludes/tests/base/math.h
View File

@ -7,12 +7,6 @@
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#ifndef FIXINC_WRAP_MATH_H_MATH_EXCEPTION
#define FIXINC_WRAP_MATH_H_MATH_EXCEPTION 1
#ifdef __cplusplus
#define exception __math_exception
#endif
#if defined( BROKEN_CABS_CHECK )
@ -146,8 +140,3 @@ int foo;
#endif /* _C99 */
#endif /* VXWORKS_MATH_H_FP_C99_CHECK */
#ifdef __cplusplus
#undef exception
#endif
#endif /* FIXINC_WRAP_MATH_H_MATH_EXCEPTION */