[PATCH] remove always_inline from fs/iso9660.c, caused gcc error

[Andrey Borzenkov]

gcc -DHAVE_CONFIG_H -I.   -Wall -W -I./include -DGRUB_UTIL=1 
-DGRUB_LIBDIR=\"/usr/local/lib64/grub\" -DLOCALEDIR=\"/usr/local/share/locale\" 
-DGRUB_FILE=\"grub-core/fs/iso9660.c\" -I. -I. -I. -I. -I./include -I./include 
-I./grub-core/lib/libgcrypt-grub/include -I./grub-core/lib/libgcrypt-grub/src/  
-I./grub-core/lib/minilzo -I./grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H \
              -Wall -W -Wshadow -Wold-style-definition -Wpointer-arith -Wundef 
-Wextra -Waddress -Wattributes -Wcast-align -Wchar-subscripts -Wcomment 
-Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wempty-body 
-Wendif-labels -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k 
-Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Winit-self 
-Wint-to-pointer-cast -Winvalid-pch -Wmain -Wmissing-braces 
-Wmissing-field-initializers -Wmissing-format-attribute -Wmissing-noreturn 
-Wmultichar -Wnonnull -Woverflow -Wparentheses -Wpointer-arith 
-Wpointer-to-int-cast -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare 
-Wstrict-aliasing -Wswitch -Wtrigraphs -Wundef -Wunknown-pragmas -Wunused 
-Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  
-Wunused-variable -Wvariadic-macros -Wvolatile-register-var -Wwrite-strings 
-Wnested-externs -Wstrict-prototypes -Wpointer-sign -Werror  -fno-builtin 
-Wno-undef -Wno-error=missing-noreturn \
             -MT grub-core/fs/libgrubmods_a-iso9660.o -MD -MP -MF 
grub-core/fs/.deps-util/libgrubmods_a-iso9660.Tpo -c -o 
grub-core/fs/libgrubmods_a-iso9660.o `test -f 'grub-core/fs/iso9660.c' || echo 
'./'`grub-core/fs/iso9660.c
grub-core/fs/iso9660.c:528:1: error: always_inline function might not be 
inlinable [-Werror=attributes]
cc1: all warnings being treated as errors

address@hidden:~/build/grub> gcc --version
gcc (SUSE Linux) 4.7.1 20120723 [gcc-4_7-branch revision 189773]
Copyright (C) 2012 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Signed-off-by: Andrey Borzenkov <address@hidden>

---
 ChangeLog              |    5 +++++
 grub-core/fs/iso9660.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cacba37..9cab5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-04  Andrey Borzenkov <address@hidden>
+
+       * grub-core/fs/iso9660.c (add_part): Remove always_inline attribute
+       causing gcc error with gcc 4.7.1.
+
 2013-03-03  Vladimir Serbinenko  <address@hidden>
 
        Remove all trampoline support. Add -Wtrampolines when
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 01a07b8..cdbd6dc 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -524,7 +524,7 @@ struct iterate_dir_ctx
 };
 
   /* Extend the symlink.  */
-static void  __attribute__ ((always_inline))
+static void
 add_part (struct iterate_dir_ctx *ctx,
          const char *part,
          int len2)
-- 
tg: (ddda55c..) fu/iso9660_always_inline (depends on: master)