Commit 2e675f9c authored by Giacomo Mulas's avatar Giacomo Mulas
Browse files

Merge branch 'magma_refinement' into 'master' 

Magma refinement

See merge request giacomo.mulas/np_tmcode!69
parents 7a84cbc1 c0a56cfd

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ building_stage: 
      - cat /etc/os-release

      - cd build

      - echo "Configuring with default compilers (MAGMA disabled)..."

      - ./configure --without-magma --disable-offload --enable-refinement

      - ./configure --without-magma --without-cublas --disable-offload --enable-refinement

      - make clean

      - echo "Building the default configuration..."

      - make -j

build/Makefile.am

+1 −1
Original line number Diff line number Diff line 
LDADD=libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${MAGMALDFLAGS}

LDADD=libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${CUBLASLDFLAGS} ${MAGMALDFLAGS}

lib_LTLIBRARIES=libnptm/libnptm.la

libnptm_libnptm_la_SOURCES=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp

if BUILDFORTRAN

build/Makefile.in

+33 −20
Original line number Diff line number Diff line
@@ -162,9 +162,10 @@ am_libnptm_libnptm_la_OBJECTS = ../src/libnptm/algebraic.lo \ 
	../src/libnptm/Configuration.lo ../src/libnptm/file_io.lo \

	../src/libnptm/inclu_subs.lo ../src/libnptm/lapack_calls.lo \

	../src/libnptm/logging.lo ../src/libnptm/magma_calls.lo \

	../src/libnptm/Parsers.lo ../src/libnptm/sph_subs.lo \

	../src/libnptm/utils.lo ../src/libnptm/tfrfme.lo \

	../src/libnptm/TransitionMatrix.lo ../src/libnptm/tra_subs.lo

	../src/libnptm/cublas_calls.lo ../src/libnptm/Parsers.lo \

	../src/libnptm/sph_subs.lo ../src/libnptm/utils.lo \

	../src/libnptm/tfrfme.lo ../src/libnptm/TransitionMatrix.lo \

	../src/libnptm/tra_subs.lo

libnptm_libnptm_la_OBJECTS = $(am_libnptm_libnptm_la_OBJECTS)

AM_V_lt = $(am__v_lt_@AM_V@)

am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -178,7 +179,8 @@ cluster_clu_LDADD = $(LDADD) 
am__DEPENDENCIES_1 =

cluster_clu_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__cluster_edfb_clu_SOURCES_DIST = ../src/cluster/edfb_clu.f

@BUILDFORTRAN_TRUE@am__objects_2 = ../src/cluster/edfb_clu.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_cluster_edfb_clu_OBJECTS = $(am__objects_2)
@@ -187,7 +189,7 @@ cluster_edfb_clu_LDADD = $(LDADD) 
cluster_edfb_clu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__cluster_np_cluster_SOURCES_DIST = ../src/cluster/np_cluster.cpp \

	../src/cluster/cluster.cpp

@BUILDFORTRAN_FALSE@am_cluster_np_cluster_OBJECTS =  \
@@ -201,7 +203,7 @@ cluster_np_cluster_LDADD = $(LDADD) 
cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__inclusion_edfb_inclu_SOURCES_DIST = ../src/inclusion/edfb_inclu.f

@BUILDFORTRAN_TRUE@am__objects_3 =  \

@BUILDFORTRAN_TRUE@	../src/inclusion/edfb_inclu.$(OBJEXT)
@@ -211,7 +213,7 @@ inclusion_edfb_inclu_LDADD = $(LDADD) 
inclusion_edfb_inclu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__inclusion_inclu_SOURCES_DIST = ../src/inclusion/inclu.f

@BUILDFORTRAN_TRUE@am__objects_4 = ../src/inclusion/inclu.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_inclusion_inclu_OBJECTS = $(am__objects_4)
@@ -220,7 +222,7 @@ inclusion_inclu_LDADD = $(LDADD) 
inclusion_inclu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__inclusion_np_inclusion_SOURCES_DIST =  \

	../src/inclusion/np_inclusion.cpp \

	../src/inclusion/inclusion.cpp
