https://gcc.gnu.org/g:753d7e4edf63c4ff690858da11bf0d59aa24e1bb
commit r12-10311-g753d7e4edf63c4ff690858da11bf0d59aa24e1bb
Author: Iain Sandoe <i...@sandoe.co.uk>
Date: Wed Jan 18 19:58:33 2023 +0000
Darwin, fixincludes: Handle MacOS13 SDK Apple-specific deprecations
[PR107568].
The SDK for MacOS13 includes Apple-specific deprecations of some functions
that
are not deprecated in Posix, C or C++ and widely used in GCC.
The fix makes the deprecation conditional on __APPLE_LOCAL_DEPRECATIONS so
that
end users may still observe them but they are hidden from normal
compilations.
Signed-off-by: Iain Sandoe <i...@sandoe.co.uk>
PR target/107568
fixincludes/ChangeLog:
* fixincl.x: Regenerate.
* inclhack.def: Add a fix for MacOS13 SDK function deprecations
in stdio.h.
* tests/base/stdio.h (__deprecated_msg): New test.
(cherry picked from commit 442d2bdc1d2a98aba0b18aeaa3e87fa946ac8031)
Diff:
---
fixincludes/fixincl.x | 56 ++++++++++++++++++++++++++++++++++++++----
fixincludes/inclhack.def | 12 +++++++++
fixincludes/tests/base/stdio.h | 7 ++++++
3 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index b314506f00d..c8612862081 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 December 11, 2023 at 06:14:06 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed March 30, 2024 at 04:02:13 PM by AutoGen 5.18.7
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Dec 11 18:14:06 CET 2023
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Mar 30 16:02:13 GMT 2024
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work
* correctly with ANSI C and placed in a directory that GNU C will search.
*
- * This file contains 267 fixup descriptions.
+ * This file contains 268 fixup descriptions.
*
* See README for more information.
*
@@ -2608,6 +2608,46 @@ static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
int vfscanf(FILE *, const char *, __builtin_va_list) __asm__
(_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description of Apple_Local_Stdio_Fn_Deprecation fix
+ */
+tSCC zApple_Local_Stdio_Fn_DeprecationName[] =
+ "apple_local_stdio_fn_deprecation";
+
+/*
+ * File name selection pattern
+ */
+tSCC zApple_Local_Stdio_Fn_DeprecationList[] =
+ "stdio.h\0";
+/*
+ * Machine/OS name selection pattern
+ */
+tSCC* apzApple_Local_Stdio_Fn_DeprecationMachs[] = {
+ "*-*-*darwin2*",
+ (const char*)NULL };
+
+/*
+ * content selection pattern - do fix if pattern found
+ */
+tSCC zApple_Local_Stdio_Fn_DeprecationSelect0[] =
+ "__deprecated_msg([^\n\
+]*)$";
+
+#define APPLE_LOCAL_STDIO_FN_DEPRECATION_TEST_CT 1
+static tTestDesc aApple_Local_Stdio_Fn_DeprecationTests[] = {
+ { TT_EGREP, zApple_Local_Stdio_Fn_DeprecationSelect0, (regex_t*)NULL }, };
+
+/*
+ * Fix Command Arguments for Apple_Local_Stdio_Fn_Deprecation
+ */
+static const char* apzApple_Local_Stdio_Fn_DeprecationPatch[] = {
+ "format",
+ "#if defined(__APPLE_LOCAL_DEPRECATIONS)\n\
+%0\n\
+#endif",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Ctrl_Quotes_Def fix
@@ -10872,9 +10912,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
-#define REGEX_COUNT 305
+#define REGEX_COUNT 306
#define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT 267
+#define FIX_COUNT 268
/*
* Enumerate the fixes
@@ -10941,6 +10981,7 @@ typedef enum {
BROKEN_CABS_FIXIDX,
BROKEN_NAN_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
+ APPLE_LOCAL_STDIO_FN_DEPRECATION_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
@@ -11455,6 +11496,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
+ { zApple_Local_Stdio_Fn_DeprecationName,
zApple_Local_Stdio_Fn_DeprecationList,
+ apzApple_Local_Stdio_Fn_DeprecationMachs,
+ APPLE_LOCAL_STDIO_FN_DEPRECATION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+ aApple_Local_Stdio_Fn_DeprecationTests,
apzApple_Local_Stdio_Fn_DeprecationPatch, 0 },
+
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 5cdd52a8de8..0c1a3f0658d 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1269,6 +1269,18 @@ fix = {
test_text = '#define vfscanf __svfscanf';
};
+fix = {
+ hackname = apple_local_stdio_fn_deprecation;
+ mach = "*-*-*darwin2*";
+ files = stdio.h;
+ select = "__deprecated_msg([^\n]*)$";
+ c_fix = format;
+ c_fix_arg = "#if defined(__APPLE_LOCAL_DEPRECATIONS)\n"
+ "%0\n"
+ "#endif";
+ test_text = '__deprecated_msg("This function is provided for compat...")';
+};
+
/*
* Fix various macros used to define ioctl numbers.
* The traditional syntax was:
diff --git a/fixincludes/tests/base/stdio.h b/fixincludes/tests/base/stdio.h
index 491c75da6e5..38381bacb2d 100644
--- a/fixincludes/tests/base/stdio.h
+++ b/fixincludes/tests/base/stdio.h
@@ -41,6 +41,13 @@ int vfscanf(FILE *, const char *, __builtin_va_list) __asm__
(_BSD_STRING(__USER
#endif /* BSD_STDIO_ATTRS_CONFLICT_CHECK */
+#if defined( APPLE_LOCAL_STDIO_FN_DEPRECATION_CHECK )
+#if defined(__APPLE_LOCAL_DEPRECATIONS)
+__deprecated_msg("This function is provided for compat...")
+#endif
+#endif /* APPLE_LOCAL_STDIO_FN_DEPRECATION_CHECK */
+
+
#if defined( HPUX10_STDIO_DECLARATIONS_CHECK )
# define _iob __iob
