diff --git a/.gitignore b/.gitignore index cf7f39e0af..f7fb28e8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,12 +12,15 @@ src/fmpz/fmpz.c src/config.h src/config.h.in -src/fft_tuning.h src/flint.h src/flint-config.h src/gmpcompat.h build/ -config/ +config/* +!config/config.guess +!config/config.sub +!config/configfsf.guess +!config/configfsf.sub config.log confdefs.h conftest.* @@ -60,3 +63,4 @@ libtool flint.pc autom4te.cache/ config.m4 +src/flint-mparam.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d8dfee38df..c083e178c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,7 +274,7 @@ string(REGEX REPLACE "([A-Za-z0-9_-]+;|[A-Za-z0-9_-]+$)" "src/\\1" BUILD_DIRS "$ # NOTE: Template directories are not supposed to be used. set(_HEADERS - NTL-interface.h flint.h longlong.h flint-config.h gmpcompat.h fft_tuning.h + NTL-interface.h flint.h longlong.h flint-config.h gmpcompat.h flint-mparam.h profiler.h templates.h mpf-impl.h ) string(REGEX REPLACE "([A-Za-z0-9_-]+\.h;|[A-Za-z0-9_-]+\.h$)" "src/\\1" HEADERS "${_HEADERS}") @@ -352,16 +352,10 @@ endif() if(CMAKE_SIZEOF_VOID_P EQUAL 8) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/fft_tuning64.in - ${CMAKE_CURRENT_SOURCE_DIR}/src/fft_tuning.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/mpn_extras/generic/flint-mparam.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/flint-mparam.h COPYONLY ) -elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/src/fft_tuning32.in - ${CMAKE_CURRENT_SOURCE_DIR}/src/fft_tuning.h - COPYONLY - ) endif() diff --git a/Makefile.in b/Makefile.in index 250f98a7f1..fe64396503 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,9 +68,8 @@ WANT_DEPS:=@WANT_DEPS@ WANT_CXX:=@WANT_CXX@ -WANT_ADX_ASSEMBLY:=@WANT_ADX_ASSEMBLY@ -WANT_ARMV8_ASSEMBLY:=@WANT_ARMV8_ASSEMBLY@ WANT_ASSEMBLY:=@WANT_ASSEMBLY@ +ASM_PATH:=$(SRC_DIR)/mpn_extras/@ASM_PATH@ GMP_LIB_PATH:=@GMP_LIB_PATH@ MPFR_LIB_PATH:=@MPFR_LIB_PATH@ @@ -136,9 +135,9 @@ endif CFG_FILES := \ $(FLINT_DIR)/config.h $(SRC_DIR)/flint-config.h \ $(FLINT_DIR)/config.log $(SRC_DIR)/flint.h \ - $(SRC_DIR)/fft_tuning.h $(FLINT_DIR)/flint.pc \ + $(SRC_DIR)/gmpcompat.h $(FLINT_DIR)/flint.pc \ $(FLINT_DIR)/Makefile $(SRC_DIR)/fmpz/fmpz.c \ - $(SRC_DIR)/gmpcompat.h $(SRC_DIR)/config.m4 + $(SRC_DIR)/config.m4 $(SRC_DIR)/flint-mparam.h ################################################################################ # directories @@ -233,13 +232,9 @@ ifneq ($(COVERAGE), 0) BUILD_DIRS += \ $(BUILD_DIR)/coverage endif -ifeq ($(WANT_ADX_ASSEMBLY),1) -BUILD_DIRS += \ - $(BUILD_DIR)/mpn_extras/broadwell -endif -ifeq ($(WANT_ARMV8_ASSEMBLY),1) +ifeq ($(WANT_ASSEMBLY),1) BUILD_DIRS += \ - $(BUILD_DIR)/mpn_extras/arm64 + $(patsubst $(SRC_DIR)/%,$(BUILD_DIR)/%,$(ASM_PATH)) endif INSTALL_DIRS := \ @@ -254,13 +249,16 @@ endif ################################################################################ SINGLE_HEADERS := \ - flint.h flint-config.h gmpcompat.h \ - profiler.h templates.h fft_tuning.h \ + flint.h flint-config.h flint-mparam.h \ + \ + profiler.h templates.h \ \ longlong.h longlong_asm_clang.h \ longlong_asm_gcc.h longlong_div_gnu.h \ longlong_msc_arm64.h longlong_msc_x86.h \ \ + gmpcompat.h \ + \ crt_helpers.h machine_vectors.h \ \ mpf-impl.h fq_zech_vec.h \ @@ -296,12 +294,7 @@ fmpz_lll_SOURCES := $(filter-out $(SRC_DIR)/fmpz_lll/babai.c $(SRC_DIR)/fmpz_lll SOURCES := $(foreach dir,$(DIRS),$($(dir)_SOURCES)) ifeq ($(WANT_ASSEMBLY),1) -ifeq ($(WANT_ADX_ASSEMBLY),1) -mpn_extras_ASM_SOURCES := $(wildcard $(SRC_DIR)/mpn_extras/broadwell/*.asm) -endif -ifeq ($(WANT_ARMV8_ASSEMBLY),1) -mpn_extras_ASM_SOURCES := $(wildcard $(SRC_DIR)/mpn_extras/arm64/*.asm) -endif +mpn_extras_ASM_SOURCES := $(wildcard $(ASM_PATH)/*.asm) mpn_extras_PIC_S_SOURCES := $(patsubst $(SRC_DIR)/%.asm,$(BUILD_DIR)/%_pic.s,$(mpn_extras_ASM_SOURCES)) mpn_extras_S_SOURCES := $(patsubst $(SRC_DIR)/%.asm,$(BUILD_DIR)/%.s,$(mpn_extras_ASM_SOURCES)) ifneq ($(SHARED), 0) @@ -584,18 +577,11 @@ DEPFLAGS = -MMD -MP -MF $(@:%=%.d) # generated sources ################################################################################ -ifeq ($(WANT_ADX_ASSEMBLY),1) -$(BUILD_DIR)/%.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 $(SRC_DIR)/mpn_extras/asm-defs.m4 $(SRC_DIR)/mpn_extras/broadwell/x86_64-defs.m4 | $(BUILD_DIR)/mpn_extras/broadwell - @$(M4) $< > $@ - -$(BUILD_DIR)/%_pic.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 $(SRC_DIR)/mpn_extras/asm-defs.m4 $(SRC_DIR)/mpn_extras/broadwell/x86_64-defs.m4 | $(BUILD_DIR)/mpn_extras/broadwell - @$(M4) -DPIC $< > $@ -endif -ifeq ($(WANT_ARMV8_ASSEMBLY),1) -$(BUILD_DIR)/%.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 $(SRC_DIR)/mpn_extras/asm-defs.m4 $(SRC_DIR)/mpn_extras/arm64/arm64-defs.m4 | $(BUILD_DIR)/mpn_extras/arm64 +ifeq ($(WANT_ASSEMBLY),1) +$(BUILD_DIR)/%.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 | $(BUILD_DIR)/mpn_extras/@ASM_PATH@ @$(M4) $< > $@ -$(BUILD_DIR)/%_pic.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 $(SRC_DIR)/mpn_extras/asm-defs.m4 $(SRC_DIR)/mpn_extras/arm64/arm64-defs.m4 | $(BUILD_DIR)/mpn_extras/arm64 +$(BUILD_DIR)/%_pic.s: $(SRC_DIR)/%.asm $(FLINT_DIR)/config.m4 | $(BUILD_DIR)/mpn_extras/@ASM_PATH@ @$(M4) -DPIC $< > $@ endif @@ -966,14 +952,16 @@ src/flint.h: src/flint.h.in config.status libtool: config.status ./config.status $@ -src/fft_tuning.h: @FFT_TUNING_IN@ config.status +src/gmpcompat.h: src/@GMPCOMPAT_H_IN@ config.status ./config.status $@ -src/fmpz/fmpz.c: @FMPZ_C_IN@ config.status - ./config.status $@ +# The following two are only linked during configuration -src/gmpcompat.h: src/@GMPCOMPAT_H_IN@ config.status - ./config.status $@ +# src/fmpz/fmpz.c: @FMPZ_C_IN@ config.status +# ./config.status $@ +# +# src/flint-mparam.h: src/mpn_extras/@PARAM_PATH@/flint-mparam.h config.status +# ./config.status $@ ################################################################################ # maintainer stuff diff --git a/acinclude.m4 b/acinclude.m4 index a4e3a457a9..8e90f45a6c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -86,10 +86,13 @@ define(X86_PATTERN, [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]]) define(X86_64_PATTERN, -[[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar*-*-* | bulldozer*-*-* | piledriver*-*-* | steamroller*-*-* | excavator*-*-* | zen*-*-* | pentium4-*-* | atom-*-* | silvermont-*-* | goldmont-*-* | tremont-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-* | nehalem*-*-* | westmere*-*-* | sandybridge*-*-* | ivybridge*-*-* | haswell*-*-* | broadwell*-*-* | skylake*-*-* | kabylake*-*-* | icelake*-*-* | tigerlake*-*-* | rocketlake*-*-* | alderlake*-*-* | raptorlake*-*-*]]) +[[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar*-*-* | bulldozer*-*-* | piledriver*-*-* | steamroller*-*-* | excavator*-*-* | zen*-*-* | pentium4-*-* | atom-*-* | silvermont-*-* | goldmont-*-* | tremont-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-* | nehalem*-*-* | westmere*-*-* | sandybridge*-*-* | ivybridge*-*-* | haswell*-*-* | broadwell*-*-* | skylake*-*-* | kabylake*-*-* | icelake*-*-* | tigerlake*-*-* | rocketlake*-*-* | alderlake*-*-* | raptorlake*-*-* | x86_64v[1234]-*-*]]) + +define(X86_64_ADX_PATTERN, +[[zen*-*-* | broadwell*-*-* | skylake*-*-* | kabylake*-*-* | icelake*-*-* | tigerlake*-*-* | rocketlake*-*-* | alderlake*-*-* | raptorlake*-*-*]]) define(ARM64_PATTERN, -[[aarch64-*-*]]) +[[armcortexa53-*-* | armcortexa53neon-*-* | armcortexa55-*-* | armcortexa55neon-*-* | armcortexa57-*-* | armcortexa57neon-*-* | armcortexa7[2-9]-*-* | armcortexa7[2-9]neon-*-* | armexynosm1-*-* | armthunderx-*-* | armxgene1-*-* | aarch64*-*-* | applem[1-9]*-*-* | armv8*-*-*]]) define(SLOW_VROUNDPD_PATTERN, [[haswell* | broadwell* | skylake* | kabylake* | icelake* | tigerlake* | rocketlake* | alderlake* | raptorlake*]]) @@ -97,6 +100,84 @@ define(SLOW_VROUNDPD_PATTERN, define(FAST_VROUNDPD_PATTERN, [[znver[2-4]* | sandybridge* | ivybridge*]]) + +dnl FLINT_CLANG([action-if-true],[action-if-false]) +dnl ----------------------- +dnl Checks if compiler is clang. + +AC_DEFUN([FLINT_CLANG], +[AC_CACHE_CHECK([if compiler is Clang], + flint_cv_clang, +[flint_cv_clang="no" +AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ +#ifndef __clang__ +#error +error +#endif +],[])], +[flint_cv_clang="yes"]) +]) +AS_VAR_IF([flint_cv_clang],"yes", + [m4_default([$1], :)], + [m4_default([$2], :)]) +]) + + +dnl FLINT_CHECK_CPU_SET_T([action-if-true],[action-if-false]) +dnl ----------------------- +dnl Checks if cpu_set_t is supported. +dnl +dnl FIXME: Does this cover all BSD systems? + +AC_DEFUN([FLINT_CHECK_CPU_SET_T], +[AC_CACHE_CHECK([if cpu_set_t is supported], + flint_cv_check_cpu_set_t, +[flint_cv_check_cpu_set_t="no" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +#define _GNU_SOURCE +#include +#include +], +[cpu_set_t s; +CPU_ZERO(&s); +pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), 0);])], +[flint_cv_check_cpu_set_t="yes"]) +]) +AS_VAR_IF([flint_cv_check_cpu_set_t],"yes", + [m4_default([$1], :)], + [m4_default([$2], :)]) +]) + + +dnl FLINT_CHECK_NTL([action-if-true],[action-if-false]) +dnl ----------------------- +dnl Checks if linking with NTL works. + +AC_DEFUN([FLINT_CHECK_NTL], +[AC_REQUIRE([AC_PROG_CXX]) +AC_CACHE_CHECK([if linking with NTL works], + flint_cv_check_ntl, +[flint_cv_check_ntl="no" +save_LIBS="$LIBS" +LIBS="-lntl $LIBS" +AC_LANG_PUSH([C++]) +AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include + ]], [NTL::ZZ a, b, c; + std::cin >> a; + std::cin >> b; + c = (a+1)*(b+1); + std::cout << c << "\n";])], + [flint_cv_check_ntl="yes"]) +AC_LANG_POP([C++]) +LIBS="$save_LIBS" +]) +AS_VAR_IF([flint_cv_check_ntl],"yes", + [m4_default([$1], :)], + [m4_default([$2], :)]) +]) + + dnl FLINT_PREPROC_IFELSE(input,[action-if-true],[action-if-false]) dnl ----------------------- dnl Runs preprocessor with CFLAGS. @@ -114,48 +195,6 @@ ac_cpp="$ac_cpp" ]) -dnl FLINT_ARCH -dnl ----------------------- -dnl Checks compiler for architectures. -dnl -dnl NOTE: This has to be called after all CFLAGS has been gathered. -dnl -dnl FIXME: Currently only Clang and GCC. Support more compilers? - -AC_DEFUN([FLINT_ARCH], -[AC_CACHE_CHECK([for host architecture], - flint_cv_arch, -[flint_cv_arch="unknown" -is_gnu="no" -AC_PREPROC_IFELSE([AC_LANG_SOURCE([ - #ifndef __GNUC__ - # error - error - #endif - ])], - [is_gnu="yes"]) - -dnl We only know how to proceed with GCC or Clang -AS_VAR_IF([is_gnu],"yes",[ - is_clang="no" - AC_PREPROC_IFELSE([AC_LANG_SOURCE([ - #ifndef __clang__ - # error - error - #endif - ])], - [is_clang="yes"]) - - AS_VAR_IF([is_clang],"yes",[ - flint_cv_arch=[`echo | $CC -v $CFLAGS -E - 2>&1 | grep "cc1" | sed -n 's/.*-target-cpu \([^ ]*\).*/\1/p'`] - ],[ - flint_cv_arch=[`echo | $CC -v $CFLAGS -E - 2>&1 | grep "cc1" | sed -n 's/.*-march=\([^ ]*\).*/\1/p'`] - ]) -]) -]) -]) - - dnl FLINT_CHECK_GMP_H(MAJOR, MINOR, PATCHLEVEL) dnl ----------------------- dnl Checks that gmp.h can be found and that its version fullfills the version @@ -263,104 +302,6 @@ fi ]) ]) -dnl FLINT_SYSTEM_V_ABI([action-success][,action-fail]) -dnl ----------------------- -dnl Checks if System V ABI. -dnl Do "action-success" if this succeeds, "action-fail" if not. - -AC_DEFUN([FLINT_SYSTEM_V_ABI], -[AC_CACHE_CHECK([if system uses System V ABI], - flint_cv_system_v_abi, -AC_PREPROC_IFELSE([AC_LANG_PROGRAM([],[ - #if !(defined(__APPLE__) || defined(__unix__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)) || defined(__CYGWIN__) - #error Dead man - error - #endif - ])], - [flint_cv_system_v_abi="yes"], - [flint_cv_system_v_abi="no"] -)) -AS_VAR_IF([flint_cv_system_v_abi],"yes", - [m4_default([$1], :)], - [m4_default([$2], :)]) -]) - - -dnl FLINT_CHECK_ADX([action-success][,action-fail]) -dnl ----------------------- -dnl Checks if CPU supports the ADX instruction set. Will only run if host CPU -dnl is x86_64. Do "action-success" if this succeeds, "action-fail" if not. - -AC_DEFUN([FLINT_CHECK_ADX], -[AS_VAR_IF([host_cpu],"x86_64", - [AC_CACHE_CHECK([if ADX instruction set is supported by CPU], - flint_cv_check_adx, - FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ - #if !defined(__ADX__) - #error Dead man - error - #endif - ])], - flint_cv_check_adx="yes", - flint_cv_check_adx="no") - )]) -AS_VAR_IF(flint_cv_check_adx,yes, - [m4_default([$1], :)], - [m4_default([$2], :)]) -]) - - -dnl FLINT_CHECK_ARMV8([action-success][,action-fail]) -dnl ----------------------- -dnl Checks if CPU supports the ARM v8-A instruction set. Will only run if host -dnl CPU is aarch64. Do "action-success" if this succeeds, "action-fail" if not. - -AC_DEFUN([FLINT_CHECK_ARMV8], -[AS_VAR_IF([host_cpu],"aarch64", - [AC_CACHE_CHECK([if ARM v8-A instruction set is supported by CPU], - flint_cv_check_armv8a, - FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ - #if __ARM_ARCH != 8 - #error Dead man - error - #endif - ])], - flint_cv_check_armv8a="yes", - flint_cv_check_armv8a="no") - )]) -AS_VAR_IF(flint_cv_check_armv8a,yes, - [m4_default([$1], :)], - [m4_default([$2], :)]) -]) - - -dnl FLINT_HAVE_ASM([action-success][,action-fail]) -dnl ----------------------- -dnl Checks if system use FLINT's assembly. -dnl Do "action-success" if this succeeds, "action-fail" if not. - -AC_DEFUN([FLINT_HAVE_ASM], -[AC_REQUIRE([FLINT_ABI]) -AC_REQUIRE([FLINT_SYSTEM_V_ABI]) -AC_REQUIRE([FLINT_CHECK_ADX]) -AC_REQUIRE([FLINT_CHECK_ARMV8]) - -AC_CACHE_CHECK([if system can use FLINT's assembly], - flint_cv_have_asm, -[flint_cv_have_asm="no" -if test "$flint_cv_abi" = "64" && test "$flint_cv_system_v_abi" = "yes"; -then - if test "$flint_cv_check_adx" = "yes" || test "$flint_cv_check_armv8a" = "yes"; - then - flint_cv_have_asm="yes" - fi -fi]) - -AS_VAR_IF([flint_cv_have_asm],"yes", - [m4_default([$1], :)], - [m4_default([$2], :)]) -]) - dnl FLINT_HAVE_FFT_SMALL_ARM_H dnl ----------------------- @@ -368,9 +309,13 @@ dnl Checks if system have headers for fft_small on Arm. Will only run if on dnl arm64. AC_DEFUN([FLINT_HAVE_FFT_SMALL_ARM_H], -[AS_VAR_IF([host_cpu],"aarch64", - [AC_CHECK_HEADER([arm_neon.h],flint_cv_have_fft_small_arm_h="yes")] -)]) +[case $host in + ARM64_PATTERN) + AC_CHECK_HEADERS([arm_neon.h], + flint_cv_have_fft_small_arm_h="yes", + flint_cv_have_fft_small_arm_h="no") + ;; +esac]) dnl FLINT_HAVE_FFT_SMALL_ARM_I @@ -378,19 +323,20 @@ dnl ----------------------- dnl Checks if system supports Arm NEON instructions. AC_DEFUN([FLINT_HAVE_FFT_SMALL_ARM_I], -[AS_VAR_IF([host_cpu],"aarch64", - [AC_CACHE_CHECK([if system have required Arm instruction set for fft_small], - flint_cv_have_fft_small_arm_i, - FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ - #ifndef __ARM_NEON - #error Dead man - error - #endif - ])], - flint_cv_have_fft_small_arm_i="yes", - flint_cv_have_fft_small_arm_i="no") - )] -)]) +[case $host in + ARM64_PATTERN) + AC_CACHE_CHECK([if system have required ARM instruction set for fft_small], + flint_cv_have_fft_small_arm_i, + [FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ + #if !defined(__ARM_NEON) + #error Dead man + error + #endif + ])], + flint_cv_have_fft_small_arm_i="yes", + flint_cv_have_fft_small_arm_i="no")]) + ;; +esac]) dnl FLINT_HAVE_FFT_SMALL_X86_H @@ -398,11 +344,13 @@ dnl ----------------------- dnl Checks if system have headers for fft_small on x86. AC_DEFUN([FLINT_HAVE_FFT_SMALL_X86_H], -[AS_VAR_IF([host_cpu],"x86_64", - [AC_CHECK_HEADERS([immintrin.h], - flint_cv_have_fft_small_x86_h="yes", - flint_cv_have_fft_small_x86_h="no")] -)]) +[case $host in + X86_64_PATTERN) + AC_CHECK_HEADERS([immintrin.h], + flint_cv_have_fft_small_x86_h="yes", + flint_cv_have_fft_small_x86_h="no") + ;; +esac]) dnl FLINT_HAVE_FFT_SMALL_X86_I @@ -410,19 +358,20 @@ dnl ----------------------- dnl Checks if system supports AVX2 instructions. AC_DEFUN([FLINT_HAVE_FFT_SMALL_X86_I], -[AS_VAR_IF([host_cpu],"x86_64", - [AC_CACHE_CHECK([if system have required x86_64 instruction set for fft_small], - flint_cv_have_fft_small_x86_i, - FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ - #if !defined(__AVX2__) - #error Dead man - error - #endif - ])], - flint_cv_have_fft_small_x86_i="yes", - flint_cv_have_fft_small_x86_i="no") - )] -)]) +[case $host in + X86_64_PATTERN) + AC_CACHE_CHECK([if system have required x86_64 instruction set for fft_small], + flint_cv_have_fft_small_x86_i, + [FLINT_PREPROC_IFELSE([AC_LANG_SOURCE([ + #if !defined(__AVX2__) + #error Dead man + error + #endif + ])], + flint_cv_have_fft_small_x86_i="yes", + flint_cv_have_fft_small_x86_i="no")]) + ;; +esac]) dnl FLINT_CHECK_FFT_SMALL([action-success][,action-fail]) diff --git a/bootstrap.sh b/bootstrap.sh index 8d8bc67af7..930e0185f6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,10 +3,10 @@ set -e rm -rf autom4te.cache -autoreconf -f -i -v -Wall +autoreconf -i -v -Wall # The following lines are from Semigroups/Semigroups, written by Max Horn. -if ! test -x config.guess -a -x config.sub ; +if ! test -x config/config.guess -a -x config/config.sub ; then automake -acf 2> /dev/null || : fi @@ -16,7 +16,7 @@ fi # not actually need it). As a workaround, we just provide an empty file # instead. Since newer autoconf versions such as 2.71 are not affected # by the bug, we add a test to limit when this workaround is applied -if fgrep -q ac_aux_dir/install-sh configure ; +if grep -F -q ac_aux_dir/install-sh configure ; then touch config/install-sh fi diff --git a/config/config.guess b/config/config.guess new file mode 100755 index 0000000000..fd6f453a4c --- /dev/null +++ b/config/config.guess @@ -0,0 +1,1212 @@ +#! /bin/sh +# +# FLINT config.guess wrapper. + +# Copyright (C) 2024 Albin Ahlbäck +# +# This file is part of FLINT. +# +# FLINT is free software: you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License (LGPL) as published +# by the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. See . + +# Copyright 2000-2019 Free Software Foundation, Inc. +# +# This file is part of the GNU MP Library. +# +# The GNU MP Library is free software; you can redistribute it and/or modify +# it under the terms of either: +# +# * the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# or +# +# * the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. +# +# or both in parallel, as here. +# +# The GNU MP Library 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 copies of the GNU General Public License and the +# GNU Lesser General Public License along with the GNU MP Library. If not, +# see https://www.gnu.org/licenses/. + + +# Usage: config.guess +# +# Print the host system CPU-VENDOR-OS. +# +# configfsf.guess is run and its guess then sharpened up to take advantage +# of the finer grained CPU types that GMP knows. + + +# Expect to find configfsf.guess in the same directory as this config.guess +configfsf_guess="`echo \"$0\" | sed 's/config.guess$/configfsf.guess/'`" +if test "$configfsf_guess" = "$0"; then + echo "Cannot derive configfsf.guess from $0" 1>&2 + exit 1 +fi +if test -f "$configfsf_guess"; then + : +else + echo "$configfsf_guess not found" 1>&2 + exit 1 +fi + +# Setup a $SHELL with which to run configfsf.guess, using the same +# $CONFIG_SHELL or /bin/sh as autoconf does when running config.guess +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identify ourselves on --version, --help or errors +if test $# != 0; then + echo "(GNU MP wrapped config.guess)" + $SHELL $configfsf_guess "$@" + exit 1 +fi + +guess_full=`$SHELL $configfsf_guess` +if test $? != 0; then + exit 1 +fi + +guess_cpu=`echo "$guess_full" | sed 's/-.*$//'` +guess_rest=`echo "$guess_full" | sed 's/^[^-]*//'` +exact_cpu= + + +# ------------------------------------------------------------------------- +# The following should look at the current guess and probe the system to +# establish a better guess in exact_cpu. Leave exact_cpu empty if probes +# can't be done, or don't work. +# +# When a number of probes are done, test -z "$exact_cpu" can be used instead +# of putting each probe under an "else" of the preceeding. That can stop +# the code getting horribly nested and marching off the right side of the +# screen. + +# Note that when a compile-and-link is done in one step we need to remove .o +# files, since lame C compilers generate these even when not asked. +# + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy $dummy.core ${dummy}0.s" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + + +case "$guess_full" in + +alpha-*-*) + eval $set_cc_for_build + # configfsf.guess detects exact alpha cpu types for OSF and GNU/Linux, but + # not for *BSD and other systems. We try to get an exact type for any + # plain "alpha" it leaves. + # + # configfsf.guess used to have a block of code not unlike this, but these + # days does its thing with Linux kernel /proc/cpuinfo or OSF psrinfo. + # + cat <${dummy}0.s + .data +Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + .text + .globl main + .align 4 + .ent main +main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d91 # implver \$17 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,Lformat + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main +EOF + $CC_FOR_BUILD ${dummy}0.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `$dummy` in + 0-0) exact_cpu=alpha ;; + 1-0) exact_cpu=alphaev5 ;; + 1-1) exact_cpu=alphaev56 ;; + 1-101) exact_cpu=alphapca56 ;; + 2-303) exact_cpu=alphaev6 ;; + 2-307) exact_cpu=alphaev67 ;; + 2-1307) exact_cpu=alphaev68 ;; + esac + fi + ;; + +arm*-*-* | aarch64-*-*) + if [ $( (uname -s) 2>/dev/null) = Darwin ]; then + case $(system_profiler SPHardwareDataType | grep Chip) in + *Apple\ M1 | *Apple\ M1\ \(Virtual\)) + # The latter is for virtual CPUs, such as GitHub's virtual M1 runner + exact_cpu="applem1";; + *Apple\ M2) + exact_cpu="applem2";; + esac + fi + + cpu_code=`sed -n 's/^CPU part.*\(0x.*\)$/\1/p' /proc/cpuinfo 2>/dev/null | sort -r | head -n 1 2>/dev/null` + cpu_implementer=`sed -n 's/^CPU implementer.*\(0x.*\)$/\1/p' /proc/cpuinfo 2>/dev/null | head -n 1 2>/dev/null` + case "${cpu_implementer}_${cpu_code}" in + 0x53_0x001) exact_cpu=armexynosm1 ;; + 0x51_0x800) exact_cpu=armcortexa57 ;; + 0x43_0x0a1) exact_cpu=armthunderx ;; + 0x50_0x000) exact_cpu=armxgene1 ;; + 0x61_0x023) exact_cpu=applem1 ;; + esac + if test -z "$exact_cpu"; then + case "$cpu_code" in + 0xa10 | 0xa11 | 0xb11) # v4 strongarm/sa1100 + exact_cpu="armsa1";; + 0x915 | 0x925 | \ + 0x920 | 0x922 | 0x940) # v4 + exact_cpu="arm9tdmi";; + 0x210 | 0x290 | 0x2d0 | \ + 0x212 | 0x292 | 0x2d2 | \ + 0x411) exact_cpu="armxscale";; # v5 pxa2xx + 0x926 | 0x946 | 0x966 | 0x968) # v5te/v5tej + exact_cpu="arm9te";; + 0xa20 | 0xa22 | 0xa26) # v5te + exact_cpu="arm10";; + 0xb02) exact_cpu="arm11mpcore";; # v6 + 0xb36) exact_cpu="arm1136";; # v6 + 0xb56) exact_cpu="arm1156";; # v6t2 + 0xb76) exact_cpu="arm1176";; # v6 + 0xc05) exact_cpu="armcortexa5";; # v7a + 0xc07) exact_cpu="armcortexa7";; # v7a + 0xc08) exact_cpu="armcortexa8";; # v7a + 0xc09) exact_cpu="armcortexa9";; # v7a + 0xc0f) exact_cpu="armcortexa15";; # v7a + 0xc0d) exact_cpu="armcortexa12";; # v7a + 0xc0e) exact_cpu="armcortexa17";; # v7a + 0xc14) exact_cpu="armcortexr4";; # v7r + 0xc15) exact_cpu="armcortexr5";; # v7r + 0xc23) exact_cpu="armcortexm3";; # v7m + + 0xd04) exact_cpu="armcortexa35";; # v8 + 0xd03) exact_cpu="armcortexa53";; # v8 + 0xd05) exact_cpu="armcortexa55";; # v8.2 + 0xd07) exact_cpu="armcortexa57";; # v8 + 0xd08) exact_cpu="armcortexa72";; # v8 + 0xd09) exact_cpu="armcortexa73";; # v8 + 0xd0a) exact_cpu="armcortexa75";; # v8.2 + 0xd0b) exact_cpu="armcortexa76";; # v8.3 + *) exact_cpu=$guess_cpu;; + esac + fi + exact_cpu="${exact_cpu}`sed -n 's;^Features.*\(neon\).*;\1;p' /proc/cpuinfo 2>/dev/null | head -n 1 2>/dev/null`" + ;; + +ia64*-*-*) + eval $set_cc_for_build + # CPUID[3] bits 24 to 31 is the processor family. itanium2 is documented + # as 0x1f, plain itanium has been seen returning 0x07 on two systems, but + # haven't found any documentation on it as such. + # + # Defining both getcpuid and _getcpuid lets us ignore whether the system + # expects underscores or not. + # + # "unsigned long long" is always 64 bits, in fact on hpux in ilp32 mode + # (which is the default there), it's the only 64-bit type. + # + cat >${dummy}0.s <$dummy.c < +unsigned long long getcpuid (); +int +main () +{ + if (getcpuid(0LL) == 0x49656E69756E6547LL && getcpuid(1LL) == 0x6C65746ELL) + { + /* "GenuineIntel" */ + switch ((getcpuid(3LL) >> 24) & 0xFF) { + case 0x07: puts ("itanium"); break; + case 0x1F: puts ("itanium2"); break; /* McKinley, Madison */ + case 0x20: puts ("itanium2"); break; /* Montecito, Montvale, Tukwila */ + case 0x21: puts ("itanium2"); break; /* Poulson */ + } + } + return 0; +} +EOF + if $CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy >/dev/null 2>&1; then + exact_cpu=`$dummy` + fi + ;; + +mips-*-irix[6789]*) + # IRIX 6 and up always has a 64-bit mips cpu + exact_cpu=mips64 + ;; + +mips-*-*) + case $(uname -m) in + mips64) exact_cpu=mips64;; + esac + ;; + +mipsel-*-*) + case $(uname -m) in + mips64) exact_cpu=mips64el;; + esac + ;; + +m68k-*-*) + eval $set_cc_for_build + # NetBSD (and presumably other *BSD) "sysctl hw.model" gives for example + # hw.model = Apple Macintosh Quadra 610 (68040) + exact_cpu=`(sysctl hw.model) 2>/dev/null | sed -n 's/^.*\(680[012346]0\).*$/m\1/p'` + if test -z "$exact_cpu"; then + # Linux kernel 2.2 gives for example "CPU: 68020" (tabs in between). + exact_cpu=`sed -n 's/^CPU:.*\(680[012346]0\).*$/m\1/p' /proc/cpuinfo 2>/dev/null` + fi + if test -z "$exact_cpu"; then + # Try: movel #0,%d0; rts + # This is to check the compiler and our asm code works etc, before + # assuming failures below indicate cpu characteristics. + # .byte is used to avoid problems with assembler syntax variations. + # For testing, provoke failures by adding "illegal" possibly as + # ".byte 0x4A, 0xFC" + cat >${dummy}0.s </dev/null 2>&1; then + + # $SHELL -c is used to execute $dummy below, since ($dummy) + # 2>/dev/null still prints the SIGILL message on some shells. + # + # Try: movel #0,%d0 + # rtd #0 + cat >${dummy}0.s </dev/null 2>&1; then + $SHELL -c $dummy >/dev/null 2>&1 + if test $? != 0; then + exact_cpu=m68000 # because rtd didn't work + fi + fi + # + + if test -z "$exact_cpu"; then + # Try: trapf + # movel #0,%d0 + # rts + # Another possibility for identifying 68000 and 68010 is the + # different value stored by "movem a0,(a0)+" + cat >${dummy}0.s </dev/null 2>&1; then + $SHELL -c $dummy >/dev/null 2>&1 + if test $? != 0; then + exact_cpu=m68010 # because trapf didn't work + fi + fi + fi + + if test -z "$exact_cpu"; then + # Try: bfffo %d1{0:31},%d0 + # movel #0,%d0 + # rts + cat >${dummy}0.s </dev/null 2>&1; then + $SHELL -c $dummy >/dev/null 2>&1 + if test $? != 0; then + exact_cpu=m68360 # cpu32, because bfffo didn't work + fi + fi + fi + + if test -z "$exact_cpu"; then + # FIXME: Now we know 68020 or up, but how to detect 030, 040 and 060? + exact_cpu=m68020 + fi + fi + fi + if test -z "$exact_cpu"; then + case "$guess_full" in + *-*-next* | *-*-openstep*) # NeXTs are 68020 or better + exact_cpu=m68020 ;; + esac + fi + ;; + + +rs6000-*-* | powerpc*-*-*) + # Enhancement: On MacOS the "machine" command prints for instance + # "ppc750". Interestingly on powerpc970-apple-darwin6.8.5 it prints + # "ppc970" where there's no actual #define for 970 from NXGetLocalArchInfo + # (as noted below). But the man page says the command is still "under + # development", so it doesn't seem wise to use it just yet, not while + # there's an alternative. + + # Try to read the PVR. mfpvr is a protected instruction, NetBSD, MacOS and + # AIX don't allow it in user mode, but the Linux kernel does. We prefer this + # to /proc/cpuinfo since the latter lags for newer CPUs. + # + # Note this is no good on AIX, since a C function there is the address of + # a function descriptor, not actual code. But this doesn't matter since + # AIX doesn't allow mfpvr anyway. + # + if test -z "$exact_cpu"; then + eval $set_cc_for_build + cat >$dummy.c <<\EOF +#include +int +main () +{ + unsigned pvr; + + asm ("mfpvr %0" : "=r" (pvr)); + + switch (pvr >> 16) { + case 0x0001: puts ("powerpc601"); break; + case 0x0003: puts ("powerpc603"); break; + case 0x0004: puts ("powerpc604"); break; + case 0x0006: puts ("powerpc603e"); break; + case 0x0007: puts ("powerpc603e"); break; /* 603ev */ + case 0x0008: puts ("powerpc750"); break; + case 0x0009: puts ("powerpc604e"); break; + case 0x000a: puts ("powerpc604e"); break; /* 604ev5 */ + case 0x000c: puts ("powerpc7400"); break; + case 0x0041: puts ("powerpc630"); break; + case 0x003f: puts ("power7"); break; + case 0x004b: + case 0x004c: + case 0x004d: puts ("power8"); break; + case 0x004e: puts ("power9"); break; + case 0x0080: puts ("power10"); break; + case 0x0050: puts ("powerpc860"); break; + case 0x8000: puts ("powerpc7450"); break; + case 0x8001: puts ("powerpc7455"); break; + case 0x8002: puts ("powerpc7457"); break; + case 0x8003: puts ("powerpc7447"); break; /* really 7447A */ + case 0x800c: puts ("powerpc7410"); break; + } + return 0; +} +EOF + if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then + # This style construct is needed on AIX 4.3 to suppress the SIGILL error + # from (*fun)(). Using $SHELL -c $dummy 2>/dev/null doesn't work. + { x=`$dummy`; } 2>/dev/null + if test -n "$x"; then + exact_cpu=$x + fi + fi + fi + + + # Grep the /proc/cpuinfo pseudo-file. + # Anything unrecognised is ignored, since of course we mustn't spit out + # a cpu type config.sub doesn't know. + if test -z "$exact_cpu" && test -f /proc/cpuinfo; then + x=`grep "^cpu[ ]" /proc/cpuinfo | head -n 1` + x=`echo $x | sed -n 's/^cpu[ ]*:[ ]*\([A-Za-z0-9]*\).*/\1/p'` + x=`echo $x | sed 's/PPC//'` + case $x in + 601) exact_cpu="power" ;; + 603ev) exact_cpu="powerpc603e" ;; + 604ev5) exact_cpu="powerpc604e" ;; + 970??) exact_cpu="powerpc970" ;; + 603 | 603e | 604 | 604e | 750 | 821 | 860) + exact_cpu="powerpc$x" ;; + POWER[4-9]*) + exact_cpu=`echo $x | sed -e "s;POWER;power;" -e "s;[a-zA-Z]*$;;"` ;; + esac + fi + + + if test -z "$exact_cpu"; then + # On AIX, try looking at _system_configuration. This is present in + # version 4 at least. + cat >$dummy.c < +#include +int +main () +{ + switch (_system_configuration.implementation) { + /* Old versions of AIX don't have all these constants, + use ifdef for safety. */ +#ifdef POWER_RS2 + case POWER_RS2: puts ("power2"); break; +#endif +#ifdef POWER_601 + case POWER_601: puts ("power"); break; +#endif +#ifdef POWER_603 + case POWER_603: puts ("powerpc603"); break; +#endif +#ifdef POWER_604 + case POWER_604: puts ("powerpc604"); break; +#endif +#ifdef POWER_620 + case POWER_620: puts ("powerpc620"); break; +#endif +#ifdef POWER_630 + case POWER_630: puts ("powerpc630"); break; +#endif + /* Dunno what this is, leave it out for now. + case POWER_A35: puts ("powerpca35"); break; + */ + /* This is waiting for a bit more info. + case POWER_RS64II: puts ("powerpcrs64ii"); break; + */ +#ifdef POWER_4 + case POWER_4: puts ("power4"); break; +#endif +#ifdef POWER_5 + case POWER_5: puts ("power5"); break; +#endif +#ifdef POWER_6 + case POWER_6: puts ("power6"); break; +#endif +#ifdef POWER_7 + case POWER_7: puts ("power7"); break; +#endif +#ifdef POWER_8 + case POWER_8: puts ("power8"); break; +#endif +#ifdef POWER_9 + case POWER_9: puts ("power9"); break; +#endif + default: + if (_system_configuration.architecture == POWER_RS) + puts ("power"); + else if (_system_configuration.width == 64) + puts ("powerpc64"); + } + return 0; +} +EOF + if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then + x=`$dummy` + if test -n "$x"; then + exact_cpu=$x + fi + fi + fi + + if test -z "$exact_cpu"; then + # On MacOS X (or any Mach-O presumably), NXGetLocalArchInfo cpusubtype + # can tell us the exact cpu. + cat >$dummy.c < +#include +int +main (void) +{ + const NXArchInfo *a = NXGetLocalArchInfo(); + if (a->cputype == CPU_TYPE_POWERPC) + { + switch (a->cpusubtype) { + /* The following known to Darwin 1.3. */ + case CPU_SUBTYPE_POWERPC_601: puts ("powerpc601"); break; + case CPU_SUBTYPE_POWERPC_602: puts ("powerpc602"); break; + case CPU_SUBTYPE_POWERPC_603: puts ("powerpc603"); break; + case CPU_SUBTYPE_POWERPC_603e: puts ("powerpc603e"); break; + case CPU_SUBTYPE_POWERPC_603ev: puts ("powerpc603e"); break; + case CPU_SUBTYPE_POWERPC_604: puts ("powerpc604"); break; + case CPU_SUBTYPE_POWERPC_604e: puts ("powerpc604e"); break; + case CPU_SUBTYPE_POWERPC_620: puts ("powerpc620"); break; + case CPU_SUBTYPE_POWERPC_750: puts ("powerpc750"); break; + case CPU_SUBTYPE_POWERPC_7400: puts ("powerpc7400"); break; + case CPU_SUBTYPE_POWERPC_7450: puts ("powerpc7450"); break; + /* Darwin 6.8.5 doesn't define the following */ + case 0x8001: puts ("powerpc7455"); break; + case 0x8002: puts ("powerpc7457"); break; + case 0x8003: puts ("powerpc7447"); break; + case 100: puts ("powerpc970"); break; + } + } + return 0; +} +EOF + if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then + x=`$dummy` + if test -n "$x"; then + exact_cpu=$x + fi + fi + fi + ;; + +sparc-*-* | sparc64-*-*) + # If we can recognise an actual v7 then $exact_cpu is set to "sparc" so as + # to short-circuit subsequent tests. + + # Grep the linux kernel /proc/cpuinfo pseudo-file. + # A typical line is "cpu\t\t: TI UltraSparc II (BlackBird)" + # See arch/sparc/kernel/cpu.c and arch/sparc64/kernel/cpu.c. + # + if test -f /proc/cpuinfo; then + if grep 'cpu.*Cypress' /proc/cpuinfo >/dev/null; then + exact_cpu="sparc" # ie. v7 + elif grep 'cpu.*Power-UP' /proc/cpuinfo >/dev/null; then + exact_cpu="sparc" # ie. v7 + elif grep 'cpu.*HyperSparc' /proc/cpuinfo >/dev/null; then + exact_cpu="sparcv8" + elif grep 'cpu.*SuperSparc' /proc/cpuinfo >/dev/null; then + exact_cpu="supersparc" + elif grep 'cpu.*MicroSparc' /proc/cpuinfo >/dev/null; then + exact_cpu="microsparc" + elif grep 'cpu.*MB86904' /proc/cpuinfo >/dev/null; then + # actually MicroSPARC-II + exact_cpu=microsparc + elif grep 'cpu.*UltraSparc T5' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparct5" + elif grep 'cpu.*UltraSparc T4' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparct4" + elif grep 'cpu.*UltraSparc T3' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparct3" + elif grep 'cpu.*UltraSparc T2' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparct2" + elif grep 'cpu.*UltraSparc T1' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparct1" + elif grep 'cpu.*UltraSparc III' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparc3" + elif grep 'cpu.*UltraSparc IIi' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparc2i" + elif grep 'cpu.*UltraSparc II' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparc2" + elif grep 'cpu.*UltraSparc' /proc/cpuinfo >/dev/null; then + exact_cpu="ultrasparc" + fi + fi + + # Need to invoke this for setup of $dummy + eval $set_cc_for_build + + # Grep the output from sysinfo on SunOS. + # sysinfo has been seen living in /bin or in /usr/kvm + # cpu0 is a "SuperSPARC Model 41 SPARCmodule" CPU + # cpu0 is a "75 MHz TI,TMS390Z55" CPU + # + if test -z "$exact_cpu"; then + for i in sysinfo /usr/kvm/sysinfo; do + if $SHELL -c $i 2>/dev/null >$dummy; then + if grep 'cpu0 is a "SuperSPARC' $dummy >/dev/null; then + exact_cpu=supersparc + break + elif grep 'cpu0 is a .*TMS390Z5.' $dummy >/dev/null; then + # TMS390Z50 and TMS390Z55 + exact_cpu=supersparc + break + fi + fi + done + fi + + # Grep the output from prtconf on Solaris. + # Use an explicit /usr/sbin, since that directory might not be in a normal + # user's path. + # + # SUNW,UltraSPARC (driver not attached) + # SUNW,UltraSPARC-II (driver not attached) + # SUNW,UltraSPARC-IIi (driver not attached) + # SUNW,UltraSPARC-III+ (driver not attached) + # Ross,RT625 (driver not attached) + # TI,TMS390Z50 (driver not attached) + # + # /usr/sbin/sysdef prints similar information, but includes all loadable + # cpu modules, not just the real cpu. + # + # We first try a plain prtconf, since that is known to work on older systems. + # But for newer T1 systems, that doesn't produce any useful output, we need + # "prtconf -vp" there. + # + for prtconfopt in "" "-vp"; do + if test -z "$exact_cpu"; then + if $SHELL -c "/usr/sbin/prtconf $prtconfopt" 2>/dev/null >$dummy; then + if egrep '(SUNW|ORCL),(Ultra)?SPARC-T5' $dummy >/dev/null; then + exact_cpu=ultrasparct5 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T4' $dummy >/dev/null; then + exact_cpu=ultrasparct4 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T3' $dummy >/dev/null; then + exact_cpu=ultrasparct3 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T2' $dummy >/dev/null; then + exact_cpu=ultrasparct2 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T1' $dummy >/dev/null; then + exact_cpu=ultrasparct1 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-III' $dummy >/dev/null; then + exact_cpu=ultrasparc3 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-IIi' $dummy >/dev/null; then + exact_cpu=ultrasparc2i + elif egrep '(SUNW|ORCL),(Ultra)?SPARC-II' $dummy >/dev/null; then + exact_cpu=ultrasparc2 + elif egrep '(SUNW|ORCL),(Ultra)?SPARC' $dummy >/dev/null; then + exact_cpu=ultrasparc + elif grep 'Ross,RT62.' $dummy >/dev/null; then + # RT620, RT625, RT626 hypersparcs (v8). + exact_cpu=sparcv8 + elif grep 'TI,TMS390Z5.' $dummy >/dev/null; then + # TMS390Z50 and TMS390Z55 + exact_cpu=supersparc + elif grep 'TI,TMS390S10' $dummy >/dev/null; then + exact_cpu=microsparc + elif grep 'FMI,MB86904' $dummy >/dev/null; then + # actually MicroSPARC-II + exact_cpu=microsparc + fi + fi + fi + done + + # Grep the output from sysctl hw.model on sparc or sparc64 *BSD. + # Use an explicit /sbin, since that directory might not be in a normal + # user's path. Example outputs, + # + # hw.model: Sun Microsystems UltraSparc-IIi + # + if test -z "$exact_cpu"; then + if $SHELL -c "/sbin/sysctl hw.model" 2>/dev/null >$dummy; then + if grep -i 'UltraSparc-T5' $dummy >/dev/null; then + exact_cpu=ultrasparct5 + elif grep -i 'UltraSparc-T4' $dummy >/dev/null; then + exact_cpu=ultrasparct4 + elif grep -i 'UltraSparc-T3' $dummy >/dev/null; then + exact_cpu=ultrasparct3 + elif grep -i 'UltraSparc-T2' $dummy >/dev/null; then + exact_cpu=ultrasparct2 + elif grep -i 'UltraSparc-T1' $dummy >/dev/null; then + exact_cpu=ultrasparct1 + elif grep -i 'UltraSparc-III' $dummy >/dev/null; then + exact_cpu=ultrasparc3 + elif grep -i 'UltraSparc-IIi' $dummy >/dev/null; then + exact_cpu=ultrasparc2i + elif grep -i 'UltraSparc-II' $dummy >/dev/null; then + exact_cpu=ultrasparc2 + elif grep -i 'UltraSparc' $dummy >/dev/null; then + exact_cpu=ultrasparc + elif grep 'TMS390Z5.' $dummy >/dev/null; then + # TMS390Z50 and TMS390Z55 + exact_cpu=supersparc + elif grep 'TMS390S10' $dummy >/dev/null; then + exact_cpu=microsparc + elif grep 'MB86904' $dummy >/dev/null; then + # actually MicroSPARC-II + exact_cpu=microsparc + elif grep 'MB86907' $dummy >/dev/null; then + exact_cpu=turbosparc + fi + fi + fi + + # sun4m and sun4d are v8s of some sort, sun4u is a v9 of some sort + # + if test -z "$exact_cpu"; then + case `uname -m` in + sun4[md]) exact_cpu=sparcv8 ;; + sun4u) exact_cpu=sparcv9 ;; + esac + fi + ;; + + +# Recognise x86 processors using a tricky cpuid with 4 arguments, repeating +# arguments; for x86-64 we effectively pass the 1st in rdx and the 2nd in rcx. +# This allows the same asm to work for both standard and Windoze calling +# conventions. + +i?86-*-* | amd64-*-* | x86_64-*-*) + eval $set_cc_for_build + + cat <$dummy.c +#include +#include +#define CPUID(a,b) cpuid(b,a,a,b) +#if __cplusplus +extern "C" +#endif +unsigned int cpuid (int, char *, char *, int); + +int +gmp_workaround_skylake_cpuid_bug () +{ + char feature_string[49]; + char processor_name_string[49]; + static const char *bad_cpus[] = {" G44", " G45", " G39" /* , "6600" */ }; + int i; + + /* Example strings: */ + /* "Intel(R) Pentium(R) CPU G4400 @ 3.30GHz" */ + /* "Intel(R) Core(TM) i5-6600K CPU @ 3.50GHz" */ + /* ^ ^ ^ */ + /* 0x80000002 0x80000003 0x80000004 */ + /* We match out just the 0x80000003 part here. */ + + /* In their infinitive wisdom, Intel decided to use one register order for + the vendor string, and another for the processor name string. We shuffle + things about here, rather than write a new variant of our assembly cpuid. + */ + + unsigned int eax, ebx, ecx, edx; + eax = CPUID (feature_string, 0x80000003); + ebx = ((unsigned int *)feature_string)[0]; + edx = ((unsigned int *)feature_string)[1]; + ecx = ((unsigned int *)feature_string)[2]; + + ((unsigned int *) (processor_name_string))[0] = eax; + ((unsigned int *) (processor_name_string))[1] = ebx; + ((unsigned int *) (processor_name_string))[2] = ecx; + ((unsigned int *) (processor_name_string))[3] = edx; + + processor_name_string[16] = 0; + + for (i = 0; i < sizeof (bad_cpus) / sizeof (char *); i++) + { + if (strstr (processor_name_string, bad_cpus[i]) != 0) + return 1; + } + return 0; +} + +int +main () +{ + char vendor_string[13]; + char feature_string[12]; + long fms; + int family, model; + const char *modelstr, *suffix; + int cpu_64bit = 0, cpu_avx = 0; + int cpuid_64bit, cpuid_avx, cpuid_osxsave; + + CPUID (vendor_string, 0); + vendor_string[12] = 0; + + fms = CPUID (feature_string, 1); + + family = ((fms >> 8) & 0xf) + ((fms >> 20) & 0xff); + model = ((fms >> 4) & 0xf) + ((fms >> 12) & 0xf0); + + cpuid_avx = (feature_string[11] >> 4) & 1; + cpuid_osxsave = (feature_string[11] >> 3) & 1; + + modelstr = "$guess_cpu"; + + /**************************************************/ + /*** WARNING: keep this list in sync with fat.c ***/ + /**************************************************/ + if (strcmp (vendor_string, "GenuineIntel") == 0) + { + switch (family) + { + case 5: + if (model == 4 || model == 8) modelstr = "pentiummmx"; + else modelstr = "pentium"; + break; + case 6: + if (model <= 1) modelstr = "pentiumpro"; + else if (model <= 6) modelstr = "pentium2"; + else if (model <= 8) modelstr = "pentium3"; + else if (model <= 9) modelstr = "pentiumm"; + else if (model <= 0x0c) modelstr = "pentium3"; + else if (model <= 0x0e) modelstr = "pentiumm"; + else if (model <= 0x19) cpu_64bit = 1, modelstr = "core2"; + else if (model == 0x1a) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Gainestown */ + else if (model == 0x1c) cpu_64bit = 1, modelstr = "atom"; /* Silverthorne */ + else if (model == 0x1d) cpu_64bit = 1, modelstr = "core2"; /* PNR Dunnington */ + else if (model == 0x1e) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Lynnfield/Jasper */ + else if (model == 0x25) cpu_64bit = 1, modelstr = "westmere"; /* WSM Clarkdale/Arrandale */ + else if (model == 0x26) cpu_64bit = 1, modelstr = "atom"; /* Lincroft */ + else if (model == 0x27) cpu_64bit = 1, modelstr = "atom"; /* Saltwell */ + else if (model == 0x2a) cpu_64bit = 1, cpu_avx=1, modelstr = "sandybridge";/* SB */ + else if (model == 0x2c) cpu_64bit = 1, modelstr = "westmere"; /* WSM Gulftown */ + else if (model == 0x2d) cpu_64bit = 1, cpu_avx=1, modelstr = "sandybridge";/* SBC-EP */ + else if (model == 0x2e) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Beckton */ + else if (model == 0x2f) cpu_64bit = 1, modelstr = "westmere"; /* WSM Eagleton */ + else if (model == 0x36) cpu_64bit = 1, modelstr = "atom"; /* Cedarview/Saltwell */ + else if (model == 0x37) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ + else if (model == 0x3a) cpu_64bit = 1, cpu_avx=1, modelstr = "ivybridge"; /* IBR */ + else if (model == 0x3c) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell client */ + else if (model == 0x3d) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell */ + else if (model == 0x3e) cpu_64bit = 1, cpu_avx=1, modelstr = "ivybridge"; /* Ivytown */ + else if (model == 0x3f) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell server */ + else if (model == 0x45) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell ULT */ + else if (model == 0x46) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Crystal Well */ + else if (model == 0x47) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell */ + else if (model == 0x4a) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ + else if (model == 0x4c) cpu_64bit = 1, modelstr = "silvermont"; /* Airmont */ + else if (model == 0x4d) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont/Avoton */ + else if (model == 0x4e) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake client */ + else if (model == 0x4f) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell server */ + else if (model == 0x55) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake server */ + else if (model == 0x56) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell microserver */ + else if (model == 0x57) cpu_64bit = 1, modelstr = "knightslanding"; /* aka Xeon Phi */ + else if (model == 0x5a) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ + else if (model == 0x5c) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont */ + else if (model == 0x5e) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake */ + else if (model == 0x5f) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont */ + else if (model == 0x6a) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake-DE */ + else if (model == 0x6c) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake-SP */ + else if (model == 0x7a) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont Plus */ + else if (model == 0x7d) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake Y */ + else if (model == 0x7e) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake U */ + else if (model == 0x8a) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ + else if (model == 0x8c) cpu_64bit = 1, cpu_avx=1, modelstr = "tigerlake"; /* Tiger Lake U */ + else if (model == 0x8d) cpu_64bit = 1, cpu_avx=1, modelstr = "tigerlake"; /* Tiger Lake H */ + else if (model == 0x8e) cpu_64bit = 1, cpu_avx=1, modelstr = "kabylake"; /* Kaby Lake Y/U */ + else if (model == 0x8f) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Sapphire Rapids */ + else if (model == 0x96) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ + else if (model == 0x97) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Alder Lake S */ + else if (model == 0x9a) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Alder Lake P */ + else if (model == 0x9c) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ + else if (model == 0x9e) cpu_64bit = 1, cpu_avx=1, modelstr = "kabylake"; /* Kaby Lake desktop */ + else if (model == 0xa7) cpu_64bit = 1, cpu_avx=1, modelstr = "rocketlake"; /* Rocket Lake S */ + else if (model == 0xba) cpu_64bit = 1, cpu_avx=1, modelstr = "raptorlake"; /* Raptor Lake */ + else if (model == 0xb7) cpu_64bit = 1, cpu_avx=1, modelstr = "raptorlake"; /* Raptor Lake */ + else cpu_64bit = 1, modelstr = "nehalem"; /* default */ + + if (strcmp (modelstr, "haswell") == 0 || + strcmp (modelstr, "broadwell") == 0 || + strcmp (modelstr, "skylake") == 0) + { + /* Some haswell, broadwell, skylake lack BMI2. Let them appear + as sandybridge for now. */ + CPUID (feature_string, 7); + if ((feature_string[0 + 8 / 8] & (1 << (8 % 8))) == 0 + || gmp_workaround_skylake_cpuid_bug ()) + modelstr = "sandybridge"; + } + + break; + case 15: + cpu_64bit = 1, modelstr = "pentium4"; + break; + } + } + else if (strcmp (vendor_string, "AuthenticAMD") == 0) + { + switch (family) + { + case 5: + if (model <= 3) modelstr = "k5"; + else if (model <= 7) modelstr = "k6"; + else if (model == 8) modelstr = "k62"; + else if (model == 9) modelstr = "k63"; + else if (model == 10) modelstr = "geode"; + else if (model == 13) modelstr = "k63"; + break; + case 6: + modelstr = "athlon"; + break; + case 15: /* K8, K9 */ + cpu_64bit = 1, modelstr = "k8"; + break; + case 16: /* K10 */ + cpu_64bit = 1, modelstr = "k10"; + break; + case 17: /* Hybrid k8/k10, claim k8 */ + cpu_64bit = 1, modelstr = "k8"; + break; + case 18: /* Llano, uses K10 core */ + cpu_64bit = 1, modelstr = "k10"; + break; + case 19: /* AMD Internal, assume future K10 */ + cpu_64bit = 1, modelstr = "k10"; + break; + case 20: /* Bobcat */ + cpu_64bit = 1, modelstr = "bobcat"; + break; + case 21: /* Bulldozer */ + cpu_64bit = 1, cpu_avx = 1; + if (model <= 1) + modelstr = "bulldozer"; + else if (model < 0x20) /* really 2, [0x10-0x20) */ + modelstr = "piledriver"; + else if (model < 0x40) /* really [0x30-0x40) */ + modelstr = "steamroller"; + else /* really [0x60-0x70) */ + modelstr = "excavator"; + break; + case 22: /* Jaguar, an improved bobcat */ + cpu_64bit = 1, cpu_avx = 1, modelstr = "jaguar"; + break; + case 23: /* Zen 1, 2 */ + cpu_64bit = 1, cpu_avx = 1; + switch (model) { + case 1: + case 8: + case 17: + case 24: + modelstr = "zen"; + break; + default: + modelstr = "zen2"; + break; + } + break; + case 25: /* Zen 3, 4 */ + cpu_64bit = 1, cpu_avx = 1; + switch (model) { + case 0x00: + case 0x01: + case 0x08: + case 0x21: + case 0x40: + case 0x44: + case 0x50: + modelstr = "zen3"; + break; + default: + modelstr = "zen4"; + break; + } + } + } + else if (strcmp (vendor_string, "HygonGenuine") == 0) + { + cpu_64bit = 1, cpu_avx = 1; + modelstr = "zen"; + } + else if (strcmp (vendor_string, "CyrixInstead") == 0) + { + /* Should recognize Cyrix' processors too. */ + } + else if (strcmp (vendor_string, "CentaurHauls") == 0) + { + switch (family) + { + case 6: + if (model < 9) modelstr = "viac3"; + else if (model < 15) modelstr = "viac32"; + else cpu_64bit = 1, modelstr = "nano"; + break; + } + } + + CPUID (feature_string, 0x80000001); + cpuid_64bit = (feature_string[7] >> 5) & 1; + + suffix = ""; + + if (cpuid_64bit && ! cpu_64bit) + /* If our cpuid-based CPU identification thinks this is a 32-bit CPU but + cpuid claims AMD64 capabilities, then revert to the generic "x86_64". + This is of course wrong, but it can happen in some virtualisers and + emulators, and this workaround allows for successful 64-bit builds. */ + modelstr = "x86_64"; + else if (cpu_avx && ! (cpuid_avx && cpuid_osxsave)) + /* For CPUs nominally capable of executing AVX, append "noavx" when not + both the AVX and OSXSAVE cpuid bits are set. We tolerate weirdness + here, as some virtualisers set a broken cpuid state, while other + virtualisers allow guests to set a broken state. */ + suffix = "noavx"; + + printf ("%s%s", modelstr, suffix); + return 0; +} +EOF + +# The rcx/ecx zeroing here and in the variant below is needed for the BMI2 +# check. + + cat <${dummy}0.s + .globl cpuid + .globl _cpuid +cpuid: +_cpuid: + push %rbx + mov %rdx, %r8 + mov %ecx, %eax + xor %ecx, %ecx + .byte 0x0f + .byte 0xa2 + mov %ebx, (%r8) + mov %edx, 4(%r8) + mov %ecx, 8(%r8) + pop %rbx + ret +EOF + + if ($CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy) >/dev/null 2>&1; then + # On 80386 and early 80486 cpuid is not available and will result in a + # SIGILL message, hence 2>/dev/null. + # + # On i386-unknown-freebsd4.9, "/bin/sh -c ./dummy" seems to send an + # "Illegal instruction (core dumped)" message to stdout, so we test $? + # to check if the program run was successful. + # + x=`$SHELL -c $dummy 2>/dev/null` + if test $? = 0 && test -n "$x"; then + exact_cpu=$x + fi + fi + + cat <${dummy}0.s + .globl cpuid + .globl _cpuid +cpuid: +_cpuid: + pushl %esi + pushl %ebx + movl 24(%esp),%eax + xor %ecx, %ecx + .byte 0x0f + .byte 0xa2 + movl 20(%esp),%esi + movl %ebx,(%esi) + movl %edx,4(%esi) + movl %ecx,8(%esi) + popl %ebx + popl %esi + ret +EOF + + if test -z "$exact_cpu"; then + if ($CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy) >/dev/null 2>&1; then + # On 80386 and early 80486 cpuid is not available and will result in a + # SIGILL message, hence 2>/dev/null. + # + # On i386-unknown-freebsd4.9, "/bin/sh -c ./dummy" seems to send an + # "Illegal instruction (core dumped)" message to stdout, so we test $? + # to check if the program run was successful. + # + x=`$SHELL -c $dummy 2>/dev/null` + if test $? = 0 && test -n "$x"; then + exact_cpu=$x + fi + fi + fi + + # We need to remove some .o files here since lame C compilers + # generate these even when not asked. + ;; + +s390*-*-*) + if test -f /proc/cpuinfo; then + model=`grep "^processor 0: version =" /proc/cpuinfo | sed -e 's/.*machine = //'` + case $model in + 2064 | 2066) zcpu="z900" ;; + 2084 | 2086) zcpu="z990" ;; + 2094 | 2096) zcpu="z9" ;; + 2097 | 2098) zcpu="z10" ;; + 2817 | 2818 | *) zcpu="z196" ;; + esac + if grep "^features.* vxp2" /proc/cpuinfo >/dev/null; then + zcpu="z16" + elif grep "^features.* vxe2" /proc/cpuinfo >/dev/null; then + zcpu="z15" + elif grep "^features.* vxe" /proc/cpuinfo >/dev/null; then + zcpu="z14" + elif grep "^features.* vx" /proc/cpuinfo >/dev/null; then + zcpu="z13" + fi + case "$guess_full" in + s390x-*-*) exact_cpu=${zcpu} ;; + s390-*-*) exact_cpu=${zcpu}esa ;; + esac + fi + ;; + +esac + + + +# ------------------------------------------------------------------------- +# Use an exact cpu, if possible + +if test -n "$exact_cpu"; then + echo "$exact_cpu$guess_rest" +else + echo "$guess_full" +fi +exit 0 + + + +# Local variables: +# fill-column: 76 +# End: diff --git a/config/config.sub b/config/config.sub new file mode 100755 index 0000000000..34a782980a --- /dev/null +++ b/config/config.sub @@ -0,0 +1,165 @@ +#! /bin/sh +# +# GMP config.sub wrapper. + + +# Copyright 2000-2003, 2006, 2009-2016 Free Software Foundation, Inc. +# +# This file is part of the GNU MP Library. +# +# The GNU MP Library is free software; you can redistribute it and/or modify +# it under the terms of either: +# +# * the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# or +# +# * the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. +# +# or both in parallel, as here. +# +# The GNU MP Library 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 copies of the GNU General Public License and the +# GNU Lesser General Public License along with the GNU MP Library. If not, +# see https://www.gnu.org/licenses/. + + +# Usage: config.sub CPU-VENDOR-OS +# config.sub ALIAS +# +# Validate and canonicalize the given configuration name, with special +# handling for GMP extra CPU names. +# +# When the CPU isn't special the whole name is simply passed straight +# through to configfsf.sub. +# +# When the CPU is a GMP extra, configfsf.sub is run on a similar CPU that it +# will recognise. For example "athlon-pc-freebsd3.5" is validated using +# "i386-pc-freebsd3.5". +# +# Any canonicalizations made by configfsf.sub are preserved. For example +# given "athlon-linux", configfsf.sub is called with "i386-linux" and will +# give back "i386-pc-linux-gnu". "athlon" is then reinstated, so we print +# "athlon-pc-linux-gnu". + + +# Expect to find configfsf.sub in the same directory as this config.sub +configfsf_sub="`echo \"$0\" | sed 's/config.sub$/configfsf.sub/'`" +if test "$configfsf_sub" = "$0"; then + echo "Cannot derive configfsf.sub from $0" 1>&2 + exit 1 +fi +if test -f "$configfsf_sub"; then + : +else + echo "$configfsf_sub not found" 1>&2 + exit 1 +fi + +# Always run configfsf.sub with $SHELL, like autoconf does for config.sub +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identify ourselves on --version, --help, etc +case "$1" in +"" | -*) + echo "(GNU MP wrapped config.sub)" 1>&2 + $SHELL $configfsf_sub "$@" + exit + ;; +esac + +given_full="$1" +given_cpu=`echo "$given_full" | sed 's/-.*$//'` +given_rest=`echo "$given_full" | sed 's/^[^-]*//'` + + +# Aliases for GMP extras +case "$given_cpu" in + # configfsf.sub turns p5 into i586, instead use our exact cpu type + p5 | p54) given_cpu=pentium ;; + p55) given_cpu=pentiummmx ;; + + # configfsf.sub turns p6, pentiumii and pentiumiii into i686, instead use + # our exact cpu types + p6) given_cpu=pentiumpro ;; + pentiumii) given_cpu=pentium2 ;; + pentiumiii) given_cpu=pentium3 ;; +esac +given_full="$given_cpu$given_rest" + + +# GMP extras and what to use for the config.sub test +case "$given_cpu" in +itanium | itanium2) + test_cpu=ia64 ;; +pentium | pentiummmx | pentiumpro | pentium[234m] | k[567] | k6[23] | geode | athlon | viac3*) + test_cpu=i386 ;; +athlon64 | atom | silvermont | goldmont | tremont | core2 | corei* | opteron | k[89] | k10 | bobcat | jaguar* | bulldozer* | piledriver* | steamroller* | excavator* | zen* | nano | nehalem | westmere | sandybridge* | ivybridge* | haswell* | broadwell* | skylake* | kabylake* | icelake* | rocketlake* | tigerlake* | alderlake* | raptorlake* | knightslanding | x86_64v[1234]) + test_cpu=x86_64 ;; +power[2-9] | power1[0-9] | power2sc) + test_cpu=power ;; +powerpc401 | powerpc403 | powerpc405 | \ +powerpc505 | \ +powerpc601 | powerpc602 | \ +powerpc603 | powerpc603e | \ +powerpc604 | powerpc604e | \ +powerpc620 | powerpc630 | powerpc970 | \ +powerpc740 | powerpc74[0-9][0-9] | powerpc750 | \ +powerpc801 | powerpc821 | powerpc823 | powerpc860 | \ +powerpc64) + test_cpu=powerpc ;; +sparcv8 | supersparc | microsparc | \ +ultrasparc | ultrasparc2 | ultrasparc2i | ultrasparc3 | ultrasparct[12345]) + test_cpu=sparc ;; +sh2) + test_cpu=sh ;; + +z900 | z990 | z9 | z1[0-6] | z196) + test_cpu=s390x;; +z900esa | z990esa | z9esa | z1[0-6]esa | z196esa) + test_cpu=s390;; + +armsa1 | armxscale | arm9tdmi | arm9te | \ +arm10* | arm11mpcore | armsa1 | arm1136 | arm1156 | arm1176 | \ +armcortex[arm][0-9] | armcortex[arm][0-9][0-9] | \ +arm*neon | armxgene1 | armexynosm1 | armthunderx | applem[1-9]) + test_cpu="arm";; + +*) + # Don't need or want to change the given name, just run configfsf.sub + $SHELL $configfsf_sub "$given_full" + if test $? = 0; then + exit 0 + else + echo "(GNU MP wrapped config.sub, testing \"$given_full\")" + exit 1 + fi +esac + + +test_full="$test_cpu$given_rest" +canonical_full=`$SHELL $configfsf_sub "$test_full"` +if test $? = 0; then + : +else + echo "(GNU MP wrapped config.sub, testing \"$given_full\" as \"$test_full\")" + exit 1 +fi + +canonical_rest=`echo "$canonical_full" | sed 's/^[^-]*//'` +echo "$given_cpu$canonical_rest" +exit 0 + + + +# Local variables: +# fill-column: 76 +# End: diff --git a/config/configfsf.guess b/config/configfsf.guess new file mode 100755 index 0000000000..354a8ccde4 --- /dev/null +++ b/config/configfsf.guess @@ -0,0 +1,1774 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2023 Free Software Foundation, Inc. + +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-06-23' + +# This file 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 . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# +# Please send patches to . + + +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system '$me' is run on. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2023 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try '$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +# Just in case it came from the environment. +GUESS= + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if test -f /.attbin/uname ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case $UNAME_SYSTEM in +Linux|GNU|GNU/*) + LIBC=unknown + + set_cc_for_build + cat <<-EOF > "$dummy.c" + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif + #endif + EOF + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)` + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently (or will in the future) and ABI. + case $UNAME_MACHINE_ARCH in + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # Determine ABI tags. + case $UNAME_MACHINE_ARCH in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case $UNAME_VERSION in + Debian*) + release='-gnu' + ;; + *) + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + GUESS=$machine-${os}${release}${abi-} + ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; + *:MidnightBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; + *:ekkoBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; + *:SolidBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; + macppc:MirBSD:*:*) + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; + *:MirBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; + *:Sortix:*:*) + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; + *:Redox:*:*) + GUESS=$UNAME_MACHINE-unknown-redox + ;; + mips:OSF1:*.*) + GUESS=mips-dec-osf1 + ;; + alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case $ALPHA_CPU_TYPE in + "EV4 (21064)") + UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") + UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") + UNAME_MACHINE=alpha ;; + "EV5 (21164)") + UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") + UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") + UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") + UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") + UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") + UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") + UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") + UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") + UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; + Amiga*:UNIX_System_V:4.0:*) + GUESS=m68k-unknown-sysv4 + ;; + *:[Aa]miga[Oo][Ss]:*:*) + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; + *:[Mm]orph[Oo][Ss]:*:*) + GUESS=$UNAME_MACHINE-unknown-morphos + ;; + *:OS/390:*:*) + GUESS=i370-ibm-openedition + ;; + *:z/VM:*:*) + GUESS=s390-ibm-zvmoe + ;; + *:OS400:*:*) + GUESS=powerpc-ibm-os400 + ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + GUESS=arm-unknown-riscos + ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + GUESS=hppa1.1-hitachi-hiuxmpp + ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; + NILE*:*:*:dcosx) + GUESS=pyramid-pyramid-svr4 + ;; + DRS?6000:unix:4.0:6*) + GUESS=sparc-icl-nx6 + ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; + s390x:SunOS:*:*) + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; + sun4H:SunOS:5.*:*) + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + set_cc_for_build + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; + sun4*:SunOS:*:*) + case `/usr/bin/arch -k` in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like '4.1.3-JL'. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; + sun3*:SunOS:*:*) + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case `/bin/arch` in + sun3) + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; + sun4) + GUESS=sparc-sun-sunos$UNAME_RELEASE + ;; + esac + ;; + aushp:SunOS:*:*) + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; + m68k:machten:*:*) + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; + powerpc:machten:*:*) + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; + RISC*:Mach:*:*) + GUESS=mips-dec-mach_bsd4.3 + ;; + RISC*:ULTRIX:*:*) + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; + VAX*:ULTRIX*:*:*) + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && + { echo "$SYSTEM_NAME"; exit; } + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; + Motorola:PowerMAX_OS:*:*) + GUESS=powerpc-motorola-powermax + ;; + Motorola:*:4.3:PL8-*) + GUESS=powerpc-harris-powermax + ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + GUESS=powerpc-harris-powermax + ;; + Night_Hawk:Power_UNIX:*:*) + GUESS=powerpc-harris-powerunix + ;; + m88k:CX/UX:7*:*) + GUESS=m88k-harris-cxux7 + ;; + m88k:*:4*:R4*) + GUESS=m88k-motorola-sysv4 + ;; + m88k:*:3*:R3*) + GUESS=m88k-motorola-sysv3 + ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 + then + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x + then + GUESS=m88k-dg-dgux$UNAME_RELEASE + else + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE + fi + else + GUESS=i586-dg-dgux$UNAME_RELEASE + fi + ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + GUESS=m88k-dolphin-sysv3 + ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + GUESS=m88k-motorola-sysv3 + ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + GUESS=m88k-tektronix-sysv3 + ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + GUESS=m68k-tektronix-bsd + ;; + *:IRIX*:*:*) + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + GUESS=i386-ibm-aix + ;; + ia64:AIX:*:*) + if test -x /usr/bin/oslevel ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + fi + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + then + GUESS=$SYSTEM_NAME + else + GUESS=rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + GUESS=rs6000-ibm-aix3.2.4 + else + GUESS=rs6000-ibm-aix3.2 + fi + ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + fi + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; + *:AIX:*:*) + GUESS=rs6000-ibm-aix + ;; + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + GUESS=romp-ibm-bsd4.4 + ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + GUESS=rs6000-bull-bosx + ;; + DPX/2?00:B.O.S.:*:*) + GUESS=m68k-bull-sysv3 + ;; + 9000/[34]??:4.3bsd:1.*:*) + GUESS=m68k-hp-bsd + ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + GUESS=m68k-hp-bsd4.4 + ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if test -x /usr/bin/getconf; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case $sc_cpu_version in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case $sc_kernel_bits in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac + fi + if test "$HP_ARCH" = ""; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if test "$HP_ARCH" = hppa2.0w + then + set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH=hppa2.0w + else + HP_ARCH=hppa64 + fi + fi + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; + 3050*:HI-UX:*:*) + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + GUESS=unknown-hitachi-hiuxwe2 + ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + GUESS=hppa1.1-hp-bsd + ;; + 9000/8??:4.3bsd:*:*) + GUESS=hppa1.0-hp-bsd + ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + GUESS=hppa1.0-hp-mpeix + ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + GUESS=hppa1.1-hp-osf + ;; + hp8??:OSF1:*:*) + GUESS=hppa1.0-hp-osf + ;; + i*86:OSF1:*:*) + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk + else + GUESS=$UNAME_MACHINE-unknown-osf1 + fi + ;; + parisc*:Lites*:*:*) + GUESS=hppa1.1-hp-lites + ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + GUESS=c1-convex-bsd + ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + GUESS=c34-convex-bsd + ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + GUESS=c38-convex-bsd + ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + GUESS=c4-convex-bsd + ;; + CRAY*Y-MP:*:*:*) + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; + CRAY*[A-Z]90:*:*:*) + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; + CRAY*T3E:*:*:*) + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; + CRAY*SV1:*:*:*) + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; + *:UNICOS/mp:*:*) + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; + sparc*:BSD/OS:*:*) + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; + *:BSD/OS:*:*) + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case $UNAME_PROCESSOR in + amd64) + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; + esac + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; + i*:CYGWIN*:*) + GUESS=$UNAME_MACHINE-pc-cygwin + ;; + *:MINGW64*:*) + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; + *:MINGW*:*) + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; + *:MSYS*:*) + GUESS=$UNAME_MACHINE-pc-msys + ;; + i*:PW*:*) + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; + *:Interix*:*) + case $UNAME_MACHINE in + x86) + GUESS=i586-pc-interix$UNAME_RELEASE + ;; + authenticamd | genuineintel | EM64T) + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; + IA64) + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; + esac ;; + i*:UWIN*:*) + GUESS=$UNAME_MACHINE-pc-uwin + ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + GUESS=x86_64-pc-cygwin + ;; + prep*:SunOS:5.*:*) + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; + *:GNU:*:*) + # the GNU system + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; + aarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arm*:Linux:*:*) + set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + else + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + fi + fi + ;; + avr32*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + cris:Linux:*:*) + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; + crisv32:Linux:*:*) + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; + e2k:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + frv:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + hexagon:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + i*86:Linux:*:*) + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; + ia64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + k1om:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + m32r*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + m68*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + mips:Linux:*:* | mips64:Linux:*:*) + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" + #undef CPU + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + MIPS_ENDIAN=el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + MIPS_ENDIAN= + #else + MIPS_ENDIAN= + #endif + #endif +EOF + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + ;; + mips64el:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + openrisc*:Linux:*:*) + GUESS=or1k-unknown-linux-$LIBC + ;; + or32:Linux:*:* | or1k*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + padre:Linux:*:*) + GUESS=sparc-unknown-linux-$LIBC + ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + GUESS=hppa64-unknown-linux-$LIBC + ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; + esac + ;; + ppc64:Linux:*:*) + GUESS=powerpc64-unknown-linux-$LIBC + ;; + ppc:Linux:*:*) + GUESS=powerpc-unknown-linux-$LIBC + ;; + ppc64le:Linux:*:*) + GUESS=powerpc64le-unknown-linux-$LIBC + ;; + ppcle:Linux:*:*) + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + s390:Linux:*:* | s390x:Linux:*:*) + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; + sh64*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + sh*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + tile*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + vax:Linux:*:*) + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; + x86_64:Linux:*:*) + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; + xtensa*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + GUESS=i386-sequent-sysv4 + ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; + i*86:OS/2:*:*) + # If we were able to find 'uname', then EMX Unix compatibility + # is probably installed. + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; + i*86:XTS-300:*:STOP) + GUESS=$UNAME_MACHINE-unknown-stop + ;; + i*86:atheos:*:*) + GUESS=$UNAME_MACHINE-unknown-atheos + ;; + i*86:syllable:*:*) + GUESS=$UNAME_MACHINE-pc-syllable + ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; + i*86:*DOS:*:*) + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL + else + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL + fi + ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL + else + GUESS=$UNAME_MACHINE-pc-sysv32 + fi + ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + GUESS=i586-pc-msdosdjgpp + ;; + Intel:Mach:3*:*) + GUESS=i386-pc-mach3 + ;; + paragon:*:*:*) + GUESS=i860-intel-osf1 + ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + fi + ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + GUESS=m68010-convergent-sysv + ;; + mc68k:UNIX:SYSTEM5:3.51m) + GUESS=m68k-convergent-sysv + ;; + M680?0:D-NIX:5.3:*) + GUESS=m68k-diab-dnix + ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; + mc68030:UNIX_System_V:4.*:*) + GUESS=m68k-atari-sysv4 + ;; + TSUNAMI:LynxOS:2.*:*) + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; + rs6000:LynxOS:2.*:*) + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; + SM[BE]S:UNIX_SV:*:*) + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; + RM*:ReliantUNIX-*:*:*) + GUESS=mips-sni-sysv4 + ;; + RM*:SINIX-*:*:*) + GUESS=mips-sni-sysv4 + ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + GUESS=$UNAME_MACHINE-sni-sysv4 + else + GUESS=ns32k-sni-sysv + fi + ;; + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort + # says + GUESS=i586-unisys-sysv4 + ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + GUESS=hppa1.1-stratus-sysv4 + ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + GUESS=i860-stratus-sysv4 + ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + GUESS=$UNAME_MACHINE-stratus-vos + ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + GUESS=hppa1.1-stratus-vos + ;; + mc68*:A/UX:*:*) + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; + news*:NEWS-OS:6*:*) + GUESS=mips-sony-newsos6 + ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE + else + GUESS=mips-unknown-sysv$UNAME_RELEASE + fi + ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + GUESS=powerpc-be-beos + ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + GUESS=powerpc-apple-beos + ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + GUESS=i586-pc-beos + ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; + SX-4:SUPER-UX:*:*) + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; + SX-5:SUPER-UX:*:*) + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; + SX-6:SUPER-UX:*:*) + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; + SX-7:SUPER-UX:*:*) + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; + SX-8:SUPER-UX:*:*) + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; + SX-8R:SUPER-UX:*:*) + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; + SX-ACE:SUPER-UX:*:*) + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; + Power*:Rhapsody:*:*) + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; + *:Rhapsody:*:*) + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE + fi + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; + *:QNX:*:4*) + GUESS=i386-pc-qnx + ;; + NEO-*:NONSTOP_KERNEL:*:*) + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; + NSE-*:NONSTOP_KERNEL:*:*) + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; + NSR-*:NONSTOP_KERNEL:*:*) + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; + NSV-*:NONSTOP_KERNEL:*:*) + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; + NSX-*:NONSTOP_KERNEL:*:*) + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; + *:NonStop-UX:*:*) + GUESS=mips-compaq-nonstopux + ;; + BS2000:POSIX*:*:*) + GUESS=bs2000-siemens-sysv + ;; + DS/*:UNIX_System_V:*:*) + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "${cputype-}" = 386; then + UNAME_MACHINE=i386 + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype + fi + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; + *:TOPS-10:*:*) + GUESS=pdp10-unknown-tops10 + ;; + *:TENEX:*:*) + GUESS=pdp10-unknown-tenex + ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + GUESS=pdp10-dec-tops20 + ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + GUESS=pdp10-xkl-tops20 + ;; + *:TOPS-20:*:*) + GUESS=pdp10-unknown-tops20 + ;; + *:ITS:*:*) + GUESS=pdp10-unknown-its + ;; + SEI:*:*:SEIUX) + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; + *:DragonFly:*:*) + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; + esac ;; + *:XENIX:*:SysV) + GUESS=i386-pc-xenix + ;; + i*86:skyos:*:*) + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; + i*86:rdos:*:*) + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; + x86_64:VMkernel:*:*) + GUESS=$UNAME_MACHINE-unknown-esx + ;; + amd64:Isilon\ OneFS:*:*) + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; +esac + +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +echo "$0: unable to guess system type" >&2 + +case $UNAME_MACHINE:$UNAME_SYSTEM in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 <&2 </dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" +EOF +fi + +exit 1 + +# Local variables: +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config/configfsf.sub b/config/configfsf.sub new file mode 100644 index 0000000000..9865d6ea4d --- /dev/null +++ b/config/configfsf.sub @@ -0,0 +1,1914 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2023 Free Software Foundation, Inc. + +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2023-06-26' + +# This file 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 . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + +Canonicalize a configuration name. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2023 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try '$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo "$1" + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 + ;; + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 + ;; + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac + ;; + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac + ;; + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac + ;; +esac + +# Decode 1-component or ad-hoc basic machines +case $basic_machine in + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond + ;; + op50n) + cpu=hppa1.1 + vendor=oki + ;; + op60c) + cpu=hppa1.1 + vendor=oki + ;; + ibm*) + cpu=i370 + vendor=ibm + ;; + orion105) + cpu=clipper + vendor=highlevel + ;; + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple + ;; + pmac | pmac-mpw) + cpu=powerpc + vendor=apple + ;; + + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + cpu=m68000 + vendor=att + ;; + 3b*) + cpu=we32k + vendor=att + ;; + bluegene*) + cpu=powerpc + vendor=ibm + basic_os=cnk + ;; + decsystem10* | dec10*) + cpu=pdp10 + vendor=dec + basic_os=tops10 + ;; + decsystem20* | dec20*) + cpu=pdp10 + vendor=dec + basic_os=tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + cpu=m68k + vendor=motorola + ;; + dpx2*) + cpu=m68k + vendor=bull + basic_os=sysv3 + ;; + encore | umax | mmax) + cpu=ns32k + vendor=encore + ;; + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} + ;; + fx2800) + cpu=i860 + vendor=alliant + ;; + genix) + cpu=ns32k + vendor=ns + ;; + h3050r* | hiux*) + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + cpu=m68000 + vendor=hp + ;; + hp9k3[2-9][0-9]) + cpu=m68k + vendor=hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + cpu=hppa1.1 + vendor=hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + cpu=hppa1.1 + vendor=hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + cpu=hppa1.0 + vendor=hp + ;; + i*86v32) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 + ;; + i*86v4*) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 + ;; + i*86v) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv + ;; + i*86sol2) + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} + ;; + iris | iris4d) + cpu=mips + vendor=sgi + case $basic_os in + irix*) + ;; + *) + basic_os=irix4 + ;; + esac + ;; + miniframe) + cpu=m68000 + vendor=convergent + ;; + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint + ;; + news-3600 | risc-news) + cpu=mips + vendor=sony + basic_os=newsos + ;; + next | m*-next) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) + ;; + ns2*) + basic_os=nextstep2 + ;; + *) + basic_os=nextstep3 + ;; + esac + ;; + np1) + cpu=np1 + vendor=gould + ;; + op50n-* | op60c-*) + cpu=hppa1.1 + vendor=oki + basic_os=proelf + ;; + pa-hitachi) + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 + ;; + pbd) + cpu=sparc + vendor=tti + ;; + pbb) + cpu=m68k + vendor=tti + ;; + pc532) + cpu=ns32k + vendor=pc532 + ;; + pn) + cpu=pn + vendor=gould + ;; + power) + cpu=power + vendor=ibm + ;; + ps2) + cpu=i386 + vendor=ibm + ;; + rm[46]00) + cpu=mips + vendor=siemens + ;; + rtpc | rtpc-*) + cpu=romp + vendor=ibm + ;; + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} + ;; + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks + ;; + tower | tower-32) + cpu=m68k + vendor=ncr + ;; + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu + ;; + w65) + cpu=w65 + vendor=wdc + ;; + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf + ;; + none) + cpu=none + vendor=none + ;; + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine + ;; + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` + ;; + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 + exit 1 + ;; + esac + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $vendor in + digital*) + vendor=dec + ;; + commodore*) + vendor=cbm + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if test x$basic_os != x +then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) + ;; + uclinux-uclibc* ) + ;; + managarm-mlibc* | managarm-kernel* ) + ;; + windows*-gnu* | windows*-msvc*) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel* ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 + ;; + *-msvc* ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 + exit 1 + ;; +esac + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) + vendor=acorn + ;; + *-sunos*) + vendor=sun + ;; + *-cnk* | *-aix*) + vendor=ibm + ;; + *-beos*) + vendor=be + ;; + *-hpux*) + vendor=hp + ;; + *-mpeix*) + vendor=hp + ;; + *-hiux*) + vendor=hitachi + ;; + *-unos*) + vendor=crds + ;; + *-dgux*) + vendor=dg + ;; + *-luna*) + vendor=omron + ;; + *-genix*) + vendor=ns + ;; + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) + vendor=ibm + ;; + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) + vendor=sequent + ;; + *-tpf*) + vendor=ibm + ;; + *-vxsim* | *-vxworks* | *-windiss*) + vendor=wrs + ;; + *-aux*) + vendor=apple + ;; + *-hms*) + vendor=hitachi + ;; + *-mpw* | *-macos*) + vendor=apple + ;; + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) + vendor=atari + ;; + *-vos*) + vendor=stratus + ;; + esac + ;; +esac + +echo "$cpu-$vendor-${kernel:+$kernel-}$os" +exit + +# Local variables: +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/configure.ac b/configure.ac index 13c496d086..9dfe04e374 100644 --- a/configure.ac +++ b/configure.ac @@ -24,8 +24,33 @@ define(FLINT_COPYRIGHT_C,[[/* (at your option) any later version. See . */]]) -dnl TODO -dnl * Move more stuff to acinclude.m4 to debloat this file. +# Copyright 1996-2022 Free Software Foundation, Inc. +# +# This file is part of the GNU MP Library. +# +# The GNU MP Library is free software; you can redistribute it and/or modify +# it under the terms of either: +# +# * the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# or +# +# * the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. +# +# or both in parallel, as here. +# +# The GNU MP Library 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 copies of the GNU General Public License and the +# GNU Lesser General Public License along with the GNU MP Library. If not, +# see https://www.gnu.org/licenses/. AC_COPYRIGHT(FLINT_COPYRIGHT) AH_TOP(FLINT_COPYRIGHT_C) @@ -138,6 +163,221 @@ dnl AC_CANONICAL_HOST AC_CONFIG_HEADERS(src/config.h src/flint-config.h) +################################################################################ +# architecture specifics +################################################################################ + +gcc_cflags="-O3 -pedantic -std=c11" +gcc_warnings="-Werror=implicit-function-declaration -Wall -Wno-stringop-overread -Wno-stringop-overflow" + +dnl We only try to provide specifics for those systems that currently supports +dnl our assembly routines. If more combinations are wished for than what is +dnl specified, please open up an issue at +dnl and we will consider it. +dnl +dnl For these systems we aim to provide: +dnl +dnl gcc_cflags flags for GCC-compatible compilers +dnl +dnl asm_path directory for assembly, relative to src/mpn_extras +dnl param_path directory for flint-mparam.h, relative to src/mpn_extras + +case $host in + + ARM64_PATTERN) + gcc_cflags="$gcc_cflags" + gcc_cflags_optlist="arch tune" + asm_path="arm64" + param_path="arm64" + flint_cv_have_fft_small_arm_i="yes" + + # NOTE: Cortex values where taken from + # https://developer.arm.com/Processors/Cortex-XXX + case $host_cpu in + armcortexa35 | armcortexa35neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a35" + ;; + armcortexa53 | armcortexa53neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a53" + ;; + armcortexa55 | armcortexa55neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a55" + ;; + armcortexa57 | armcortexa57neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a57" + ;; + armcortexa72 | armcortexa72neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a72" + ;; + armcortexa73 | armcortexa73neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a73" + ;; + armcortexa75 | armcortexa75neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a75" + ;; + armcortexa76 | armcortexa76neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a76" + ;; + armcortexa77 | armcortexa77neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a77" + ;; + armcortexa65 | armcortexa65neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a65" + ;; + armcortexa34 | armcortexa34neon) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=cortex-a34" + ;; + armcortexa78 | armcortexa78neon) + gcc_cflags_arch="-march=armv8.2-a" + gcc_cflags_tune="-mtune=cortex-a78" + ;; + armexynosm1) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=exynos-m1" + ;; + armthunderx) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=thunderx" + ;; + armxgene1) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="-mtune=xgene1" + ;; + applem1*) + gcc_cflags_arch="-march=armv8.5-a" + gcc_cflags_tune="" + ;; + applem2*) + gcc_cflags_arch="-march=armv8.6-a" + gcc_cflags_tune="" + ;; + applem3*) + gcc_cflags_arch="-march=armv8.6-a" + gcc_cflags_tune="" + ;; + aarch64* | armv8*) + gcc_cflags_arch="-march=armv8-a" + gcc_cflags_tune="" + ;; + *) + AC_MSG_ERROR([Error in deciding flags for $host. +Please report at ]) + ;; + esac + ;; + + + X86_64_ADX_PATTERN) + # NOTE: We do not care if the user specifies noavx! + gcc_cflags="$gcc_cflags" + gcc_cflags_optlist="arch" + asm_path="x86_64/broadwell" + param_path="x86_64/broadwell" + flint_cv_have_fft_small_x86_i="yes" + + case $host_cpu in + zen | zennoavx) + gcc_cflags_arch="-march=znver1" + ;; + zen2 | zen2noavx) + gcc_cflags_arch="-march=znver2" + ;; + zen3 | zen3noavx) + gcc_cflags_arch="-march=znver3" + ;; + zen4 | zen4noavx) + gcc_cflags_arch="-march=znver4" + ;; + coreibwl | coreibwlnoavx | broadwell | broadwellnoavx) + gcc_cflags_arch="-march=broadwell" + ;; + skylake | skylakenoavx) + gcc_cflags_arch="-march=skylake" + ;; + kabylake | kabylakenoavx) + gcc_cflags_arch="-march=skylake" + ;; + icelake | icelakenoavx) + gcc_cflags_arch="-march=tigerlake" + ;; + rocketlake | rocketlakenoavx) + gcc_cflags_arch="-march=rocketlake" + ;; + alderlake | alderlakenoavx) + gcc_cflags_arch="-march=alderlake" + ;; + raptorlake | raptorlakenoavx) + gcc_cflags_arch="-march=alderlake" + ;; + *) + AC_MSG_ERROR([Error in deciding flags for $host. +Please report at ]) + ;; + esac + + case $host in + *-*-mingw* | *-*-msys | *-*-cygwin) + flint_nonstd_abi="yes" + asm_path="" + param_path="x86_64" + ;; + esac + ;; + + X86_64_PATTERN) + # NOTE: We do not care if the user specifies noavx! + gcc_cflags="$gcc_cflags" + gcc_cflags_optlist="arch" + asm_path="" + param_path="x86_64" + + case $host_cpu in + coreiibr | coreiibrnoavx | ivybridge | ivybridgenoavx) + gcc_cflags_arch="-march=ivybridge" + # Ivybridge does not have AVX2 + ;; + coreihwl | coreihwlnoavx | haswell | haswellnoavx) + gcc_cflags_arch="-march=haswell" + flint_cv_have_fft_small_x86_i="yes" + ;; + piledriver | bd2 | piledrivernoavx | bd2noavx) + gcc_cflags_arch="-march=bdver2" + flint_cv_have_fft_small_x86_i="yes" + ;; + steamroller | bd3 | steamrollernoavx | bd3noavx) + gcc_cflags_arch="-march=bdver3" + flint_cv_have_fft_small_x86_i="yes" + ;; + excavator | bd4 | excavatornoavx | bd4noavx) + gcc_cflags_arch="-march=bdver4" + flint_cv_have_fft_small_x86_i="yes" + ;; + x86_64v3) + gcc_cflags_arch="-march=x86-64-v3" + flint_cv_have_fft_small_x86_i="yes" + ;; + esac + ;; + + *) + asm_path="" + param_path="generic" + gcc_cflags="$gcc_cflags" + ;; + +esac + ################################################################################ # features ################################################################################ @@ -285,11 +525,6 @@ yes|no) esac], enable_avx512="no") -AC_ARG_ENABLE(arch, -[AS_HELP_STRING([--enable-arch[[=ARCH]]],[Enable and push -march=ARCH option to C compiler [default=native]])], -[], -enable_arch="native") - # Note: This is maintainer level only. Currently only used for Nemo CI. AC_ARG_ENABLE(mpfr-check,[], [case $enableval in @@ -503,35 +738,6 @@ fi dnl NOTE: The following line is invoked from LT_INIT dnl AC_PROG_CC -if test "$with_ntl" = "yes"; -then - AC_PROG_CXX - AC_LANG_PUSH(C++) - if test "$cxxflags_set" = "no"; - then - AX_CXX_CHECK_COMPILE_FLAG([-Wall],[CXXFLAGS="-Wall $CXXFLAGS"]) - AX_CXX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration],[CXXFLAGS="-Werror=implicit-function-declaration $CXXFLAGS"]) - AX_CXX_CHECK_COMPILE_FLAG([-O2],[CXXFLAGS="-O2 $CXXFLAGS"]) - if test "$enable_arch" != "no"; - then - AX_CXX_CHECK_COMPILE_FLAG([-march=$enable_arch],[CXXFLAGS="-march=$enable_arch $CXXFLAGS"]) - fi - AX_CXX_CHECK_COMPILE_FLAG([-std=c++11],[CXXFLAGS="-std=c++11 $CXXFLAGS"], - AC_MSG_ERROR([Couldn't compile with the C++11 standard needed by the NTL interface.]) - ) - if test "$enable_debug" = "yes"; - then - if "$ac_cv_prog_cxx_g" = "yes"; - then - CXXFLAGS="-g $CXXFLAGS" - else - AC_MSG_ERROR([$CXX does not support the flag -g needed to generate debug information]) - fi - fi - fi - AC_LANG_POP -fi - AC_PROG_MKDIR_P ################################################################################ @@ -686,17 +892,6 @@ FLINT_CHECK_MPFR_H(4,1,0) FLINT_ABI -case "$flint_cv_abi" in - 32) - fft_tuning_in="src/fft_tuning32.in" - ;; - 64) - fft_tuning_in="src/fft_tuning64.in" - ;; -esac -AC_CONFIG_FILES([src/fft_tuning.h:$fft_tuning_in],[],[fft_tuning_in="$fft_tuning_in"]) -AC_SUBST(FFT_TUNING_IN, $fft_tuning_in) - ################################################################################ # check headers ################################################################################ @@ -738,6 +933,7 @@ fi if test "$with_ntl" = "yes"; then + AC_PROG_CXX AC_LANG_PUSH([C++]) AC_CHECK_HEADER([NTL/ZZ.h],, AC_MSG_ERROR([Could not find NTL/ZZ.h!])) @@ -853,26 +1049,9 @@ fi if test "$with_ntl" = "yes"; then - AC_MSG_CHECKING([if linking simple code snippet of NTL works]) - SAVE_libs="$LIBS" - LIBS="-lntl $LIBS" - AC_LANG_PUSH([C++]) - dnl The following code snippet was taken from NTL's documentation - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [NTL::ZZ a, b, c; -std::cin >> a; -std::cin >> b; -c = (a+1)*(b+1); -std::cout << c << "\n";])], - AC_MSG_RESULT([yes]), - AC_MSG_RESULT([no]) - [AC_MSG_ERROR([NTL library was not found. If you indeed have NTL installed, please + FLINT_CHECK_NTL(,[AC_MSG_ERROR([NTL library was not found. If you indeed have NTL installed, please submit a bug report to so -that we can either fix the issue or give a more proper error message.])] - ) - AC_LANG_POP - LIBS="$SAVE_libs" +that we can either fix the issue or give a more proper error message.])]) fi ################################################################################ @@ -881,14 +1060,7 @@ fi AC_SUBST(PIC_FLAG,$pic_flag) -AC_MSG_CHECKING([if cpu_set_t is supported]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([#define _GNU_SOURCE -#include -#include ], -[cpu_set_t s;CPU_ZERO(&s); pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), 0);])], -[AC_DEFINE(FLINT_USES_CPUSET,1,Define if system has cpu_set_t) - AC_MSG_RESULT([yes])], -[AC_MSG_RESULT([no])]) +FLINT_CHECK_CPU_SET_T([AC_DEFINE([FLINT_USES_CPUSET],1,Define if system has cpu_set_t)]) # ensure alloca works AC_MSG_CHECKING([if alloca works]) @@ -922,7 +1094,8 @@ save_CFLAGS="$CFLAGS" CFLAGS="" # The following is needed for Clang to check for unknown options. -AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option], [CFLAGS="-Werror=unknown-warning-option"]) +FLINT_CLANG([AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option], + [CFLAGS="-Werror=unknown-warning-option"])]) if test "$enable_coverage" = "yes"; then @@ -974,31 +1147,36 @@ then [AC_MSG_ERROR([$CC does not support the flag -mavx512f needed for AVX512 instructions])]) fi -case $host_cpu in - sparc*) - AX_CHECK_COMPILE_FLAG(-mno-relax,[DEFAULT_CFLAGS="-mno-relax $DEFAULT_CFLAGS"]) - ;; - *) - ;; -esac - -AX_CHECK_COMPILE_FLAG([-Wall],[DEFAULT_CFLAGS="-Wall $DEFAULT_CFLAGS"]) -AX_CHECK_COMPILE_FLAG([-Wno-stringop-overread],[DEFAULT_CFLAGS="-Wno-stringop-overread $DEFAULT_CFLAGS"]) -AX_CHECK_COMPILE_FLAG([-Wno-stringop-overflow],[DEFAULT_CFLAGS="-Wno-stringop-overflow $DEFAULT_CFLAGS"]) -AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration],[DEFAULT_CFLAGS="-Werror=implicit-function-declaration $DEFAULT_CFLAGS"]) -AX_CHECK_COMPILE_FLAG([-O3],[DEFAULT_CFLAGS="-O3 $DEFAULT_CFLAGS"]) -if test "$enable_arch" != "no"; -then - AX_CHECK_COMPILE_FLAG([-march=$enable_arch],[DEFAULT_CFLAGS="-march=$enable_arch $DEFAULT_CFLAGS"]) -fi -AX_CHECK_COMPILE_FLAG([-std=c11],[DEFAULT_CFLAGS="-std=c11 $DEFAULT_CFLAGS"]) -AX_CHECK_COMPILE_FLAG([-pedantic],[DEFAULT_CFLAGS="-pedantic $DEFAULT_CFLAGS"]) - if test "$cflags_set" = "no"; then - CFLAGS="$save_CFLAGS $DEFAULT_CFLAGS" - AC_SUBST(UNROLL_LOOPS,1) - AC_DEFINE(FLINT_UNROLL_LOOPS, 1, [Define to locally unroll some loops]) + for flag in $gcc_cflags $gcc_warnings; + do + AX_CHECK_COMPILE_FLAG([$flag],[save_CFLAGS="$flag $save_CFLAGS"]) + done + for opt in $gcc_cflags_optlist; + do + eval tmp=\"\$gcc_cflags_${opt}\" # " Just to fix highlighting + for flag in $tmp; + do + if test opt = "arch"; + then + AX_CHECK_COMPILE_FLAG([$flag],[save_CFLAGS="$flag $save_CFLAGS"], + [unset flint_cv_have_fft_small_x86_i + unset flint_cv_have_fft_small_arm_i]) + else + AX_CHECK_COMPILE_FLAG([$flag],[save_CFLAGS="$flag $save_CFLAGS"]) + fi + done + done + AX_CHECK_COMPILE_FLAG([-funroll-loops],[unroll_loops="yes"]) + if test "$unroll_loops" = "yes"; + then + AC_SUBST(UNROLL_LOOPS,1) + AC_DEFINE(FLINT_UNROLL_LOOPS, 1, [Define to locally unroll some loops]) + else + AC_SUBST(UNROLL_LOOPS,0) + fi + CFLAGS="$save_CFLAGS" else CFLAGS="$save_CFLAGS" AX_CHECK_COMPILE_FLAG([$CFLAGS],[],AC_MSG_ERROR(["Couldn't compile with given CFLAGS!"])) @@ -1014,12 +1192,6 @@ fi CPPFLAGS="-I./src $CPPFLAGS" -################################################################################ -# Architecture -################################################################################ - -FLINT_ARCH - ################################################################################ # fft_small module ################################################################################ @@ -1061,9 +1233,15 @@ FLINT_CHECK_FFT_SMALL( if test "$enable_assembly" = "yes"; then - FLINT_HAVE_ASM([enable_assembly="yes"], - [enable_assembly="no" - AC_MSG_WARN([FLINT currently only have assembly routines for System V-type systems for x86_64 processors with ADX instruction set. Disabling assembly...])]) + if test "x$asm_path" = "x"; + then + AC_MSG_WARN([Currently no assembly available for $host. Disabling assembly...]) + enable_assembly="no" + elif test "$flint_cv_abi" != "64"; + then + AC_MSG_WARN([Currently no assembly available for 32-bit systems. Disabling assembly...]) + enable_assembly="no" + fi fi if test "$enable_assembly" = "yes"; @@ -1087,7 +1265,7 @@ then case $host in ARM64_PATTERN) - AC_DEFINE([FLINT_HAVE_ARMV8],1,[Define if CPU supports ARM v8-A instruction set]) + AC_DEFINE([FLINT_HAVE_ASSEMBLY_armv8],1,[Define if Arm v8 assembly is available]) case $host in *-*-darwin*) GMP_INCLUDE_MPN(src/mpn_extras/arm64/darwin.m4) @@ -1097,22 +1275,45 @@ then ;; esac ;; - X86_64_PATTERN) - AC_DEFINE([FLINT_HAVE_ADX],1,[Define if CPU supports ADX instruction set]) + X86_64_ADX_PATTERN) + AC_DEFINE([FLINT_HAVE_ASSEMBLY_x86_64_adx],1,[Define if x86_64 ADX assembly is available]) GMP_ASM_ALIGN_FILL_0x90 GMP_ASM_COFF_TYPE - GMP_INCLUDE_MPN(src/mpn_extras/broadwell/x86_64-defs.m4) + GMP_INCLUDE_MPN(src/mpn_extras/x86_64/x86_64-defs.m4) case $host in *-*-darwin*) - GMP_INCLUDE_MPN(src/mpn_extras/broadwell/darwin.m4) + GMP_INCLUDE_MPN(src/mpn_extras/x86_64/darwin.m4) ;; esac ;; + *) + AC_MSG_ERROR([Error in assembly. Report to .]) esac GMP_FINISH fi +if test "$enable_assembly" = "yes"; +then + AC_SUBST(WANT_ASSEMBLY,1) + AC_SUBST(ASM_PATH,$asm_path) +else + AC_SUBST(WANT_ASSEMBLY,0) + AC_SUBST(ASM_PATH,) +fi + +################################################################################ +# parameters +################################################################################ + +if test -f src/mpn_extras/$param_path/flint-mparam.h; +then + AC_CONFIG_LINKS([src/flint-mparam.h:src/mpn_extras/$param_path/flint-mparam.h],[],[param_path="$param_path"]) + AC_SUBST(PARAM_PATH,$param_path) +else + AC_MSG_ERROR([Error establishing flint-mparam.h from param_path = $param_path]) +fi + ################################################################################ # substitutions and definitions ################################################################################ @@ -1159,7 +1360,7 @@ else fi fi -AC_CONFIG_FILES([src/fmpz/fmpz.c:$fmpz_c],[],[fmpz_c="$fmpz_c"]) +AC_CONFIG_LINKS([src/fmpz/fmpz.c:$fmpz_c],[],[fmpz_c="$fmpz_c"]) AC_SUBST(FMPZ_C_IN, $fmpz_c) if test "$enable_shared" = "yes"; @@ -1243,26 +1444,6 @@ then AC_DEFINE(FLINT_WANT_GMP_INTERNALS,1,[Define to enable use of GMP internals.]) fi -if test "$enable_assembly" = "yes"; -then - case $host in - X86_64_PATTERN) - AC_SUBST(WANT_ASSEMBLY,1) - AC_SUBST(WANT_ADX_ASSEMBLY,1) - AC_SUBST(WANT_ARMV8_ASSEMBLY,0) - ;; - ARM64_PATTERN) - AC_SUBST(WANT_ASSEMBLY,1) - AC_SUBST(WANT_ADX_ASSEMBLY,0) - AC_SUBST(WANT_ARMV8_ASSEMBLY,1) - ;; - esac -else - AC_SUBST(WANT_ASSEMBLY,0) - AC_SUBST(WANT_ADX_ASSEMBLY,0) - AC_SUBST(WANT_ARMV8_ASSEMBLY,0) -fi - ################################################################################ # epilog ################################################################################ diff --git a/src/fft/adjust.c b/src/fft/adjust.c index eede04fc40..54bf3bef60 100644 --- a/src/fft/adjust.c +++ b/src/fft/adjust.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_adjust(mp_limb_t * r, mp_limb_t * i1, mp_size_t i, mp_size_t limbs, flint_bitcnt_t w) diff --git a/src/fft/adjust_sqrt2.c b/src/fft/adjust_sqrt2.c index 717ec193cc..531b24323f 100644 --- a/src/fft/adjust_sqrt2.c +++ b/src/fft/adjust_sqrt2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_adjust_sqrt2(mp_limb_t * r, mp_limb_t * i1, diff --git a/src/fft/butterfly_lshB.c b/src/fft/butterfly_lshB.c index 14831494b1..9adc45a26e 100644 --- a/src/fft/butterfly_lshB.c +++ b/src/fft/butterfly_lshB.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void butterfly_lshB(mp_limb_t * t, mp_limb_t * u, mp_limb_t * i1, diff --git a/src/fft/butterfly_rshB.c b/src/fft/butterfly_rshB.c index a8990f676c..427726b2da 100644 --- a/src/fft/butterfly_rshB.c +++ b/src/fft/butterfly_rshB.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void butterfly_rshB(mp_limb_t * t, mp_limb_t * u, mp_limb_t * i1, diff --git a/src/fft/combine_bits.c b/src/fft/combine_bits.c index b616707dc8..55499b12e1 100644 --- a/src/fft/combine_bits.c +++ b/src/fft/combine_bits.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_combine_limbs(mp_limb_t * res, mp_limb_t ** poly, slong length, diff --git a/src/fft/convolution_precache.c b/src/fft/convolution_precache.c old mode 100755 new mode 100644 diff --git a/src/fft/div_2expmod_2expp1.c b/src/fft/div_2expmod_2expp1.c index 0ab2a305be..57091fcfca 100644 --- a/src/fft/div_2expmod_2expp1.c +++ b/src/fft/div_2expmod_2expp1.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" /* WARNING: relies on GCC's handling of >> as arithmetic shift right */ diff --git a/src/fft/fermat_to_mpz.c b/src/fft/fermat_to_mpz.c index b908edb29e..12c003669e 100644 --- a/src/fft/fermat_to_mpz.c +++ b/src/fft/fermat_to_mpz.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fermat_to_mpz(mpz_t m, mp_limb_t * i, mp_size_t limbs) diff --git a/src/fft/fft_negacylic.c b/src/fft/fft_negacylic.c index e421b65d66..3a60451684 100644 --- a/src/fft/fft_negacylic.c +++ b/src/fft/fft_negacylic.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_negacyclic(mp_limb_t ** ii, mp_size_t n, flint_bitcnt_t w, diff --git a/src/fft/fft_radix2.c b/src/fft/fft_radix2.c index 50740694b4..c0f3d70a85 100644 --- a/src/fft/fft_radix2.c +++ b/src/fft/fft_radix2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_butterfly(mp_limb_t * s, mp_limb_t * t, mp_limb_t * i1, diff --git a/src/fft/fft_truncate.c b/src/fft/fft_truncate.c index 023bdca99a..7c1ed28eac 100644 --- a/src/fft/fft_truncate.c +++ b/src/fft/fft_truncate.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_truncate1(mp_limb_t ** ii, mp_size_t n, flint_bitcnt_t w, diff --git a/src/fft/fft_truncate_sqrt2.c b/src/fft/fft_truncate_sqrt2.c index b55d2589e4..cd737a5fa8 100644 --- a/src/fft/fft_truncate_sqrt2.c +++ b/src/fft/fft_truncate_sqrt2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void fft_butterfly_sqrt2(mp_limb_t * s, mp_limb_t * t, diff --git a/src/fft/ifft_negacyclic.c b/src/fft/ifft_negacyclic.c index 6c283ce4d4..1ee20d008e 100644 --- a/src/fft/ifft_negacyclic.c +++ b/src/fft/ifft_negacyclic.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void ifft_negacyclic(mp_limb_t ** ii, mp_size_t n, flint_bitcnt_t w, diff --git a/src/fft/ifft_radix2.c b/src/fft/ifft_radix2.c index ab3c500baf..943f921790 100644 --- a/src/fft/ifft_radix2.c +++ b/src/fft/ifft_radix2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void ifft_butterfly(mp_limb_t * s, mp_limb_t * t, mp_limb_t * i1, diff --git a/src/fft/ifft_truncate.c b/src/fft/ifft_truncate.c index ef2cc310a8..5b3ad54f34 100644 --- a/src/fft/ifft_truncate.c +++ b/src/fft/ifft_truncate.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void ifft_truncate1(mp_limb_t ** ii, mp_size_t n, flint_bitcnt_t w, diff --git a/src/fft/ifft_truncate_sqrt2.c b/src/fft/ifft_truncate_sqrt2.c index 54876efdaa..f721894bf9 100644 --- a/src/fft/ifft_truncate_sqrt2.c +++ b/src/fft/ifft_truncate_sqrt2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void ifft_butterfly_sqrt2(mp_limb_t * s, mp_limb_t * t, mp_limb_t * i1, diff --git a/src/fft/inlines.c b/src/fft/inlines.c index e9800728af..c2554662e7 100644 --- a/src/fft/inlines.c +++ b/src/fft/inlines.c @@ -11,5 +11,4 @@ #define FFT_INLINES_C -#include "flint.h" #include "fft.h" diff --git a/src/fft/mul_2expmod_2expp1.c b/src/fft/mul_2expmod_2expp1.c index a0bbd9ff39..e248ffd82a 100644 --- a/src/fft/mul_2expmod_2expp1.c +++ b/src/fft/mul_2expmod_2expp1.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" /* WARNING: relies on GCC's handling of >> as arithmetic shift right */ diff --git a/src/fft/mul_fft_main.c b/src/fft/mul_fft_main.c index 133116c569..6cb4533cb1 100644 --- a/src/fft/mul_fft_main.c +++ b/src/fft/mul_fft_main.c @@ -9,10 +9,8 @@ (at your option) any later version. See . */ -#include "flint.h" +#include "flint-mparam.h" #include "fft.h" -#include "ulong_extras.h" -#include "fft_tuning.h" static int fft_tuning_table[5][2] = FFT_TAB; diff --git a/src/fft/mul_mfa_truncate_sqrt2.c b/src/fft/mul_mfa_truncate_sqrt2.c index b0c6e416b2..f006904891 100644 --- a/src/fft/mul_mfa_truncate_sqrt2.c +++ b/src/fft/mul_mfa_truncate_sqrt2.c @@ -9,9 +9,7 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" -#include "ulong_extras.h" void mul_mfa_truncate_sqrt2(mp_ptr r1, mp_srcptr i1, mp_size_t n1, mp_srcptr i2, mp_size_t n2, flint_bitcnt_t depth, flint_bitcnt_t w) diff --git a/src/fft/mul_truncate_sqrt2.c b/src/fft/mul_truncate_sqrt2.c index 20e22dc058..f9b7f2c3ad 100644 --- a/src/fft/mul_truncate_sqrt2.c +++ b/src/fft/mul_truncate_sqrt2.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" #include "mpn_extras.h" diff --git a/src/fft/mulmod_2expp1.c b/src/fft/mulmod_2expp1.c index 866cae2417..484446a327 100644 --- a/src/fft/mulmod_2expp1.c +++ b/src/fft/mulmod_2expp1.c @@ -9,10 +9,8 @@ (at your option) any later version. See . */ -#include "flint.h" +#include "flint-mparam.h" #include "fft.h" -#include "ulong_extras.h" -#include "fft_tuning.h" #include "mpn_extras.h" static mp_size_t mulmod_2expp1_table_n[FFT_N_NUM] = MULMOD_TAB; diff --git a/src/fft/negmod_2expp1.c b/src/fft/negmod_2expp1.c index bcc2ce5985..9b1a0d8cd6 100644 --- a/src/fft/negmod_2expp1.c +++ b/src/fft/negmod_2expp1.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" /* negation mod 2^(FLINT_BITS*limbs) + 1 assuming normalized input */ diff --git a/src/fft/normmod_2expp1.c b/src/fft/normmod_2expp1.c index 70bb07bffa..a1376b6e89 100644 --- a/src/fft/normmod_2expp1.c +++ b/src/fft/normmod_2expp1.c @@ -9,7 +9,6 @@ (at your option) any later version. See . */ -#include "flint.h" #include "fft.h" void mpn_normmod_2expp1(mp_limb_t * t, mp_size_t limbs) diff --git a/src/fft_tuning32.in b/src/fft_tuning32.in deleted file mode 100644 index 27ff431395..0000000000 --- a/src/fft_tuning32.in +++ /dev/null @@ -1,19 +0,0 @@ -/* fft_tuning.h -- autogenerated by tune-fft */ - -#ifndef FFT_TUNING_H -#define FFT_TUNING_H - -#include "gmp.h" - -#define FFT_TAB \ - { { 3, 3 }, { 3, 2 }, { 2, 1 }, { 2, 1 }, { 0, 0 } } - -#define MULMOD_TAB \ - { 4, 3, 3, 3, 3, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1 } - -#define FFT_N_NUM 15 - -#define FFT_MULMOD_2EXPP1_CUTOFF 256 - -#endif - diff --git a/src/fft_tuning64.in b/src/fft_tuning64.in deleted file mode 100644 index f7f94dada5..0000000000 --- a/src/fft_tuning64.in +++ /dev/null @@ -1,19 +0,0 @@ -/* fft_tuning.h -- autogenerated by tune-fft */ - -#ifndef FFT_TUNING_H -#define FFT_TUNING_H - -#include "gmp.h" - -#define FFT_TAB \ - { { 4, 4 }, { 4, 3 }, { 3, 2 }, { 2, 1 }, { 2, 1 } } - -#define MULMOD_TAB \ - { 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1 } - -#define FFT_N_NUM 19 - -#define FFT_MULMOD_2EXPP1_CUTOFF 128 - -#endif - diff --git a/src/fmpz_mod_mat/test/t-mul_classical_threaded.c b/src/fmpz_mod_mat/test/t-mul_classical_threaded.c old mode 100755 new mode 100644 diff --git a/src/fmpz_mod_poly/powers_mod_bsgs_threaded.c b/src/fmpz_mod_poly/powers_mod_bsgs_threaded.c old mode 100755 new mode 100644 diff --git a/src/fmpz_mod_poly/powers_mod_naive.c b/src/fmpz_mod_poly/powers_mod_naive.c old mode 100755 new mode 100644 diff --git a/src/fmpz_mod_poly/test/t-powers_mod_bsgs.c b/src/fmpz_mod_poly/test/t-powers_mod_bsgs.c old mode 100755 new mode 100644 diff --git a/src/fmpz_mod_poly/test/t-powers_mod_naive.c b/src/fmpz_mod_poly/test/t-powers_mod_naive.c old mode 100755 new mode 100644 diff --git a/src/fmpz_poly/mul_SS.c b/src/fmpz_poly/mul_SS.c index 435f2cc121..b8fd3980b2 100644 --- a/src/fmpz_poly/mul_SS.c +++ b/src/fmpz_poly/mul_SS.c @@ -10,8 +10,6 @@ */ #include "fmpz_poly.h" -#include "fft.h" -#include "fft_tuning.h" void _fmpz_poly_mul_SS(fmpz *output, const fmpz *input1, slong len1, const fmpz *input2, slong len2) diff --git a/src/fmpz_poly/mullow_SS.c b/src/fmpz_poly/mullow_SS.c index d080f73cb1..94778657a6 100644 --- a/src/fmpz_poly/mullow_SS.c +++ b/src/fmpz_poly/mullow_SS.c @@ -9,10 +9,10 @@ (at your option) any later version. See . */ +#include "flint-mparam.h" #include "fmpz_vec.h" #include "fmpz_poly.h" #include "fft.h" -#include "fft_tuning.h" void _fmpz_poly_mullow_SS(fmpz * output, const fmpz * input1, slong len1, const fmpz * input2, slong len2, slong trunc) diff --git a/src/fmpz_poly/mullow_SS_precache.c b/src/fmpz_poly/mullow_SS_precache.c old mode 100755 new mode 100644 index 933ac1043b..b43ac101c0 --- a/src/fmpz_poly/mullow_SS_precache.c +++ b/src/fmpz_poly/mullow_SS_precache.c @@ -9,10 +9,10 @@ (at your option) any later version. See . */ +#include "flint-mparam.h" #include "fmpz_vec.h" #include "fmpz_poly.h" #include "fft.h" -#include "fft_tuning.h" void fmpz_poly_mul_SS_precache_init(fmpz_poly_mul_precache_t pre, slong len1, slong bits1, const fmpz_poly_t poly2) diff --git a/src/mpn_extras.h b/src/mpn_extras.h index 315af70c30..a26f1eda4f 100644 --- a/src/mpn_extras.h +++ b/src/mpn_extras.h @@ -120,7 +120,7 @@ flint_mpn_get_d(mp_srcptr ptr, mp_size_t size, mp_size_t sign, long exp); /* Addition ******************************************************************/ -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx /* Simultaneously adds two n-limbed integers onto result and returns carry. */ /* NOTE: Requires n >= 4 */ # define FLINT_HAVE_NATIVE_mpn_2add_n_inplace 1 @@ -199,7 +199,7 @@ mp_limb_t mpn_rsh1sub_n(mp_ptr, mp_srcptr, mp_srcptr, mp_size_t); # define FLINT_FFT_SQR_THRESHOLD 32000 #endif -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx # define FLINT_MPN_MUL_FUNC_TAB_WIDTH 17 # define FLINT_MPN_SQR_FUNC_TAB_WIDTH 14 @@ -210,7 +210,7 @@ mp_limb_t mpn_rsh1sub_n(mp_ptr, mp_srcptr, mp_srcptr, mp_size_t); # define FLINT_MPN_MUL_HARD(rp, xp, xn, yp, yn) (flint_mpn_mul_func_tab[xn][yn](rp, xp, yp)) # define FLINT_MPN_MUL_N_HARD(rp, xp, yp, n) (flint_mpn_mul_n_func_tab[n](rp, xp, yp)) # define FLINT_MPN_SQR_HARD(rp, xp, n) (flint_mpn_sqr_func_tab[n](rp, xp)) -#elif FLINT_HAVE_ARMV8 +#elif FLINT_HAVE_ASSEMBLY_armv8 # define FLINT_MPN_MUL_FUNC_N_TAB_WIDTH 15 # define FLINT_MPN_SQR_FUNC_TAB_WIDTH 0 @@ -348,7 +348,7 @@ FLINT_DLL extern const flint_mpn_mul_func_t flint_mpn_mulhigh_func_tab[]; FLINT_DLL extern const flint_mpn_sqr_func_t flint_mpn_sqrhigh_func_tab[]; FLINT_DLL extern const flint_mpn_mulhigh_normalised_func_t flint_mpn_mulhigh_normalised_func_tab[]; -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx # define FLINT_MPN_MULHIGH_FUNC_TAB_WIDTH 12 # define FLINT_MPN_SQRHIGH_FUNC_TAB_WIDTH 8 # define FLINT_MPN_MULHIGH_NORMALISED_FUNC_TAB_WIDTH 12 diff --git a/src/mpn_extras/arm64/flint-mparam.h b/src/mpn_extras/arm64/flint-mparam.h new file mode 100644 index 0000000000..03d887beaa --- /dev/null +++ b/src/mpn_extras/arm64/flint-mparam.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2024 Albin Ahlbäck + + This file is part of FLINT. + + FLINT is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License (LGPL) as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. See . +*/ + +/* Tuning for generic CPU. Is probably far from optimal. */ + +#ifndef FLINT_MPARAM_H +#define FLINT_MPARAM_H + +#define FFT_TAB \ + { {4, 4}, {4, 3}, {3, 2}, {2, 1}, {2, 1} } + +#define MULMOD_TAB \ + { 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1 } + +#define FFT_N_NUM 19 +#define FFT_MULMOD_2EXPP1_CUTOFF 128 + +#endif diff --git a/src/mpn_extras/generic/flint-mparam.h b/src/mpn_extras/generic/flint-mparam.h new file mode 100644 index 0000000000..03d887beaa --- /dev/null +++ b/src/mpn_extras/generic/flint-mparam.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2024 Albin Ahlbäck + + This file is part of FLINT. + + FLINT is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License (LGPL) as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. See . +*/ + +/* Tuning for generic CPU. Is probably far from optimal. */ + +#ifndef FLINT_MPARAM_H +#define FLINT_MPARAM_H + +#define FFT_TAB \ + { {4, 4}, {4, 3}, {3, 2}, {2, 1}, {2, 1} } + +#define MULMOD_TAB \ + { 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1 } + +#define FFT_N_NUM 19 +#define FFT_MULMOD_2EXPP1_CUTOFF 128 + +#endif diff --git a/src/mpn_extras/mul.c b/src/mpn_extras/mul.c index d9dc1460db..ed5b36e268 100644 --- a/src/mpn_extras/mul.c +++ b/src/mpn_extras/mul.c @@ -14,7 +14,7 @@ void __gmpn_mul_basecase(mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t); -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx /* We don't call mpn_mul_basecase directly because our own basecases already cover small operands. */ # define WANT_GMP_MUL_BASECASE 0 @@ -22,7 +22,7 @@ void __gmpn_mul_basecase(mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t); /* toom22 on top our own basecase beats GMP up to some point */ # define WANT_TOOM22 1 # define TOOM22_LIMIT 230 -#elif FLINT_HAVE_ARMV8 +#elif FLINT_HAVE_ASSEMBLY_armv8 # define WANT_GMP_MUL_BASECASE 0 # define BASECASE_LIMIT 0 # define WANT_TOOM22 1 diff --git a/src/mpn_extras/mul_basecase.c b/src/mpn_extras/mul_basecase.c index 0dc5bdbb64..016069e3cc 100644 --- a/src/mpn_extras/mul_basecase.c +++ b/src/mpn_extras/mul_basecase.c @@ -12,7 +12,7 @@ #include "mpn_extras.h" -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx mp_limb_t flint_mpn_mul_1_1(mp_ptr, mp_srcptr, mp_srcptr); @@ -272,7 +272,7 @@ mp_limb_t flint_mpn_mul_16_16(mp_ptr res, mp_srcptr u, mp_srcptr v) return res[31]; } -#elif FLINT_HAVE_ARMV8 +#elif FLINT_HAVE_ASSEMBLY_armv8 mp_limb_t flint_mpn_mul_1n(mp_ptr, mp_srcptr, mp_srcptr, mp_size_t); mp_limb_t flint_mpn_mul_2n(mp_ptr, mp_srcptr, mp_srcptr, mp_size_t); mp_limb_t flint_mpn_mul_3n(mp_ptr, mp_srcptr, mp_srcptr, mp_size_t); @@ -800,7 +800,7 @@ mp_limb_t flint_mpn_mul_14_1(mp_ptr res, mp_srcptr u, mp_srcptr v) #define MUL(mx, nx) _MUL(mx, nx) -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx const flint_mpn_mul_func_t flint_mpn_mul_func_tab[][FLINT_MPN_MUL_FUNC_TAB_WIDTH] = { {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, @@ -842,7 +842,7 @@ const flint_mpn_mul_func_t flint_mpn_mul_n_func_tab[] = { MUL( 16, 16), }; -#elif FLINT_HAVE_ARMV8 +#elif FLINT_HAVE_ASSEMBLY_armv8 const flint_mpn_mul_func_n_t flint_mpn_mul_func_n_tab[] = { NULL, flint_mpn_mul_1n, diff --git a/src/mpn_extras/mulhigh_func_tab.c b/src/mpn_extras/mulhigh_func_tab.c index 40a8383fe7..de43bb81ac 100644 --- a/src/mpn_extras/mulhigh_func_tab.c +++ b/src/mpn_extras/mulhigh_func_tab.c @@ -11,7 +11,7 @@ #include "mpn_extras.h" -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx mp_limb_t flint_mpn_mulhigh_1(mp_ptr, mp_srcptr, mp_srcptr); mp_limb_t flint_mpn_mulhigh_2(mp_ptr, mp_srcptr, mp_srcptr); mp_limb_t flint_mpn_mulhigh_3(mp_ptr, mp_srcptr, mp_srcptr); diff --git a/src/mpn_extras/sqr_basecase.c b/src/mpn_extras/sqr_basecase.c index 6233a3cfa6..8591e28598 100644 --- a/src/mpn_extras/sqr_basecase.c +++ b/src/mpn_extras/sqr_basecase.c @@ -11,7 +11,7 @@ #include "mpn_extras.h" -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx mp_limb_t flint_mpn_sqr_1(mp_ptr, mp_srcptr); mp_limb_t flint_mpn_sqr_2(mp_ptr, mp_srcptr); diff --git a/src/mpn_extras/test/t-mulhigh_normalised.c b/src/mpn_extras/test/t-mulhigh_normalised.c index 8d6987d44f..6bb96fbaa8 100644 --- a/src/mpn_extras/test/t-mulhigh_normalised.c +++ b/src/mpn_extras/test/t-mulhigh_normalised.c @@ -13,7 +13,7 @@ #include "mpn_extras.h" /* TODO: Remove this preprocessor conditional */ -#if FLINT_HAVE_ADX +#if FLINT_HAVE_ASSEMBLY_x86_64_adx # define N_MAX 64 diff --git a/src/mpn_extras/broadwell/2add_n_inplace.asm b/src/mpn_extras/x86_64/broadwell/2add_n_inplace.asm similarity index 100% rename from src/mpn_extras/broadwell/2add_n_inplace.asm rename to src/mpn_extras/x86_64/broadwell/2add_n_inplace.asm diff --git a/src/mpn_extras/x86_64/broadwell/flint-mparam.h b/src/mpn_extras/x86_64/broadwell/flint-mparam.h new file mode 100644 index 0000000000..03d887beaa --- /dev/null +++ b/src/mpn_extras/x86_64/broadwell/flint-mparam.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2024 Albin Ahlbäck + + This file is part of FLINT. + + FLINT is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License (LGPL) as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. See . +*/ + +/* Tuning for generic CPU. Is probably far from optimal. */ + +#ifndef FLINT_MPARAM_H +#define FLINT_MPARAM_H + +#define FFT_TAB \ + { {4, 4}, {4, 3}, {3, 2}, {2, 1}, {2, 1} } + +#define MULMOD_TAB \ + { 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1 } + +#define FFT_N_NUM 19 +#define FFT_MULMOD_2EXPP1_CUTOFF 128 + +#endif diff --git a/src/mpn_extras/broadwell/mul_hard.asm b/src/mpn_extras/x86_64/broadwell/mul_hard.asm similarity index 100% rename from src/mpn_extras/broadwell/mul_hard.asm rename to src/mpn_extras/x86_64/broadwell/mul_hard.asm diff --git a/src/mpn_extras/broadwell/mulhigh_basecase.asm b/src/mpn_extras/x86_64/broadwell/mulhigh_basecase.asm similarity index 100% rename from src/mpn_extras/broadwell/mulhigh_basecase.asm rename to src/mpn_extras/x86_64/broadwell/mulhigh_basecase.asm diff --git a/src/mpn_extras/broadwell/mulhigh_hard.asm b/src/mpn_extras/x86_64/broadwell/mulhigh_hard.asm similarity index 100% rename from src/mpn_extras/broadwell/mulhigh_hard.asm rename to src/mpn_extras/x86_64/broadwell/mulhigh_hard.asm diff --git a/src/mpn_extras/broadwell/mulhigh_normalised_hard.asm b/src/mpn_extras/x86_64/broadwell/mulhigh_normalised_hard.asm similarity index 100% rename from src/mpn_extras/broadwell/mulhigh_normalised_hard.asm rename to src/mpn_extras/x86_64/broadwell/mulhigh_normalised_hard.asm diff --git a/src/mpn_extras/broadwell/sqr_hard.asm b/src/mpn_extras/x86_64/broadwell/sqr_hard.asm similarity index 100% rename from src/mpn_extras/broadwell/sqr_hard.asm rename to src/mpn_extras/x86_64/broadwell/sqr_hard.asm diff --git a/src/mpn_extras/broadwell/sqrhigh_basecase_even.asm b/src/mpn_extras/x86_64/broadwell/sqrhigh_basecase_even.asm similarity index 100% rename from src/mpn_extras/broadwell/sqrhigh_basecase_even.asm rename to src/mpn_extras/x86_64/broadwell/sqrhigh_basecase_even.asm diff --git a/src/mpn_extras/broadwell/sqrhigh_basecase_odd.asm b/src/mpn_extras/x86_64/broadwell/sqrhigh_basecase_odd.asm similarity index 100% rename from src/mpn_extras/broadwell/sqrhigh_basecase_odd.asm rename to src/mpn_extras/x86_64/broadwell/sqrhigh_basecase_odd.asm diff --git a/src/mpn_extras/broadwell/sqrhigh_hard.asm b/src/mpn_extras/x86_64/broadwell/sqrhigh_hard.asm similarity index 100% rename from src/mpn_extras/broadwell/sqrhigh_hard.asm rename to src/mpn_extras/x86_64/broadwell/sqrhigh_hard.asm diff --git a/src/mpn_extras/broadwell/darwin.m4 b/src/mpn_extras/x86_64/darwin.m4 similarity index 100% rename from src/mpn_extras/broadwell/darwin.m4 rename to src/mpn_extras/x86_64/darwin.m4 diff --git a/src/mpn_extras/x86_64/flint-mparam.h b/src/mpn_extras/x86_64/flint-mparam.h new file mode 100644 index 0000000000..03d887beaa --- /dev/null +++ b/src/mpn_extras/x86_64/flint-mparam.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2024 Albin Ahlbäck + + This file is part of FLINT. + + FLINT is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License (LGPL) as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. See . +*/ + +/* Tuning for generic CPU. Is probably far from optimal. */ + +#ifndef FLINT_MPARAM_H +#define FLINT_MPARAM_H + +#define FFT_TAB \ + { {4, 4}, {4, 3}, {3, 2}, {2, 1}, {2, 1} } + +#define MULMOD_TAB \ + { 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1 } + +#define FFT_N_NUM 19 +#define FFT_MULMOD_2EXPP1_CUTOFF 128 + +#endif diff --git a/src/mpn_extras/broadwell/x86_64-defs.m4 b/src/mpn_extras/x86_64/x86_64-defs.m4 similarity index 100% rename from src/mpn_extras/broadwell/x86_64-defs.m4 rename to src/mpn_extras/x86_64/x86_64-defs.m4