Skip to content

Commit 4349051

Browse files
committed
build: reorder cxxflags in intrinsic checks
Let the user have the final say in regards to using intrinsics. Fixes: #13758 Alternaitve to #13789.
1 parent 2778ccc commit 4349051

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

configure.ac

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ if test "$enable_clmul" = "yes"; then
518518
fi
519519

520520
TEMP_CXXFLAGS="$CXXFLAGS"
521-
CXXFLAGS="$CXXFLAGS $SSE42_CXXFLAGS"
521+
CXXFLAGS="$SSE42_CXXFLAGS $CXXFLAGS"
522522
AC_MSG_CHECKING([for SSE4.2 intrinsics])
523523
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
524524
#include <stdint.h>
@@ -540,7 +540,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
540540
CXXFLAGS="$TEMP_CXXFLAGS"
541541

542542
TEMP_CXXFLAGS="$CXXFLAGS"
543-
CXXFLAGS="$CXXFLAGS $SSE41_CXXFLAGS"
543+
CXXFLAGS="$SSE41_CXXFLAGS $CXXFLAGS"
544544
AC_MSG_CHECKING([for SSE4.1 intrinsics])
545545
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
546546
#include <stdint.h>
@@ -555,7 +555,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
555555
CXXFLAGS="$TEMP_CXXFLAGS"
556556

557557
TEMP_CXXFLAGS="$CXXFLAGS"
558-
CXXFLAGS="$CXXFLAGS $AVX2_CXXFLAGS"
558+
CXXFLAGS="$AVX2_CXXFLAGS $CXXFLAGS"
559559
AC_MSG_CHECKING([for AVX2 intrinsics])
560560
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
561561
#include <stdint.h>
@@ -570,7 +570,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
570570
CXXFLAGS="$TEMP_CXXFLAGS"
571571

572572
TEMP_CXXFLAGS="$CXXFLAGS"
573-
CXXFLAGS="$CXXFLAGS $X86_SHANI_CXXFLAGS"
573+
CXXFLAGS="$X86_SHANI_CXXFLAGS $CXXFLAGS"
574574
AC_MSG_CHECKING([for x86 SHA-NI intrinsics])
575575
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
576576
#include <stdint.h>
@@ -591,7 +591,7 @@ AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_CRC_CXXFLAGS="-march=arm
591591
AX_CHECK_COMPILE_FLAG([-march=armv8-a+crc+crypto], [ARM_SHANI_CXXFLAGS="-march=armv8-a+crc+crypto"], [], [$CXXFLAG_WERROR])
592592

593593
TEMP_CXXFLAGS="$CXXFLAGS"
594-
CXXFLAGS="$CXXFLAGS $ARM_CRC_CXXFLAGS"
594+
CXXFLAGS="$ARM_CRC_CXXFLAGS $CXXFLAGS"
595595
AC_MSG_CHECKING([for ARMv8 CRC32 intrinsics])
596596
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
597597
#include <arm_acle.h>
@@ -610,7 +610,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
610610
CXXFLAGS="$TEMP_CXXFLAGS"
611611

612612
TEMP_CXXFLAGS="$CXXFLAGS"
613-
CXXFLAGS="$CXXFLAGS $ARM_SHANI_CXXFLAGS"
613+
CXXFLAGS="$ARM_SHANI_CXXFLAGS $CXXFLAGS"
614614
AC_MSG_CHECKING([for ARMv8 SHA-NI intrinsics])
615615
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
616616
#include <arm_acle.h>

0 commit comments

Comments
 (0)