Merge branch 'master' into master

Author: theoparis

.travis.yml

@@ -1,19 +1,20 @@
 cmake_minimum_required(VERSION 3.25)
 
 project(openlibm
-        VERSION 0.8.0
+        VERSION 0.8.2
         LANGUAGES C ASM)
 
-add_library("${PROJECT_NAME}")
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 
+add_library("${PROJECT_NAME}")
 
 # Find the relevant folder depending on the architecture
 set(OPENLIBM_ARCH_FOLDER ${CMAKE_SYSTEM_PROCESSOR})
 string(TOLOWER "${OPENLIBM_ARCH_FOLDER}" OPENLIBM_ARCH_FOLDER)
 
 if(${OPENLIBM_ARCH_FOLDER} STREQUAL "amd64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "x86_64")
     set(OPENLIBM_ARCH_FOLDER "amd64")
-elseif(${OPENLIBM_ARCH_FOLDER} MATCHES "arm64")
+elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "arm64" OR ${OPENLIBM_ARCH_FOLDER} STREQUAL "aarch64")
     set(OPENLIBM_ARCH_FOLDER "aarch64")
 elseif(${OPENLIBM_ARCH_FOLDER} STREQUAL "x86")
     set(OPENLIBM_ARCH_FOLDER "i387")
@@ -53,13 +54,6 @@ if(OPENLIBM_SUPPRESS_WARNINGS)
     list(APPEND C_ASM_COMPILE_FLAGS "-w")
 endif()
 
-list(APPEND C_ASM_COMPILE_FLAGS
-        "-I${PROJECT_SRC}"
-        "-I${PROJECT_SRC}/include"
-        "-I${PROJECT_SRC}/${OPENLIBM_ARCH_FOLDER}"
-        "-I${PROJECT_SRC}/src"
-)
-
 # Add compile flags
 target_compile_options("${PROJECT_NAME}" PUBLIC ${C_ASM_COMPILE_FLAGS})
 
@@ -552,3 +546,7 @@ else()
 endif()
 
 target_include_directories("${PROJECT_NAME}" PUBLIC ${OPENLIBM_INCLUDE_DIRS})
+
+file(GLOB PUBLIC_HEADERS "*.h" "include/*.h" "${OPENLIBM_ARCH_FOLDER}/*.h" "src/*.h")
+set_target_properties("${PROJECT_NAME}" PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
+install (TARGETS "${PROJECT_NAME}")

CMakeLists.txt

@@ -39,6 +39,7 @@ endif
 
 ifeq ($(ARCH),wasm32)
 USECLANG = 1
+USEGCC = 0
 TOOLPREFIX = llvm-
 endif
 

Make.inc

@@ -29,7 +29,7 @@ loongarch64.
    Linux and Windows.
 3. Use `make USECLANG=1` to build with clang. This is the default on OS X, FreeBSD,
    and OpenBSD.
-4. Use `make ARCH=wasm32` to build the wasm32 library with clang. Requires clang-8.
+4. Use `make ARCH=wasm32` to build the wasm32 library with clang.
 5. Architectures are auto-detected. Use `make ARCH=i386` to force a
    build for i386. Other supported architectures are i486, i586, and
    i686. GCC 4.8 is the minimum requirement for correct codegen on
@@ -61,8 +61,9 @@ qemu-$ARCH-static -L . -L /usr/$TRIPLE/  test/test-double
 or generate project with build system of choice e.g. `cmake /path/to/openlib/ -G "MinGW Makefiles"`.
 3. Build with the build system with `cmake --build .`.
 
-Default CMake configuration builds a shared library, this can easily be changed by replacing
-the keyword in the `add_library()` command in the `CMakeLists.txt`.
+Default CMake configuration builds a shared library, this can easily be configured using
+[BUILD_SHARED_LIBS](https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html)
+configuration option.
 
 
 ## Acknowledgements

README.md

@@ -8,7 +8,7 @@
 #include <openlibm_fenv_amd64.h>
 #elif defined(__i386__)
 #include <openlibm_fenv_i387.h>
-#elif defined(__powerpc__) || defined(__ppc__)
+#elif defined(__powerpc__) || defined(__POWERPC__)
 #include <openlibm_fenv_powerpc.h>
 #elif defined(__mips__)
 #include <openlibm_fenv_mips.h>

appveyor.yml

@@ -97,7 +97,7 @@ extern const fenv_t	__fe_dfl_env;
 union __fpscr {
 	double __d;
 	struct {
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
 		fenv_t __reg;
 		__uint32_t __junk;
 #else

include/openlibm_fenv.h

@@ -37,7 +37,7 @@
 #else 
 #include "i386_fpmath.h"
 #endif
-#elif defined(__powerpc__) || defined(__ppc__)
+#elif defined(__powerpc__) || defined(__POWERPC__)
 #include "powerpc_fpmath.h"
 #elif defined(__mips__)
 #include "mips_fpmath.h"