diff --git a/compiler/globtype.pas b/compiler/globtype.pas
index cf00789c6a..0453820d1d 100644
--- a/compiler/globtype.pas
+++ b/compiler/globtype.pas
@@ -96,7 +96,7 @@ interface
          cs_load_gpc_unit,
          { optimizer }
          cs_regalloc,cs_uncertainopts,cs_littlesize,cs_optimize,
-         cs_fastoptimize, cs_slowoptimize,
+         cs_fastoptimize, cs_slowoptimize,cs_align,
          { browser }
          cs_browser_log,
          { debugger }
@@ -199,7 +199,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.30  2000-05-16 20:19:05  pierre
+  Revision 1.31  2000-05-31 06:57:11  florian
+    * first implementation of -Oa switch
+
+  Revision 1.30  2000/05/16 20:19:05  pierre
     + -CR option to enable check for object virtual method
 
   Revision 1.29  2000/02/28 17:23:57  daniel
@@ -265,4 +268,4 @@ end.
     * C alignment added for records
     * PPU version increased to solve .12 <-> .13 probs
 
-}
+}
\ No newline at end of file
diff --git a/compiler/opts386.pas b/compiler/opts386.pas
index cccd70d317..3bb280ea69 100644
--- a/compiler/opts386.pas
+++ b/compiler/opts386.pas
@@ -50,7 +50,10 @@ begin
              Begin
                case opt[j] of
                  '-' : initglobalswitches:=initglobalswitches-[cs_optimize,cs_fastoptimize,cs_slowoptimize,cs_littlesize,
-                           cs_regalloc,cs_uncertainopts];
+                           cs_regalloc,cs_uncertainopts,cs_align];
+{$ifdef OPTALIGN}
+                 'a' : initglobalswitches:=initglobalswitches+[cs_align];
+{$endif OPTALIGN}
                  'g' : initglobalswitches:=initglobalswitches+[cs_littlesize];
                  'G' : initglobalswitches:=initglobalswitches-[cs_littlesize];
                  'r' : initglobalswitches:=initglobalswitches+[cs_regalloc];
@@ -111,7 +114,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.19  2000-02-09 13:22:55  peter
+  Revision 1.20  2000-05-31 06:58:50  florian
+    * first implementation of -Oa switch
+
+  Revision 1.19  2000/02/09 13:22:55  peter
     * log truncated
 
   Revision 1.18  2000/01/23 21:29:17  florian
@@ -125,4 +131,4 @@ end.
     * all tokens now start with an underscore
     * PowerPC compiles!!
 
-}
+}
\ No newline at end of file