libc/libm: Move math into libc, fix cos function

Author: byteduck

libraries/CMakeLists.txt

@@ -1,6 +1,5 @@
 ADD_COMPILE_OPTIONS(-O3 -msse2)
 ADD_SUBDIRECTORY(libc/)
-ADD_SUBDIRECTORY(libm/)
 ADD_SUBDIRECTORY(libpond/)
 ADD_SUBDIRECTORY(ld/)
 ADD_SUBDIRECTORY(libgraphics/)

libraries/libc/CMakeLists.txt

@@ -11,6 +11,7 @@ SET(SOURCES
         ifaddrs.c
         locale.c
         libgen.cpp
+        math.c
         poll.c
         pthread.cpp
         sched.c
@@ -84,4 +85,7 @@ ADD_CUSTOM_TARGET(libc)
 ADD_DEPENDENCIES(libc libc_headers libc_dyn libc_static)
 
 # Tell linker to use libc for pthread
-file(WRITE "${CMAKE_STAGING_PREFIX}/lib/libpthread.so" "INPUT(libc.so)")
+file(WRITE "${CMAKE_STAGING_PREFIX}/lib/libpthread.so" "INPUT(libc.so)")
+file(WRITE "${CMAKE_STAGING_PREFIX}/lib/libpthread.a" "INPUT(libc.a)")
+file(WRITE "${CMAKE_STAGING_PREFIX}/lib/libm.so" "INPUT(libc.so)")
+file(WRITE "${CMAKE_STAGING_PREFIX}/lib/libm.a" "INPUT(libc.a)")

libraries/libm/math.c renamed to libraries/libc/math.c

@@ -32,7 +32,7 @@
 
 X87_FUNC(sqrt, fsqrt);
 X87_FUNC(sin, fsin);
-X87_FUNC(cos, fsin);
+X87_FUNC(cos, fcos);
 X87_FUNC(atan, fpatan);
 X87_FUNC2(atan2, fpatan);
 X87_FUNC(tan, fptan);

libraries/libm/math.h renamed to libraries/libc/math.h

@@ -1,3 +1,2 @@
 SET(SOURCES Framebuffer.cpp Font.cpp Geometry.cpp Graphics.cpp Image.cpp PNG.cpp Deflate.cpp)
-MAKE_LIBRARY(libgraphics)
-ADD_DEPENDENCIES(libgraphics libm)
+MAKE_LIBRARY(libgraphics)

libraries/libgraphics/CMakeLists.txt

@@ -38,14 +38,6 @@ install_headers() {
   done <<< "$LIBC_HEADERS"
   success "Installed libc headers!"
 
-  msg "Installing libm headers..."
-  mkdir -p "$SYSROOT"/usr/include
-  LIBM_HEADERS=$(find "$LIBM_LOC" -name '*.h' -print)
-  while IFS= read -r HEADER; do
-    "$INSTALL_BIN" -D "$HEADER" "$SYSROOT/usr/include/$(echo "$HEADER" | sed -e "s@$LIBM_LOC@@")"
-  done <<< "$LIBM_HEADERS"
-  success "Installed libm headers!"
-
   msg "Installing kernel headers..."
   mkdir -p "$SYSROOT"/usr/include/kernel
   KERNEL_HEADERS=$(find "$KERNEL_LOC" -name '*.h' -print)