Merge commit '582a4799e1fc' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit fe50fa0204af · 2024-11-11T11:51:24.000-08:00
diff --git a/libc/config/linux/api.td b/libc/config/linux/api.td
@@ -268,7 +268,7 @@ def SetJmpAPI : PublicAPI<"setjmp.h"> {
 }
 
 def SearchAPI : PublicAPI<"search.h"> {
-  let Types = ["ACTION", "ENTRY", "struct hsearch_data"];
+  let Types = ["ACTION", "ENTRY", "struct hsearch_data", "__lsearchcompare_t"];
 }
 
 def SysStatvfsAPI : PublicAPI<"sys/statvfs.h"> {
diff --git a/libc/spec/posix.td b/libc/spec/posix.td
@@ -1582,7 +1582,8 @@ def POSIX : StandardSpec<"POSIX"> {
     [], // Macros
     [
         ActionType,
-        EntryType
+        EntryType,
+        LSearchCompareT,
     ], // Types
     [], // Enumerations
     [

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ def SetJmpAPI : PublicAPI<"setjmp.h"> {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`def SearchAPI : PublicAPI<"search.h"> {`
`271`		`- let Types = ["ACTION", "ENTRY", "struct hsearch_data"];`
	`271`	`+ let Types = ["ACTION", "ENTRY", "struct hsearch_data", "__lsearchcompare_t"];`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`def SysStatvfsAPI : PublicAPI<"sys/statvfs.h"> {`
Original file line number	Diff line number	Diff line change
`@@ -1582,7 +1582,8 @@ def POSIX : StandardSpec<"POSIX"> {`
`1582`	`1582`	`[], // Macros`
`1583`	`1583`	`[`
`1584`	`1584`	`ActionType,`
`1585`		`- EntryType`
	`1585`	`+ EntryType,`
	`1586`	`+ LSearchCompareT,`
`1586`	`1587`	`], // Types`
`1587`	`1588`	`[], // Enumerations`
`1588`	`1589`	`[`