Skip to content

Commit 64e342f

Browse files
GiudGiudGiudGiud
committed
Run bootstrap
Lots of changes
1 parent bace2ff commit 64e342f

File tree

444 files changed

+69728
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

444 files changed

+69728
-58
lines changed

‎Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7428,6 +7428,7 @@ ac_ct_CXX = @ac_ct_CXX@
74287428
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
74297429
ac_ct_F77 = @ac_ct_F77@
74307430
ac_ct_FC = @ac_ct_FC@
7431+
acsm_precision_LIBS = @acsm_precision_LIBS@
74317432
am__include = @am__include@
74327433
am__leading_dot = @am__leading_dot@
74337434
am__quote = @am__quote@

‎build-aux/ltmain.sh

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7496,6 +7496,11 @@ func_mode_link ()
74967496
arg=$func_stripname_result
74977497
;;
74987498

7499+
-Wl,--as-needed)
7500+
deplibs="$deplibs $arg"
7501+
continue
7502+
;;
7503+
74997504
-Wl,*)
75007505
func_stripname '-Wl,' '' "$arg"
75017506
args=$func_stripname_result
@@ -7810,6 +7815,7 @@ func_mode_link ()
78107815

78117816
case $linkmode in
78127817
lib)
7818+
as_needed_flag=
78137819
passes="conv dlpreopen link"
78147820
for file in $dlfiles $dlprefiles; do
78157821
case $file in
@@ -7821,6 +7827,7 @@ func_mode_link ()
78217827
done
78227828
;;
78237829
prog)
7830+
as_needed_flag=
78247831
compile_deplibs=
78257832
finalize_deplibs=
78267833
alldeplibs=false
@@ -7890,6 +7897,15 @@ func_mode_link ()
78907897
lib=
78917898
found=false
78927899
case $deplib in
7900+
-Wl,--as-needed)
7901+
if test prog,link = "$linkmode,$pass" ||
7902+
test lib,link = "$linkmode,$pass"; then
7903+
as_needed_flag="$deplib "
7904+
else
7905+
deplibs="$deplib $deplibs"
7906+
fi
7907+
continue
7908+
;;
78937909
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
78947910
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
78957911
if test prog,link = "$linkmode,$pass"; then
@@ -10307,6 +10323,13 @@ EOF
1030710323
test "X$libobjs" = "X " && libobjs=
1030810324
fi
1030910325

10326+
# A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds instead, but that
10327+
# comes from libtool.m4 which is part of the project being built. This should put it
10328+
# in the right place though.
10329+
if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
10330+
libobjs=$as_needed_flag$libobjs
10331+
fi
10332+
1031010333
save_ifs=$IFS; IFS='~'
1031110334
for cmd in $cmds; do
1031210335
IFS=$sp$nl
@@ -10539,8 +10562,8 @@ EOF
1053910562
compile_deplibs=$new_libs
1054010563

1054110564

10542-
func_append compile_command " $compile_deplibs"
10543-
func_append finalize_command " $finalize_deplibs"
10565+
func_append compile_command " $as_needed_flag $compile_deplibs"
10566+
func_append finalize_command " $as_needed_flag $finalize_deplibs"
1054410567

1054510568
if test -n "$rpath$xrpath"; then
1054610569
# If the user specified any rpath flags, then add them.

‎configure

Lines changed: 12 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ CFLAGS_DVL
911911
CXXFLAGS_DVL
912912
GXX_VERSION
913913
libmesh_precision_LIBS
914+
acsm_precision_LIBS
914915
PKG_CONFIG
915916
LIBMESH_LIBRARY_SUFFIX
916917
libmesh_LDFLAGS
@@ -8143,7 +8144,7 @@ fi
81438144
if test "x$compiler_brand_detected" = "xno"
81448145
then :
81458146

8146-
is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler' | grep -v 'oneAPI'`"
8147+
is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler'`"
81478148
if test "x$is_intel_icc" != "x"
81488149
then :
81498150

@@ -8190,39 +8191,6 @@ printf "%s\n" "<<< C++ compiler is Intel(R) icc 13 >>>" >&6; }
81908191
esac
81918192
compiler_brand_detected=yes
81928193

8193-
fi
8194-
8195-
is_intel_icx="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler' | grep 'oneAPI'`"
8196-
if test "x$is_intel_icx" != "x"
8197-
then :
8198-
8199-
ACSM_GXX_VERSION_STRING="`($CXX -V 2>&1) | grep 'Version '`"
8200-
case "$ACSM_GXX_VERSION_STRING" in #(
8201-
*25.*) :
8202-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 25 >>>" >&5
8203-
printf "%s\n" "<<< C++ compiler is Intel(R) icx 25 >>>" >&6; }
8204-
ACSM_GXX_VERSION=intel_icx_v25.x ;; #(
8205-
*24.*) :
8206-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 24 >>>" >&5
8207-
printf "%s\n" "<<< C++ compiler is Intel(R) icx 24 >>>" >&6; }
8208-
ACSM_GXX_VERSION=intel_icx_v24.x ;; #(
8209-
*23.*) :
8210-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 23 >>>" >&5
8211-
printf "%s\n" "<<< C++ compiler is Intel(R) icx 23 >>>" >&6; }
8212-
ACSM_GXX_VERSION=intel_icx_v23.x ;; #(
8213-
*22.*) :
8214-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 22 >>>" >&5
8215-
printf "%s\n" "<<< C++ compiler is Intel(R) icx 22 >>>" >&6; }
8216-
ACSM_GXX_VERSION=intel_icx_v22.x ;; #(
8217-
*21.*) :
8218-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 21 >>>" >&5
8219-
printf "%s\n" "<<< C++ compiler is Intel(R) icx 21 >>>" >&6; }
8220-
ACSM_GXX_VERSION=intel_icx_v21.x ;; #(
8221-
*) :
8222-
as_fn_error $? "Unsupported Intel compiler detected" "$LINENO" 5 ;;
8223-
esac
8224-
compiler_brand_detected=yes
8225-
82268194
fi
82278195

