Tested on x86_64-darwin10, 24, pushed to trunk, thanks,
Iain
--- 8< ---
In some Darwin SDKs the math.h that needs fixincludes resides in an
arch-specific
sub-directory of /usr/include. Allow for that in the math.h fixincludes.
fixincludes/ChangeLog:
* fixincl.x: Regenerate.
* inclhack.def: Allow for math.h in architecture/<arch> in SDKs.
Signed-off-by: Iain Sandoe <[email protected]>
---
fixincludes/fixincl.x | 6 +++---
fixincludes/inclhack.def | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 9db4d376a2e..2045fad33af 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 February 15, 2026 at 11:11:08 PM by AutoGen 5.18.12
+ * It has been AutoGen-ed September 19, 2026 at 10:38:43 AM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT MERGE THIS FILE, EITHER Sun Feb 15 23:11:08 CET 2026
+/* DO NOT MERGE THIS FILE, EITHER Sat Sep 19 10:38:43 BST 2026
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -3665,7 +3665,7 @@ tSCC zDarwin_Flt_Eval_MethodName[] =
* File name selection pattern
*/
tSCC zDarwin_Flt_Eval_MethodList[] =
- "math.h\0";
+ "math.h\0architecture/i386/math.h\0architecture/ppc/math.h\0";
/*
* Machine/OS name selection pattern
*/
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 20a7e8ef977..3bbcb2ce25e 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1806,7 +1806,7 @@ fix = {
fix = {
hackname = darwin_flt_eval_method;
mach = "*-*-darwin*";
- files = math.h;
+ files = math.h, architecture/i386/math.h, architecture/ppc/math.h;
select = "^#if __FLT_EVAL_METHOD__ == 0( \\|\\| __FLT_EVAL_METHOD__ ==
-1)?$";
c_fix = format;
c_fix_arg = "%0 || __FLT_EVAL_METHOD__ == 16";
--
2.50.1 (Apple Git-155)