fix conflicts

hulxv · hulxv · commit 5d0880036612 · 2025-07-25T12:59:11.000+03:00
diff --git a/libc/include/math.yaml b/libc/include/math.yaml
@@ -134,12 +134,14 @@ functions:
     arguments:
       - type: float
   - name: atanhf16
+    standatds:
       - stdc
     return_type: _Float16
     arguments:
       - type: _Float16
     guard: LIBC_TYPES_HAS_FLOAT16
   - name: atanpif16
+    standards:
       - stdc
     return_type: _Float16
     arguments:
diff --git a/libc/src/math/generic/CMakeLists.txt b/libc/src/math/generic/CMakeLists.txt
@@ -3931,7 +3931,7 @@ add_entrypoint_object(
     libc.src.__support.macros.optimization
 )
 
-add_object_library(
+add_entrypoint_object(
   atanhf16
   SRCS
     atanhf16.cpp

Original file line number	Diff line number	Diff line change
`@@ -3931,7 +3931,7 @@ add_entrypoint_object(`
`3931`	`3931`	`libc.src.__support.macros.optimization`
`3932`	`3932`	`)`
`3933`	`3933`
`3934`		`-add_object_library(`
	`3934`	`+add_entrypoint_object(`
`3935`	`3935`	`atanhf16`
`3936`	`3936`	`SRCS`
`3937`	`3937`	`atanhf16.cpp`