From b4d3468f684385086d1146a8f1218ac2d86b3698 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Mon, 6 Jan 2025 15:19:34 +0100
Subject: [PATCH]   * use HAS_MINMAX_INTRINSICS define

---
 compiler/nflw.pas | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/compiler/nflw.pas b/compiler/nflw.pas
index 86c8f303e4..5cd718ddd6 100644
--- a/compiler/nflw.pas
+++ b/compiler/nflw.pas
@@ -1570,14 +1570,19 @@ implementation
         include(flags,nf_internal);
       end;
 
+{$ifndef llvm}
+  {$if defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64) or defined(riscv)}
+    {$define HAS_MINMAX_INTRINSICS}
+  {$endif defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64) or defined(riscv)}
+{$endif llvm}
 
     function tifnode.internalsimplify(warn: boolean) : tnode;
-{$if defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64)}
+{$if defined(HAS_MINMAX_INTRINSICS)}
       var
         thenstmnt, elsestmnt: tnode;
         in_nr: tinlinenumber;
         paratype: tdef;
-{$endif defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64)}
+{$endif defined(HAS_MINMAX_INTRINSICS)}
       begin
         result:=nil;
         { optimize constant expressions }
@@ -1604,8 +1609,7 @@ implementation
                     CGMessagePos(right.fileinfo,cg_w_unreachable_code);
                end;
           end;
-{$ifndef llvm}
-{$if defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64)}
+{$if defined(HAS_MINMAX_INTRINSICS)}
         { use min/max intrinsic?
           convert (with <op> being <, >, >=, <=
           if a <op> b then
@@ -1733,8 +1737,7 @@ implementation
                 );
             node_reset_pass1_write(Result);
           end;
-{$endif defined(i386) or defined(x86_64) or defined(xtensa) or defined(aarch64)}
-{$endif llvm}
+{$endif defined(HAS_MINMAX_INTRINSICS)}
       end;