From 2d610e9be3ac28d43cad6c3414770a8556ad8c25 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Thu, 30 Aug 2001 20:57:09 +0000
Subject: [PATCH]   * asbsd merged

---
 compiler/assemble.pas      | 11 ++++++++---
 compiler/i386/ag386att.pas | 25 ++++++++++++++++++++++++-
 compiler/options.pas       | 13 ++++++++++++-
 compiler/systems.pas       |  7 +++++--
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/compiler/assemble.pas b/compiler/assemble.pas
index 594b47f4e4..3f4e41bdb8 100644
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@@ -216,10 +216,12 @@ Implementation
         DoPipe:=(cs_asm_pipe in aktglobalswitches) and
                 not(cs_asm_leave in aktglobalswitches)
 {$ifdef i386}
-                and (aktoutputformat=as_i386_as)
+                and ((aktoutputformat=as_i386_as) or
+                     (aktoutputformat=as_i386_asbsd));
 {$endif i386}
 {$ifdef m68k}
-                and (aktoutputformat=as_m68k_as);
+                and ((aktoutputformat=as_m68k_as) or
+                     (aktoutputformat=as_m68k_asbsd));
 {$endif m68k}
       end;
 
@@ -1534,7 +1536,10 @@ Implementation
 end.
 {
   $Log$
-  Revision 1.25  2001-08-30 19:43:50  peter
+  Revision 1.26  2001-08-30 20:57:09  peter
+    * asbsd merged
+
+  Revision 1.25  2001/08/30 19:43:50  peter
     * detect duplicate labels
 
   Revision 1.24  2001/08/26 13:36:35  florian
diff --git a/compiler/i386/ag386att.pas b/compiler/i386/ag386att.pas
index 281c69b06c..47bc632365 100644
--- a/compiler/i386/ag386att.pas
+++ b/compiler/i386/ag386att.pas
@@ -916,6 +916,26 @@ interface
               '.stab','.stabstr')
           );
 
+       as_i386_asbsd_info : tasminfo =
+          (
+            id           : as_i386_asbsd;
+            idtxt  : 'ASBSD';
+            asmbin : 'as';
+            asmcmd : '-o $OBJ $ASM';
+            supported_target : target_any;
+            outputbinary: false;
+            allowdirect : true;
+            externals : false;
+            needar : true;
+            labelprefix_only_inside_procedure : false;
+            labelprefix : 'L';
+            comment : '# ';
+            secnames : ('',
+              '.text','.data','.bss',
+              '','','','','','',
+              '.stab','.stabstr')
+          );
+
        as_i386_as_aout_info : tasminfo =
           (
             id           : as_i386_as_aout;
@@ -965,7 +985,10 @@ initialization
 end.
 {
   $Log$
-  Revision 1.9  2001-05-06 17:13:23  jonas
+  Revision 1.10  2001-08-30 20:57:10  peter
+    * asbsd merged
+
+  Revision 1.9  2001/05/06 17:13:23  jonas
     * completed incomplete typed constant records
 
   Revision 1.8  2001/04/21 15:33:03  peter
diff --git a/compiler/options.pas b/compiler/options.pas
index e60db1d388..424b79a06c 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -1470,6 +1470,14 @@ begin
       def_symbol('ENDIAN_BIG');
   end;
 
+{$ifdef m68k}
+  { Disable fpu emulation for linux and netbsd on m68k machines }
+  { FIXME: this overrides possible explicit command line emulation setting,
+    but this isn't supported yet anyhow PM }
+  if (target_info.target in [target_m68k_netbsd,target_m68k_linux]) then
+   exclude(initmoduleswitches,cs_fp_emulation);
+{$endif m68k}
+
 { write logo if set }
   if option.DoWriteLogo then
    option.WriteLogo;
@@ -1595,7 +1603,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.57  2001-08-30 20:13:53  peter
+  Revision 1.58  2001-08-30 20:57:09  peter
+    * asbsd merged
+
+  Revision 1.57  2001/08/30 20:13:53  peter
     * rtti/init table updates
     * rttisym for reusable global rtti/init info
     * support published for interfaces
diff --git a/compiler/systems.pas b/compiler/systems.pas
index 69db3f4489..ac8b364d28 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -64,7 +64,7 @@ interface
        );
 
        tasm = (as_none
-            ,as_i386_as,as_i386_as_aout,as_i386_asw,
+            ,as_i386_as,as_i386_asbsd,as_i386_as_aout,as_i386_asw,
               as_i386_nasmcoff,as_i386_nasmwin32,
               as_i386_nasmelf,as_i386_nasmobj,
               as_i386_tasm,as_i386_masm,
@@ -641,7 +641,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.24  2001-08-19 11:22:24  peter
+  Revision 1.25  2001-08-30 20:57:10  peter
+    * asbsd merged
+
+  Revision 1.24  2001/08/19 11:22:24  peter
     * palmos support from v10 merged
 
   Revision 1.23  2001/08/12 17:57:07  peter