@@ -235,7 +237,7 @@ inclusion_np_inclusion_LDADD = $(LDADD) 
inclusion_np_inclusion_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__sphere_edfb_sph_SOURCES_DIST = ../src/sphere/edfb_sph.f

@BUILDFORTRAN_TRUE@am__objects_5 = ../src/sphere/edfb_sph.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_5)
@@ -244,7 +246,7 @@ sphere_edfb_sph_LDADD = $(LDADD) 
sphere_edfb_sph_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__sphere_np_sphere_SOURCES_DIST = ../src/sphere/np_sphere.cpp \

	../src/sphere/sphere.cpp

@BUILDFORTRAN_FALSE@am_sphere_np_sphere_OBJECTS =  \
@@ -258,7 +260,7 @@ sphere_np_sphere_LDADD = $(LDADD) 
sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__sphere_sph_SOURCES_DIST = ../src/sphere/sph.f

@BUILDFORTRAN_TRUE@am__objects_6 = ../src/sphere/sph.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_6)
@@ -266,7 +268,8 @@ sphere_sph_OBJECTS = $(am_sphere_sph_OBJECTS) 
sphere_sph_LDADD = $(LDADD)

sphere_sph_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__testing_test_ParticleDescriptor_SOURCES_DIST =  \

	../src/testing/test_ParticleDescriptor.cpp

@BUILDFORTRAN_FALSE@am_testing_test_ParticleDescriptor_OBJECTS = ../src/testing/test_ParticleDescriptor.$(OBJEXT)
@@ -277,7 +280,7 @@ testing_test_ParticleDescriptor_LDADD = $(LDADD) 
testing_test_ParticleDescriptor_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__testing_test_TEDF_SOURCES_DIST = ../src/testing/test_TEDF.cpp

@BUILDFORTRAN_FALSE@am_testing_test_TEDF_OBJECTS =  \

@BUILDFORTRAN_FALSE@	../src/testing/test_TEDF.$(OBJEXT)
@@ -288,7 +291,7 @@ testing_test_TEDF_LDADD = $(LDADD) 
testing_test_TEDF_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__testing_test_TTMS_SOURCES_DIST = ../src/testing/test_TTMS.cpp

@BUILDFORTRAN_FALSE@am_testing_test_TTMS_OBJECTS =  \

@BUILDFORTRAN_FALSE@	../src/testing/test_TTMS.$(OBJEXT)
@@ -299,7 +302,7 @@ testing_test_TTMS_LDADD = $(LDADD) 
testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__trapping_frfme_SOURCES_DIST = ../src/trapping/frfme.f

@BUILDFORTRAN_TRUE@am__objects_7 = ../src/trapping/frfme.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_7)
@@ -307,7 +310,8 @@ trapping_frfme_OBJECTS = $(am_trapping_frfme_OBJECTS) 
trapping_frfme_LDADD = $(LDADD)

trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__trapping_lffft_SOURCES_DIST = ../src/trapping/lffft.f

@BUILDFORTRAN_TRUE@am__objects_8 = ../src/trapping/lffft.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_8)
@@ -315,7 +319,8 @@ trapping_lffft_OBJECTS = $(am_trapping_lffft_OBJECTS) 
trapping_lffft_LDADD = $(LDADD)

trapping_lffft_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__trapping_np_trapping_SOURCES_DIST =  \

	../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp \

	../src/trapping/clffft.cpp
@@ -332,7 +337,7 @@ trapping_np_trapping_LDADD = $(LDADD) 
trapping_np_trapping_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

AM_V_P = $(am__v_P_@AM_V@)

am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

