X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=configure.ad;fp=configure.ad;h=1ede5e3075984a99ebfb9a3b94fcd1113f876c87;hp=8ee9d61b87f5e4e494e6f19de149346b9fd56ebb;hb=4cd9e768a1d31732df0a9029f33dc1fd34f69b8c;hpb=20f70616bc5e6b0ccebe80055f4d217ee5aee625

diff --git a/configure.ad b/configure.ad
index 8ee9d61b..1ede5e30 100644
--- a/configure.ad
+++ b/configure.ad
@@ -361,13 +361,21 @@ have_assembler=false
 if test x$want_asm = xtrue; then
   AC_PATH_PROG([NASM], [nasm], [no])
   if test "x$NASM" != "xno"; then
-    SILC_ASSEMBLER="$NASM -O2 -felf"
+    if test x$cpu_x86_64 = xtrue; then
+      SILC_ASSEMBLER="$NASM -O2 -felf64"
+    else
+      SILC_ASSEMBLER="$NASM -O2 -felf"
+    fi
     have_assembler=true
   fi
 
   AC_PATH_PROG([YASM], [yasm], [no])
   if test "x$YASM" != "xno"; then
-    SILC_ASSEMBLER="$YASM -Xgnu -felf"
+    if test x$cpu_x86_64 = xtrue; then
+      SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+    else
+      SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+    fi
     have_assembler=true
   fi
 fi