math/libpgmath: update to latest snapshot

Bump LLVM requirement to devel/llvm70. Unify handling in port.

18 files changed, 60 insertions, 304 deletions

diff --git a/math/libpgmath/files/patch-CMakeLists.txt b/math/libpgmath/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..6497cdb6b554
--- /dev/null
+++ b/math/libpgmath/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2019-10-20 14:17:43 UTC
++++ CMakeLists.txt
+@@ -52,7 +52,7 @@ if (LIBPGMATH_STANDALONE_BUILD)
+ endif()
+ 
+ set(LIBPGMATH_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
+-if ("${LIBPGMATH_SYSTEM_NAME}" STREQUAL "OpenBSD")
++if ("${LIBPGMATH_SYSTEM_NAME}" STREQUAL "OpenBSD" OR "${LIBPGMATH_SYSTEM_NAME}" STREQUAL "FreeBSD")
+   set(LIBPGMATH_SYSTEM_NAME "Linux")
+ endif ()
+ 
diff --git a/math/libpgmath/files/patch-lib_CMakeLists.txt b/math/libpgmath/files/patch-lib_CMakeLists.txt
index 51078bd118c0..3a01da370239 100644
--- a/math/libpgmath/files/patch-lib_CMakeLists.txt
+++ b/math/libpgmath/files/patch-lib_CMakeLists.txt
@@ -1,48 +1,25 @@
---- lib/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
+--- lib/CMakeLists.txt.orig	2019-10-20 13:54:36 UTC
 +++ lib/CMakeLists.txt
-@@ -16,19 +16,23 @@
+@@ -15,6 +15,11 @@
+ #
  
- # This value will be the same as CMAKE_SYSTEM_PROCESSOR
- set(PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
--if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|aarch64"))
-+if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64|aarch64"))
+ # This value will be the same as LIBPGMATH_SYSTEM_PROCESSOR
++
++if ("${LIBPGMATH_SYSTEM_PROCESSOR}" STREQUAL "amd64")
++    set(LIBPGMATH_SYSTEM_PROCESSOR "x86_64")
++endif ()
++
+ set(PROCESSOR ${LIBPGMATH_SYSTEM_PROCESSOR})
+ if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${LIBPGMATH_SYSTEM_PROCESSOR} MATCHES "x86_64|aarch64"))
    set(PROCESSOR "generic")
- endif()
+@@ -23,6 +28,10 @@ endif()
+ find_program(SH_PROGRAM NAMES sh bash)
  
-+if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${PROCESSOR} MATCHES "amd64")
-+  set(PROCESSOR "x86_64")
-+endif()
-+
  set_property(GLOBAL APPEND PROPERTY "TARGET_OBJECTS")
