--- Merging r31451 into '.':

U    compiler/systems/t_linux.pas
--- Recording mergeinfo for merge of r31451 into '.':
 U   .

# revisions: 31451

git-svn-id: branches/fixes_3_0@31898 -

compiler/systems/t_linux.pas

@@ -702,7 +702,7 @@ begin
 {$endif x86_64}
 
 {$ifdef ARM}
-      if target_info.abi=abi_eabi then
+      if target_info.abi in [abi_eabi,abi_eabihf] then
         begin
           { from GNU ld (CodeSourcery Sourcery G++ Lite 2007q3-53) 2.18.50.20070820 }
           add('/* Script for -z combreloc: combine and sort reloc sections */');