am__v_P_0 = false
@@ -358,6 +363,7 @@ am__depfiles_remade = ../src/cluster/$(DEPDIR)/cluster.Po \ 
	../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo \

	../src/libnptm/$(DEPDIR)/algebraic.Plo \

	../src/libnptm/$(DEPDIR)/clu_subs.Plo \

	../src/libnptm/$(DEPDIR)/cublas_calls.Plo \

	../src/libnptm/$(DEPDIR)/file_io.Plo \

	../src/libnptm/$(DEPDIR)/inclu_subs.Plo \

	../src/libnptm/$(DEPDIR)/lapack_calls.Plo \
@@ -522,6 +528,8 @@ CLANGFLAGS = @CLANGFLAGS@ 
CPPFLAGS = @CPPFLAGS@

CSCOPE = @CSCOPE@

CTAGS = @CTAGS@

CUBLASFLAGS = @CUBLASFLAGS@

CUBLASLDFLAGS = @CUBLASLDFLAGS@

CXX = @CXX@

CXXCPP = @CXXCPP@

CXXDEPMODE = @CXXDEPMODE@
@@ -650,9 +658,9 @@ target_alias = @target_alias@ 
top_build_prefix = @top_build_prefix@

top_builddir = @top_builddir@

top_srcdir = @top_srcdir@

LDADD = libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${MAGMALDFLAGS}

LDADD = libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLDFLAGS} ${BLASLDFLAGS} ${CUBLASLDFLAGS} ${MAGMALDFLAGS}

lib_LTLIBRARIES = libnptm/libnptm.la

libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp

libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/inclu_subs.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/cublas_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp

@BUILDFORTRAN_FALSE@PROGS = cluster/np_cluster inclusion/np_inclusion sphere/np_sphere trapping/np_trapping testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS

@BUILDFORTRAN_TRUE@PROGS = cluster/edfb_clu cluster/clu cluster/np_cluster inclusion/edfb_inclu inclusion/inclu inclusion/np_inclusion sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS

@BUILDFORTRAN_TRUE@EDFBCLUSOURCES = ../src/cluster/edfb_clu.f
@@ -830,6 +838,8 @@ clean-libLTLIBRARIES: 
	../src/libnptm/$(DEPDIR)/$(am__dirstamp)

../src/libnptm/magma_calls.lo: ../src/libnptm/$(am__dirstamp) \

	../src/libnptm/$(DEPDIR)/$(am__dirstamp)

../src/libnptm/cublas_calls.lo: ../src/libnptm/$(am__dirstamp) \

	../src/libnptm/$(DEPDIR)/$(am__dirstamp)

../src/libnptm/Parsers.lo: ../src/libnptm/$(am__dirstamp) \

	../src/libnptm/$(DEPDIR)/$(am__dirstamp)

../src/libnptm/sph_subs.lo: ../src/libnptm/$(am__dirstamp) \
@@ -1022,6 +1032,7 @@ distclean-compile: 
@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/algebraic.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/clu_subs.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/cublas_calls.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/file_io.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/inclu_subs.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@../src/libnptm/$(DEPDIR)/lapack_calls.Plo@am__quote@ # am--include-marker
@@ -1399,6 +1410,7 @@ distclean: distclean-am 
	-rm -f ../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/algebraic.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/clu_subs.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/cublas_calls.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/file_io.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/inclu_subs.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/lapack_calls.Plo
@@ -1473,6 +1485,7 @@ maintainer-clean: maintainer-clean-am 
	-rm -f ../src/libnptm/$(DEPDIR)/TransitionMatrix.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/algebraic.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/clu_subs.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/cublas_calls.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/file_io.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/inclu_subs.Plo

	-rm -f ../src/libnptm/$(DEPDIR)/lapack_calls.Plo

build/build_aux/config.guess

+22 −75
Original line number Diff line number Diff line 
#! /bin/sh

# Attempt to guess a canonical system name.

#   Copyright 1992-2023 Free Software Foundation, Inc.

#   Copyright 1992-2022 Free Software Foundation, Inc.



# shellcheck disable=SC2006,SC2268 # see below for rationale



