Replace GPL m4 macros with different macros inside of ax_ext.m4

3 files changed, 73 insertions, 187 deletions

diff --git a/m4/ax_ext.m4 b/m4/ax_ext.m4
index 1ee3b94..0cc2096 100644
--- a/m4/ax_ext.m4
+++ b/m4/ax_ext.m4
@@ -57,68 +57,119 @@ AC_DEFUN([AX_EXT],
           fi
     ;;
 
-
     i[[3456]]86*|x86_64*|amd64*)
 
-      AC_REQUIRE([AX_GCC_X86_CPUID])
-      AC_REQUIRE([AX_GCC_X86_AVX_XGETBV])
+      AC_REQUIRE([AC_PROG_CC])
+      AC_LANG_PUSH([C])
+
+      # Note for the next 3 macros: m4 does not like '$' and '>', so 
+      # we have to use the ascii values, 36 and 62, resp. to print the
+      # characters out to the temporary shell script used to detect
+      # CPUID settings
+      
+      AC_CACHE_VAL([ax_cv_feature_ecx], [
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
+        int eax, ebx, ecx, edx;
+        FILE *f;
+        __asm__("cpuid"
+          : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+          : "a" (0x00000001));
+        f = fopen("ax_cv_feature_ecx", "w");
+        fprintf(f, "if (( (0x%x %c%c %c0) & 0x1 )); then echo 1; else echo 0; fi\n", ecx, 62, 62, 36);
+        fclose(f);
+        return 0;
+        ])],
+          #[ax_cv_feature_ecx=`cat ax_cv_feature_ecx`; rm -f ax_cv_feature_ecx],
+          [ax_cv_feature_ecx=`cat ax_cv_feature_ecx`],
+          [ax_cv_feature_ecx='echo 0'; rm -f ax_cv_feature_ecx],
+          [ax_cv_feature_ecx='echo 0'])])
+      
+      AC_CACHE_VAL([ax_cv_feature_edx], [
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
+        int eax, ebx, ecx, edx;
+        FILE *f;
+        __asm__("cpuid"
+          : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+          : "a" (0x00000001));
+        f = fopen("ax_cv_feature_edx", "w");
+        fprintf(f, "if (( (0x%x %c%c %c0) & 0x1 )); then echo 1; else echo 0; fi\n", edx, 62, 62, 36);
+        fclose(f);
+        return 0;
+        ])], 
+          [ax_cv_feature_edx=`cat ax_cv_feature_edx`; rm -f ax_cv_feature_edx],
+          [ax_cv_feature_edx='echo 0'; rm -f ax_cv_feature_edx],
+          [ax_cv_feature_edx='echo 0'])])
+      
+      AC_CACHE_VAL([ax_cv_vendor_ecx], [
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
+        int eax, ebx, ecx, edx;
+        FILE *f;
+        __asm__("cpuid"
+          : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+          : "a" (0x00000000));
+        f = fopen("ax_cv_vendor_ecx", "w");
+        fprintf(f, "if (( (0x%x %c%c %c0) & 0x1)); then echo 1; else echo 0; fi\n", ecx, 62, 62, 36);
+        fclose(f);
+        return 0;
+        ])], 
+          [ax_cv_vendor_ecx=`cat ax_cv_vendor_ecx`; rm -f ax_cv_vendor_ecx],
+          [ax_cv_vendor_ecx='echo 0'; rm -f ax_cv_vendor_ecx],
+          [ax_cv_vendor_ecx='echo 0'])])
 
-      AX_GCC_X86_CPUID(0x00000001)
-      ecx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 3`
-      edx=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 4`
+      AC_LANG_POP([C])
 
       AC_CACHE_CHECK([whether mmx is supported], [ax_cv_have_mmx_ext],
       [
         ax_cv_have_mmx_ext=no
-        if test "$((0x$edx>>23&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_edx\" 23` ]]" = "1"; then
           ax_cv_have_mmx_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether sse is supported], [ax_cv_have_sse_ext],
       [
         ax_cv_have_sse_ext=no
-        if test "$((0x$edx>>25&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_edx\" 25` ]]" = "1"; then
           ax_cv_have_sse_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether sse2 is supported], [ax_cv_have_sse2_ext],
       [
         ax_cv_have_sse2_ext=no
-        if test "$((0x$edx>>26&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_edx\" 26` ]]" = "1"; then
           ax_cv_have_sse2_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether sse3 is supported], [ax_cv_have_sse3_ext],
       [
         ax_cv_have_sse3_ext=no
-        if test "$((0x$ecx&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 0` ]]" = "1"; then
           ax_cv_have_sse3_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether ssse3 is supported], [ax_cv_have_ssse3_ext],
       [
         ax_cv_have_ssse3_ext=no
-        if test "$((0x$ecx>>9&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 9` ]]" = "1"; then
           ax_cv_have_ssse3_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether sse4.1 is supported], [ax_cv_have_sse41_ext],
       [
         ax_cv_have_sse41_ext=no
-        if test "$((0x$ecx>>19&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 19` ]]" = "1"; then
           ax_cv_have_sse41_ext=yes
         fi
       ])
-
+      
       AC_CACHE_CHECK([whether sse4.2 is supported], [ax_cv_have_sse42_ext],
       [
         ax_cv_have_sse42_ext=no
-        if test "$((0x$ecx>>20&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 20` ]]" = "1"; then
           ax_cv_have_sse42_ext=yes
         fi
       ])
