--- a/packages/hal/synth/i386linux/current/ChangeLog
+++ b/packages/hal/synth/i386linux/current/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-05  John Dallaway  <john@dallaway.org.uk>
+
+	* src/syscall-i386-linux-1.0.S: Fix .size and .type expressions to
+	avoid build error with binutils 2.21.x. Patch from Tom Schouten.
+
 2009-08-11  Bart Veer  <bartv@ecoscentric.com>
 
 	* src/tls.c: new module for TLS (thread local storage) support as
@@ -427,7 +432,7 @@ Mon Nov  9 15:18:11 GMT 1998   Chris Pro
 // ####GPLCOPYRIGHTBEGIN####                                                
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2011 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     

--- a/packages/hal/synth/i386linux/current/src/syscall-i386-linux-1.0.S
+++ b/packages/hal/synth/i386linux/current/src/syscall-i386-linux-1.0.S
@@ -444,8 +444,8 @@ cyg_hal_sys_restore_rt:
         movl    $SYS_rt_sigreturn, %eax
         int     $0x80
 1:              
-        .type __restore_rt,@function
-        .size __restore_rt,1b - __restore_rt
+        .type cyg_hal_sys_restore_rt,@function
+        .size cyg_hal_sys_restore_rt,1b - cyg_hal_sys_restore_rt
                 
         .align 8
         .global cyg_hal_sys_restore
@@ -454,5 +454,5 @@ cyg_hal_sys_restore:
         movl    $SYS_sigreturn, %eax
         int     $0x80
 1:              
-        .type __restore,@function
-        .size __restore,1b - __restore
+        .type cyg_hal_sys_restore,@function
+        .size cyg_hal_sys_restore,1b - cyg_hal_sys_restore