++
++if ("${LIBPGMATH_SYSTEM_NAME}" STREQUAL "FreeBSD")
++    set(LIBPGMATH_SYSTEM_NAME "Linux")
++endif ()
  
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64" AND NOT ${LIBPGMATH_WITH_GENERIC})
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64|amd64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
- 
-     set(DEFINITIONS_L1
-       HOST_LINUX LINUX LINUX86 LINUX8664 MAXCPUS=256 MAXCPUSL=8 MAXCPUSR=8
-       TARGET_LINUX TARGET_LINUX_X86 TARGET_LINUX_X8664 TARGET_X86 TARGET_X8664
--      __gnu_linux__ PG_PIC)
-+      __gnu_linux__ linux PG_PIC)
-     set(FLAGS_L1 "-m64 -O3 ")
- 
-     set(DEFINITIONS_L2
-@@ -210,7 +214,7 @@ else()
- endif()
- 
- include_directories(common)
--if(${PROCESSOR} MATCHES "x86_64|AMD64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+if(${PROCESSOR} MATCHES "x86_64|AMD64|amd64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-   include_directories(x86_64)
- # elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
- #   include_directories(ppc64le)
-@@ -223,7 +227,7 @@ endif()
- 
- # Add directories to build
- add_subdirectory(common)
--if(${PROCESSOR} MATCHES "x86_64|AMD64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+if(${PROCESSOR} MATCHES "x86_64|AMD64|amd64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-   add_subdirectory(x86_64)
- # elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
- #   add_subdirectory(ppc64le)
+ if(${LIBPGMATH_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT ${LIBPGMATH_WITH_GENERIC})
+   if(${LIBPGMATH_SYSTEM_NAME} MATCHES "Linux")
diff --git a/math/libpgmath/files/patch-lib_common_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_CMakeLists.txt
deleted file mode 100644
index 3875fea39f8e..000000000000
--- a/math/libpgmath/files/patch-lib_common_CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
---- lib/common/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/CMakeLists.txt
-@@ -17,7 +17,7 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- 
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|ppc64le|aarch64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64|ppc64le|aarch64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-     add_subdirectory("acos")
-     add_subdirectory("asin")
-     add_subdirectory("exp")
-@@ -33,8 +33,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L1")
- get_property(DEFINITIONS GLOBAL PROPERTY "DEFINITIONS_L1")
- 
- set(SRCS)
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT ${LIBPGMATH_WITH_GENERIC})
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     add_subdirectory("cos")
-     add_subdirectory("cosf")
-     add_subdirectory("sincosf")
-@@ -278,13 +278,13 @@ libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEF
- set(DEFINITIONS_CMPLX ${DEFINITIONS} MTH_CMPLX_C99_ABI)
- libmath_add_object_library("${MTH_CMPLX_SRCS}" "${FLAGS}" "${DEFINITIONS_CMPLX}" "common_mth_cmplx")
- 
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64" AND NOT ${LIBPGMATH_WITH_GENERIC})
-   # Generate mth_128mask.c
-   set(TARGET_NAME "mth_128mask")
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=128 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_mask.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=core2")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-msse2")
-@@ -297,7 +297,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=128 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=core2")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-msse2")
-@@ -310,7 +310,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=256 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_mask.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=sandybridge")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx")
-@@ -323,7 +323,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=256 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=sandybridge")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx")
-@@ -337,7 +337,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-     COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_mask.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
-   set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mtune=knl -march=knl")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx512f -mfma")
-@@ -350,7 +350,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mtune=knl -march=knl")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx512f -mfma")
-@@ -363,7 +363,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT 
-   add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
-     COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_z2yy.awk > ${TARGET_NAME}.c)
-   add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mtune=knl -march=knl")
-   elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-     set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx512f -mfma")
diff --git a/math/libpgmath/files/patch-lib_common_acos_fma3_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_acos_fma3_CMakeLists.txt
deleted file mode 100644
index 493ef9f12338..000000000000
--- a/math/libpgmath/files/patch-lib_common_acos_fma3_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/acos/fma3/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/acos/fma3/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L2")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
-     set(SRCS
-       sdacos.cpp
-       ssacos.cpp
diff --git a/math/libpgmath/files/patch-lib_common_asin_fma3_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_asin_fma3_CMakeLists.txt
deleted file mode 100644
index 8cc7535cb59d..000000000000
--- a/math/libpgmath/files/patch-lib_common_asin_fma3_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/asin/fma3/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/asin/fma3/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L2")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
-     set(SRCS
-       sdasin.cpp
-       ssasin.cpp
diff --git a/math/libpgmath/files/patch-lib_common_cos_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_cos_CMakeLists.txt
deleted file mode 100644
index d57bce890910..000000000000
--- a/math/libpgmath/files/patch-lib_common_cos_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/cos/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/cos/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L1")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set(COREAVX2_SRCS fd_cos_1_avx2.cpp fd_cos_2_avx2.cpp fd_cos_4_avx2.cpp)
-     set_property(SOURCE ${COREAVX2_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-attributes -mtune=core-avx2 -march=core-avx2 ")
-     set_property(SOURCE ${COREAVX2_SRCS} APPEND_STRING PROPERTY COMPILE_DEFINITIONS "PGI ")
diff --git a/math/libpgmath/files/patch-lib_common_dispatch.c b/math/libpgmath/files/patch-lib_common_dispatch.c
index fc8034e12865..cfd9171a7e27 100644
--- a/math/libpgmath/files/patch-lib_common_dispatch.c
+++ b/math/libpgmath/files/patch-lib_common_dispatch.c
@@ -1,14 +1,14 @@
---- lib/common/dispatch.c.orig	2018-09-04 21:58:51 UTC
+--- lib/common/dispatch.c.orig	2019-10-20 14:21:37 UTC
 +++ lib/common/dispatch.c
-@@ -62,11 +62,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <inttypes.h>
--#ifdef TARGET_LINUX_X8664
+@@ -95,11 +95,7 @@
+ 
+ #endif      // #ifndef _WIN64
+ 
+-#if defined(TARGET_LINUX_X8664) || defined(TARGET_LINUX_POWER) || defined(TARGET_WIN_X8664)
 -#include <malloc.h>
 -#else
  #include <sched.h>
 -#endif
+ 
+ 
  #include "mth_tbldefs.h"
- #if defined(TARGET_LINUX_X8664) || defined(TARGET_OSX_X8664)
- #include "cpuid8664.h"
diff --git a/math/libpgmath/files/patch-lib_common_exp_fma3_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_exp_fma3_CMakeLists.txt
deleted file mode 100644
index 69fda3702243..000000000000
--- a/math/libpgmath/files/patch-lib_common_exp_fma3_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/exp/fma3/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/exp/fma3/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L2")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
-     set(SRCS
-       sdexp.cpp
-       ssexp.cpp
diff --git a/math/libpgmath/files/patch-lib_common_log_fma3_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_log_fma3_CMakeLists.txt
deleted file mode 100644
index b6107d32d444..000000000000
--- a/math/libpgmath/files/patch-lib_common_log_fma3_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/log/fma3/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/log/fma3/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L2")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
-     set(SRCS
-       fdlog1.cpp
-       fdlog2.cpp
diff --git a/math/libpgmath/files/patch-lib_common_pgstdinit.h b/math/libpgmath/files/patch-lib_common_pgstdinit.h
new file mode 100644
index 000000000000..cec66bdc8b7c
--- /dev/null
+++ b/math/libpgmath/files/patch-lib_common_pgstdinit.h
@@ -0,0 +1,11 @@
+--- lib/common/pgstdinit.h.orig	2019-10-20 14:27:37 UTC
++++ lib/common/pgstdinit.h
+@@ -36,7 +36,7 @@ typedef unsigned long long size_t;
+ #define _SIZE_T__
+ #define _SIZE_T_DEFINED
+ #define __SIZE_T__
+-#if defined(LINUX8664) || defined(TARGET_OSX_X8664) || defined(TARGET_LLVM_64)
++#if defined(LINUX8664) || defined(TARGET_OSX_X8664) || defined(TARGET_LLVM_64) || defined(__FreeBSD__)
+ typedef unsigned long size_t;
+ #else
+ typedef unsigned size_t;
diff --git a/math/libpgmath/files/patch-lib_common_pow_fma3_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_pow_fma3_CMakeLists.txt
deleted file mode 100644
index d4a838568070..000000000000
--- a/math/libpgmath/files/patch-lib_common_pow_fma3_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/pow/fma3/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/pow/fma3/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L2")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
-     set(SRCS
-       sdpow.cpp
-       sspow.cpp
diff --git a/math/libpgmath/files/patch-lib_common_powi_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_powi_CMakeLists.txt
deleted file mode 100644
index 86ee6d2492e8..000000000000
--- a/math/libpgmath/files/patch-lib_common_powi_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/powi/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/powi/CMakeLists.txt
-@@ -19,8 +19,8 @@ get_property(DEFINITIONS GLOBAL PROPERTY "DEFINITIONS_
- get_property(FLAGS GLOBAL PROPERTY "FLAGS_L1")
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     # Set source files
-     set(CORE2_SRCS fxpowi.c pxpowi.c)
-     set_property(SOURCE ${CORE2_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "-march=core2 ")
diff --git a/math/libpgmath/files/patch-lib_common_sin_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_sin_CMakeLists.txt
deleted file mode 100644
index 4977873bfed2..000000000000
--- a/math/libpgmath/files/patch-lib_common_sin_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/sin/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/sin/CMakeLists.txt
-@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L1")
- set(SRCS)
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     set(COREAVX2_SRCS fd_sin_1_avx2.cpp fd_sin_2_avx2.cpp fd_sin_4_avx2.cpp)
-     set_property(SOURCE ${COREAVX2_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-attributes -mtune=core-avx2 -march=core-avx2 ")
-     set_property(SOURCE ${COREAVX2_SRCS} APPEND_STRING PROPERTY COMPILE_DEFINITIONS "PGI ")
diff --git a/math/libpgmath/files/patch-lib_common_sincos_CMakeLists.txt b/math/libpgmath/files/patch-lib_common_sincos_CMakeLists.txt
deleted file mode 100644
index 66ba99690f25..000000000000
--- a/math/libpgmath/files/patch-lib_common_sincos_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/common/sincos/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/common/sincos/CMakeLists.txt
-@@ -26,8 +26,8 @@ else()
- endif()
- 
- # Set source files, compiler flags and definitions
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
--  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64")
-+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-     libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEFINITIONS}" "gssincos4")
-     set_property(TARGET gssincos4 APPEND PROPERTY COMPILE_DEFINITIONS SINCOS=__mth_sincos PRECSIZE=4 VLEN=4)
-     libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEFINITIONS}" "gdsincos2")
diff --git a/math/libpgmath/files/patch-lib_x86__64_CMakeLists.txt b/math/libpgmath/files/patch-lib_x86__64_CMakeLists.txt
deleted file mode 100644
index c8dcfc8cf0e4..000000000000
--- a/math/libpgmath/files/patch-lib_x86__64_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/x86_64/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/x86_64/CMakeLists.txt
-@@ -88,7 +88,7 @@ list(APPEND DEFINITIONS _GNU_SOURCE _ISOC99_SOURCE)
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-   list(APPEND DEFINITIONS _GNU_SOURCE)
- endif()
--set(FLAGS "${FLAGS}-Wall -W -Wstrict-prototypes -Wwrite-strings -Werror ")
-+set(FLAGS "${FLAGS}-Wall -W -Wstrict-prototypes -Wwrite-strings ")
- libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEFINITIONS}" "isoc99")
- 
- # isoc99_log2
diff --git a/math/libpgmath/files/patch-lib_x86__64_fast_CMakeLists.txt b/math/libpgmath/files/patch-lib_x86__64_fast_CMakeLists.txt
deleted file mode 100644
index d73da247317f..000000000000
--- a/math/libpgmath/files/patch-lib_x86__64_fast_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/x86_64/fast/CMakeLists.txt.orig	2018-09-03 06:03:48 UTC
-+++ lib/x86_64/fast/CMakeLists.txt
-@@ -39,7 +39,7 @@ add_custom_command(OUTPUT tmp.${TARGET_NAME}.h PRE_BUI
- add_custom_target(${TARGET_NAME} ALL
-   DEPENDS tmp.${TARGET_NAME}.h)
- 
--if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
-   list(APPEND DEFINITIONS LINUX_ELF)
- endif()
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/math/libpgmath/files/patch-lib_x86__64_libm__amd.h b/math/libpgmath/files/patch-lib_x86__64_libm__amd.h
deleted file mode 100644
index ea1f6d660a4c..000000000000
--- a/math/libpgmath/files/patch-lib_x86__64_libm__amd.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/x86_64/libm_amd.h.orig	2018-09-03 06:03:48 UTC
-+++ lib/x86_64/libm_amd.h
-@@ -68,7 +68,7 @@ regulations applicable in licensee's jurisdiction.
- 
- #include <math.h>
- 
--#if !defined(TARGET_WIN)
-+#if !defined(TARGET_LINUX)
- typedef long __INT8_T;
- typedef unsigned long __UINT8_T;
- 
-@@ -79,6 +79,11 @@ typedef unsigned long long __UINT8_T;
- 
- /* Open Tools #defines ldexpf */
- #undef ldexpf
-+
-+#define DOMAIN		1
-+#define SING		2
-+#define OVERFLOW	3
-+#define UNDERFLOW	4
- 
- #endif
- 
diff --git a/math/libpgmath/files/patch-lib_x86__64_libm__inlines__amd.h b/math/libpgmath/files/patch-lib_x86__64_libm__inlines__amd.h
new file mode 100644
index 000000000000..0d2fa8053483
--- /dev/null
+++ b/math/libpgmath/files/patch-lib_x86__64_libm__inlines__amd.h
@@ -0,0 +1,11 @@
+--- lib/x86_64/libm_inlines_amd.h.orig	2019-10-20 13:59:45 UTC
++++ lib/x86_64/libm_inlines_amd.h
+@@ -283,7 +283,7 @@ raise_fpsw_flags(int flags)
+ {
+ #if defined(DONOTDEFINE_WINDOWS)
+   _mm_setcsr(_mm_getcsr() | flags);
+-#elif defined(linux)
++#elif defined(linux) || defined(__FreeBSD__)
+   unsigned int cw;
+   /* Get the current floating-point control/status word */
+   asm volatile("STMXCSR %0" : "=m"(cw));