82288196
fi
@@ -26519,7 +26487,7 @@ else $as_nop
2651926487
ACSM_PARANOID_FLAGS="$ACSM_PARANOID_FLAGS -Wwrite-strings"
2652026488

2652126489
case "$ACSM_GXX_VERSION" in #(
26522-
intel_icc_*) :
26490+
intel_icc_v13.x | intel_icc_v14.x | intel_icc_v15.x | intel_icc_v16.x | intel_icc_v17.x | intel_icc_v18.x | intel_icc_v19.x | intel_icc_v20.x) :
2652326491

2652426492
ACSM_PROFILING_FLAGS="-p"
2652526493
ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -w1 -g -wd175 -wd1476 -wd1505 -wd1572 -wd488 -wd161"
@@ -26529,28 +26497,9 @@ else $as_nop
2652926497
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3 -unroll -w0 -ftz"
2653026498
ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DBG"
2653126499
;; #(
26532-
intel_icx_*) :
26533-
26534-
ACSM_PROFILING_FLAGS=""
26535-
ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -O0 -g"
26536-
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3"
26537-
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -g"
26538-
ACSM_CFLAGS_DBG="$ACSM_CFLAGS_DBG -O0 -g"
26539-
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3"
26540-
ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL -O2 -g"
26541-
;; #(
26542-
*) :
26543-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&5
26544-
printf "%s\n" "Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&6; } ;;
26545-
esac
26546-
case "$ACSM_GXX_VERSION" in #(
26547-
intel_icx_v21.x | intel_icx_v22.x | intel_icx_v23.x) :
26548-
;; #(
2654926500
*) :
26550-
26551-
CXXFLAGS="$CXXFLAGS -Werror=recommended-option"
26552-
CFLAGS="$CFLAGS -Werror=recommended-option"
26553-
;;
26501+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler" >&5
26502+
printf "%s\n" "Unknown Intel compiler" >&6; } ;;
2655426503
esac
2655526504
;; #(
2655626505
nvidia) :
@@ -26608,6 +26557,8 @@ fi
2660826557
;; #(
2660926558
clang) :
2661026559

26560+
ACSM_LDFLAGS="-Wl,-keep_dwarf_unwind -Wl,-no_compact_unwind"
26561+
2661126562
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O2 -felide-constructors -Qunused-arguments -Wunused-parameter -Wunused"
2661226563
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -felide-constructors -g -pedantic -W -Wall -Wextra -Wno-long-long"
2661326564
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -Wunused-parameter -Wunused -Wpointer-arith -Wformat -Wparentheses -Wuninitialized -Qunused-arguments -Woverloaded-virtual -fno-limit-debug-info"
@@ -26865,6 +26816,8 @@ fi
2686526816
CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL"
2686626817
CFLAGS_DBG="$ACSM_CFLAGS_DBG"
2686726818

26819+
LDFLAGS+=" $ACSM_LDFLAGS"
26820+
2686826821
ASSEMBLY_FLAGS="$ACSM_ASSEMBLY_FLAGS"
2686926822
NODEPRECATEDFLAG="$ACSM_NODEPRECATEDFLAG"
2687026823
OPROFILE_FLAGS="$ACSM_OPROFILE_FLAGS"
@@ -46533,6 +46486,8 @@ printf "%s\n" "<<< Default floating point is double precision (double) >>>" >&6;
4653346486

4653446487
fi
4653546488

46489+
46490+
4653646491
libmesh_precision_LIBS="$acsm_precision_LIBS"
4653746492

4653846493

@@ -64421,6 +64376,7 @@ esac
6442164376

6442264377
printf "%s\n"
6442364378
done
64379+
printf "%s\n" "LDFLAGS............................ : $LDFLAGS"
6442464380
printf "%s\n" "Any warnings-to-errors flags....... : $ACSM_ANY_WERROR_FLAG"
6442564381
printf "%s\n" "Any extra paranoid warning flags... : $ACSM_ANY_PARANOID_FLAGS"
6442664382
printf "%s\n" "Install dir........................ : $prefix"

‎contrib/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ ac_ct_CXX = @ac_ct_CXX@
733733
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
734734
ac_ct_F77 = @ac_ct_F77@
735735
ac_ct_FC = @ac_ct_FC@
736+
acsm_precision_LIBS = @acsm_precision_LIBS@
736737
am__include = @am__include@
737738
am__leading_dot = @am__leading_dot@
738739
am__quote = @am__quote@

0 commit comments

Comments
 (0)