diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index 4278a290ba..a69a704ac6 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -841,7 +841,9 @@ unit pexpr;
 {****************************************************************************
                                Factor
 ****************************************************************************}
-
+{$ifdef fpc}
+{$maxfpuregisters 0}
+{$endif fpc}
     function factor(getaddr : boolean) : ptree;
       var
          l      : longint;
@@ -1897,7 +1899,9 @@ _LECKKLAMMER : begin
         factor:=p1;
         check_tokenpos;
       end;
-
+{$ifdef fpc}
+{$maxfpuregisters default}
+{$endif fpc}
 
 {****************************************************************************
                              Sub_Expr
@@ -2124,7 +2128,11 @@ _LECKKLAMMER : begin
 end.
 {
   $Log$
-  Revision 1.168  2000-02-09 13:22:56  peter
+  Revision 1.169  2000-02-13 14:21:50  jonas
+    * modifications to make the compiler functional when compiled with
+      -Or
+
+  Revision 1.168  2000/02/09 13:22:56  peter
     * log truncated
 
   Revision 1.167  2000/01/19 22:41:58  florian
diff --git a/compiler/popt386.pas b/compiler/popt386.pas
index 2bffbd9712..56830c25e5 100644
--- a/compiler/popt386.pas
+++ b/compiler/popt386.pas
@@ -44,7 +44,7 @@ Uses
 {$ifdef finaldestdebug}
   cobjects,
 {$endif finaldestdebug}
-  cpubase,cpuasm,DAOpt386,cobjects;
+  cpubase,cpuasm,DAOpt386;
 
 Function RegUsedAfterInstruction(Reg: TRegister; p: Pai; Var UsedRegs: TRegSet): Boolean;
 Begin
@@ -1890,7 +1890,11 @@ End.
 
 {
  $Log$
- Revision 1.86  2000-02-12 19:28:56  jonas
+ Revision 1.87  2000-02-13 14:21:50  jonas
+   * modifications to make the compiler functional when compiled with
+     -Or
+
+ Revision 1.86  2000/02/12 19:28:56  jonas
    * fix for imul optimization in popt386 (exclude top_ref as first
      argument)
    * in csopt386: change "mov reg1,reg2; <several operations on reg2>;
diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas
index af06323570..3ab5aefe10 100644
--- a/compiler/ptconst.pas
+++ b/compiler/ptconst.pas
@@ -51,6 +51,9 @@ unit ptconst;
        hcgdata;
 
 
+{$ifdef fpc}
+{$maxfpuregisters 0}
+{$endif fpc}
     { this procedure reads typed constants }
     procedure readtypedconst(def : pdef;sym : ptypedconstsym;no_change_allowed : boolean);
 
@@ -765,11 +768,18 @@ unit ptconst;
          else Message(parser_e_type_const_not_possible);
          end;
       end;
+{$ifdef fpc}
+{$maxfpuregisters default}
+{$endif fpc}
 
 end.
 {
   $Log$
-  Revision 1.62  2000-02-09 13:23:01  peter
+  Revision 1.63  2000-02-13 14:21:51  jonas
+    * modifications to make the compiler functional when compiled with
+      -Or
+
+  Revision 1.62  2000/02/09 13:23:01  peter
     * log truncated
 
   Revision 1.61  2000/01/07 01:14:33  peter
diff --git a/compiler/tcadd.pas b/compiler/tcadd.pas
index d067f528ee..8044bd9a6a 100644
--- a/compiler/tcadd.pas
+++ b/compiler/tcadd.pas
@@ -172,6 +172,10 @@ implementation
           end;
       end;
 
+{$ifdef fpc}
+{$maxfpuregisters 0}
+{$endif fpc}
+
       var
          t,hp    : ptree;
          ot,
@@ -1254,7 +1258,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.65  2000-02-09 13:23:06  peter
+  Revision 1.66  2000-02-13 14:21:51  jonas
+    * modifications to make the compiler functional when compiled with
+      -Or
+
+  Revision 1.65  2000/02/09 13:23:06  peter
     * log truncated
 
   Revision 1.64  2000/02/04 08:47:10  florian
diff --git a/compiler/tcinl.pas b/compiler/tcinl.pas
index e037694447..b752555cfe 100644
--- a/compiler/tcinl.pas
+++ b/compiler/tcinl.pas
@@ -46,6 +46,9 @@ implementation
                              FirstInLine
 *****************************************************************************}
 
+{$ifdef fpc}
+{$maxfpuregisters 0}
+{$endif fpc}
     procedure firstinline(var p : ptree);
       var
          vl,vl2  : longint;
@@ -1275,12 +1278,18 @@ implementation
              p^.resulttype:=generrordef;
          dec(parsing_para_level);
        end;
-
+{$ifdef fpc}
+{$maxfpuregisters default}
+{$endif fpc}
 
 end.
 {
   $Log$
-  Revision 1.65  2000-02-09 13:23:07  peter
+  Revision 1.66  2000-02-13 14:21:51  jonas
+    * modifications to make the compiler functional when compiled with
+      -Or
+
+  Revision 1.65  2000/02/09 13:23:07  peter
     * log truncated
 
   Revision 1.64  2000/01/07 01:14:45  peter