@@ -126,25 +177,18 @@ AC_DEFUN([AX_EXT],
       AC_CACHE_CHECK([whether avx is supported by processor], [ax_cv_have_avx_cpu_ext],
       [
         ax_cv_have_avx_cpu_ext=no
-        if test "$((0x$ecx>>28&0x01))" = 1; then
+        if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 28` ]]" = "1"; then
           ax_cv_have_avx_cpu_ext=yes
         fi
       ])
 
       if test x"$ax_cv_have_avx_cpu_ext" = x"yes"; then
-        AX_GCC_X86_AVX_XGETBV(0x00000000)
-
-        xgetbv_eax="0"
-        if test x"$ax_cv_gcc_x86_avx_xgetbv_0x00000000" != x"unknown"; then
-          xgetbv_eax=`echo $ax_cv_gcc_x86_avx_xgetbv_0x00000000 | cut -d ":" -f 1`
-        fi
-
         AC_CACHE_CHECK([whether avx is supported by operating system], [ax_cv_have_avx_ext],
         [
           ax_cv_have_avx_ext=no
 
-          if test "$((0x$ecx>>27&0x01))" = 1; then
-            if test "$((0x$xgetbv_eax&0x6))" = 6; then
+          if test "$[[ `sh -c \"$ax_cv_feature_ecx\" 27` ]]" = "1"; then
+            if test "$[[ `sh -c \"$ax_cv_vendor_ecx\" 6` ]]" = "1"; then
               ax_cv_have_avx_ext=yes
             fi
           fi
diff --git a/m4/ax_gcc_x86_avx_xgetbv.m4 b/m4/ax_gcc_x86_avx_xgetbv.m4
deleted file mode 100644
index 0624eeb..0000000
--- a/m4/ax_gcc_x86_avx_xgetbv.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_gcc_x86_avx_xgetbv.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_X86_AVX_XGETBV
-#
-# DESCRIPTION
-#
-#   On later x86 processors with AVX SIMD support, with gcc or a compiler
-#   that has a compatible syntax for inline assembly instructions, run a
-#   small program that executes the xgetbv instruction with input OP. This
-#   can be used to detect if the OS supports AVX instruction usage.
-#
-#   On output, the values of the eax and edx registers are stored as
-#   hexadecimal strings as "eax:edx" in the cache variable
-#   ax_cv_gcc_x86_avx_xgetbv.
-#
-#   If the xgetbv instruction fails (because you are running a
-#   cross-compiler, or because you are not using gcc, or because you are on
-#   a processor that doesn't have this instruction),
-#   ax_cv_gcc_x86_avx_xgetbv_OP is set to the string "unknown".
-#
-#   This macro mainly exists to be used in AX_EXT.
-#
-# LICENSE
-#
-#   Copyright (c) 2013 Michael Petch <mpetch@capp-sysware.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 1
-
-AC_DEFUN([AX_GCC_X86_AVX_XGETBV],
-[AC_REQUIRE([AC_PROG_CC])
-AC_LANG_PUSH([C])
-AC_CACHE_CHECK(for x86-AVX xgetbv $1 output, ax_cv_gcc_x86_avx_xgetbv_$1,
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
-     int op = $1, eax, edx;
-     FILE *f;
-      /* Opcodes for xgetbv */
-      __asm__(".byte 0x0f, 0x01, 0xd0"
-        : "=a" (eax), "=d" (edx)
-        : "c" (op));
-     f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
-     fprintf(f, "%x:%x\n", eax, edx);
-     fclose(f);
-     return 0;
-])],
-     [ax_cv_gcc_x86_avx_xgetbv_$1=`cat conftest_xgetbv`; rm -f conftest_xgetbv],
-     [ax_cv_gcc_x86_avx_xgetbv_$1=unknown; rm -f conftest_xgetbv],
-     [ax_cv_gcc_x86_avx_xgetbv_$1=unknown])])
-AC_LANG_POP([C])
-])
diff --git a/m4/ax_gcc_x86_cpuid.m4 b/m4/ax_gcc_x86_cpuid.m4
deleted file mode 100644
index 7d46fee..0000000
--- a/m4/ax_gcc_x86_cpuid.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpuid.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_GCC_X86_CPUID(OP)
-#
-# DESCRIPTION
-#
-#   On Pentium and later x86 processors, with gcc or a compiler that has a
-#   compatible syntax for inline assembly instructions, run a small program
-#   that executes the cpuid instruction with input OP. This can be used to
-#   detect the CPU type.
-#
-#   On output, the values of the eax, ebx, ecx, and edx registers are stored
-#   as hexadecimal strings as "eax:ebx:ecx:edx" in the cache variable
-#   ax_cv_gcc_x86_cpuid_OP.
-#
-#   If the cpuid instruction fails (because you are running a
-#   cross-compiler, or because you are not using gcc, or because you are on
-#   a processor that doesn't have this instruction), ax_cv_gcc_x86_cpuid_OP
-#   is set to the string "unknown".
-#
-#   This macro mainly exists to be used in AX_GCC_ARCHFLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2008 Matteo Frigo
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 7
-
-AC_DEFUN([AX_GCC_X86_CPUID],
-[AC_REQUIRE([AC_PROG_CC])
-AC_LANG_PUSH([C])
-AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1,
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [
-     int op = $1, eax, ebx, ecx, edx;
-     FILE *f;
-      __asm__("cpuid"
-        : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-        : "a" (op));
-     f = fopen("conftest_cpuid", "w"); if (!f) return 1;
-     fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx);
-     fclose(f);
-     return 0;
-])],
-     [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid],
-     [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid],
-     [ax_cv_gcc_x86_cpuid_$1=unknown])])
-AC_LANG_POP([C])
-])