diff --git a/compiler/aggas.pas b/compiler/aggas.pas
index 1c3cc37977..d9dfb03db9 100644
--- a/compiler/aggas.pas
+++ b/compiler/aggas.pas
@@ -1177,15 +1177,6 @@ implementation
                   else
                     AsmWriteln(tai_symbol(hp).sym.name);
                 end;
-               if (target_info.system in [system_mipsel_linux,system_mipseb_linux])
-                  and (tai_symbol(hp).sym.typ = AT_FUNCTION) then
-                begin
-                  AsmWrite(#9'.ent'#9);
-                  if replaceforbidden then
-                    AsmWriteln(ReplaceForbiddenAsmSymbolChars(tai_symbol(hp).sym.name))
-                  else
-                    AsmWriteln(tai_symbol(hp).sym.name);
-                end;
                if (target_info.system = system_powerpc64_linux) and
                  (tai_symbol(hp).sym.typ = AT_FUNCTION) then
                  begin
@@ -1256,28 +1247,29 @@ implementation
                AsmWriteLn(#9'.thumb_func');
              end;
 {$endif arm}
-{$if defined(alpha)}
            ait_ent:
              begin
-               AsmWriteLn(#9'.ent'#9+tai_ent(hp).Name);
+               AsmWrite(#9'.ent'#9);
+			   if replaceforbidden then
+                 AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_ent(hp).Name))
+               else
+                 AsmWriteLn(tai_ent(hp).Name);
              end;
-{$endif alpha}
-           ait_symbol_end :
+           ait_ent_end:
+             begin
+               AsmWrite(#9'.end'#9);
+			   if replaceforbidden then
+                 AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_ent_end(hp).Name))
+               else
+  			     AsmWriteLn(tai_ent_end(hp).Name);
+             end;
+            ait_symbol_end :
              begin
                if tf_needs_symbol_size in target_info.flags then
                 begin
                   s:=target_asm.labelprefix+'e'+tostr(symendcount);
                   inc(symendcount);
                   AsmWriteLn(s+':');
-                  if (target_info.system in [system_mipsel_linux,system_mipseb_linux])
-                     and (tai_symbol_end(hp).sym.typ = AT_FUNCTION) then
-                    begin
-                      AsmWrite(#9'.end'#9);
-                      if replaceforbidden then
-                        AsmWriteLn(ReplaceForbiddenAsmSymbolChars(tai_symbol_end(hp).sym.name))
-                      else
-                        AsmWriteLn(tai_symbol_end(hp).sym.name);
-                    end;
                   AsmWrite(#9'.size'#9);
                   if (target_info.system = system_powerpc64_linux) and (tai_symbol_end(hp).sym.typ = AT_FUNCTION) then
                     AsmWrite('.');