* grub-core/fs/iso9660.c (grub_iso9660_iterate_dir): Force inlining of

	add_part to workaround compiler bug.

diff --git a/ChangeLog b/ChangeLog
index 574f63cb46086f39b63a0a5d536acd927bbd251f..8f30b557abda5b5f58f72dd5cf54aabc0a5a5538 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/iso9660.c (grub_iso9660_iterate_dir): Force inlining of
+       add_part to workaround compiler bug.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/kernel.h (FOR_MODULES): Preserve alignment invariants.

diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 7b1e32f7cdbbfe2cb3f5cc44d5393314bfa4bf55..048c361a6c73c0d2045be9cf93ce4ba4b4c9b602 100644 (file)
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -533,10 +533,12 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
   grub_off_t len;
   char *symlink = 0;
 
-  auto void add_part (const char *part, int len);
-
   /* Extend the symlink.  */
-  void add_part (const char *part, int len2)
+  auto inline void  __attribute__ ((always_inline)) add_part (const char *part,
+                                                             int len2);
+
+  auto inline void  __attribute__ ((always_inline)) add_part (const char *part,
+                                                             int len2)
     {
       int size = symlink ? grub_strlen (symlink) : 0;