diff --git a/compiler/arm/narmadd.pas b/compiler/arm/narmadd.pas
index 46dc093453..07bc60f540 100644
--- a/compiler/arm/narmadd.pas
+++ b/compiler/arm/narmadd.pas
@@ -95,24 +95,24 @@ interface
                 if nf_swaped in Flags then
                   case NodeType of
                     ltn:
-                      GetResFlags:=F_CC;
-                    lten:
-                      GetResFlags:=F_LS;
-                    gtn:
                       GetResFlags:=F_HI;
-                    gten:
+                    lten:
                       GetResFlags:=F_CS;
+                    gtn:
+                      GetResFlags:=F_CC;
+                    gten:
+                      GetResFlags:=F_LS;
                   end
                 else
                   case NodeType of
                     ltn:
-                      GetResFlags:=F_HI;
-                    lten:
-                      GetResFlags:=F_CS;
-                    gtn:
                       GetResFlags:=F_CC;
-                    gten:
+                    lten:
                       GetResFlags:=F_LS;
+                    gtn:
+                      GetResFlags:=F_HI;
+                    gten:
+                      GetResFlags:=F_CS;
                   end;
               end;
         end;
@@ -301,7 +301,7 @@ interface
                end;
           end
         else
-          exprasmlist.concat(taicpu.op_reg_reg(A_CMP,right.location.register,left.location.register));
+          exprasmlist.concat(taicpu.op_reg_reg(A_CMP,left.location.register,right.location.register));
 
         location_reset(location,LOC_FLAGS,OS_NO);
         location.resflags:=getresflags(unsigned);
@@ -314,7 +314,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.7  2004-01-22 20:13:18  florian
+  Revision 1.8  2004-01-23 00:01:48  florian
+    * another fix to flag handling
+
+  Revision 1.7  2004/01/22 20:13:18  florian
     * fixed several issues with flags
 
   Revision 1.6  2004/01/22 01:47:15  florian
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 8c6eb6fdc7..e68151f7f1 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -680,7 +680,7 @@ const msgtxt : array[0..000149,1..240] of char=(
   '11039_E_Unknown code page'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $F','PCTARGET'+
   #010+
-  'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-2004 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+