timestamp='2023-08-22'

timestamp='2022-01-09'



# 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
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` 
usage="\

Usage: $0 [OPTION]



Output the configuration name of the system '$me' is run on.

Output the configuration name of the system \`$me' is run on.



Options:

  -h, --help         print this help, then exit
@@ -60,13 +60,13 @@ version="\ 
GNU config.guess ($timestamp)



Originally written by Per Bothner.

Copyright 1992-2023 Free Software Foundation, Inc.

Copyright 1992-2022 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."

Try \`$me --help' for more information."



# Parse command line

while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS= 
# 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.

# 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.
@@ -155,9 +155,6 @@ Linux|GNU|GNU/*) 


	set_cc_for_build

	cat <<-EOF > "$dummy.c"

	#if defined(__ANDROID__)

	LIBC=android

	#else

	#include <features.h>

	#if defined(__UCLIBC__)

	LIBC=uclibc
@@ -172,7 +169,6 @@ Linux|GNU|GNU/*) 
	LIBC=musl

	#endif

	#endif

	#endif

	EOF

	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`

	eval "$cc_set_libc"
@@ -463,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in 
		UNAME_RELEASE=`uname -v`

		;;

	esac

	# Japanese Language versions have a version number like '4.1.3-JL'.

	# 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

	;;
@@ -908,7 +904,7 @@ EOF 
	fi

	;;

    *:FreeBSD:*:*)

	UNAME_PROCESSOR=`uname -p`

	UNAME_PROCESSOR=`/usr/bin/uname -p`

	case $UNAME_PROCESSOR in

	    amd64)

		UNAME_PROCESSOR=x86_64 ;;
@@ -970,37 +966,11 @@ EOF 
	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:*:*)

	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 __ARM_EABI__

	    #ifdef __ARM_PCS_VFP

	    ABI=eabihf

	    #else

	    ABI=eabi

	    #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

		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;

	    esac

	fi

	GUESS=$CPU-unknown-linux-$LIBCABI

	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC

	;;

    aarch64_be:Linux:*:*)

	UNAME_MACHINE=aarch64_be
@@ -1066,16 +1036,7 @@ EOF 
    k1om:Linux:*:*)

	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC

	;;

    kvx:Linux:*:*)

	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC

	;;

    kvx:cos:*:*)

	GUESS=$UNAME_MACHINE-unknown-cos

	;;

    kvx:mbr:*:*)

	GUESS=$UNAME_MACHINE-unknown-mbr

	;;

    loongarch32:Linux:*:* | loongarch64:Linux:*:*)

    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)

	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC

	;;

    m32r*:Linux:*:*)
@@ -1190,27 +1151,16 @@ EOF 
	;;

    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

	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \

		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \

		grep IS_X32 >/dev/null

	    then

		LIBCABI=${LIBC}x32

	    fi

	fi

	GUESS=$CPU-pc-linux-$LIBCABI

	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI

	;;

    xtensa*:Linux:*:*)

	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1230,7 +1180,7 @@ EOF 
	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION

	;;

    i*86:OS/2:*:*)

	# If we were able to find 'uname', then EMX Unix compatibility

	# If we were able to find `uname', then EMX Unix compatibility

	# is probably installed.

	GUESS=$UNAME_MACHINE-pc-os2-emx

	;;
@@ -1371,7 +1321,7 @@ EOF 
		GUESS=ns32k-sni-sysv

	fi

	;;

    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort

    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort

			# says <Richard.M.Bartel@ccMail.Census.GOV>

	GUESS=i586-unisys-sysv4

	;;
@@ -1417,11 +1367,8 @@ EOF 
    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

    x86_64:Haiku:*:*)

	GUESS=x86_64-unknown-haiku

	;;

    SX-4:SUPER-UX:*:*)

	GUESS=sx4-nec-superux$UNAME_RELEASE

build/build_aux/config.sub

+77 −147

File changed.

Preview size limit exceeded, changes collapsed.