From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 7 Nov 2013 01:25:31 +0000 (+0100)
Subject: 	Remove vestiges of -Wunsafe-loop-optimisations.
X-Git-Tag: grub-2.02-beta1~467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0ebb3fc2ea61ded84bb5dcb39b794cefcf0007;p=thirdparty%2Fgrub.git

	Remove vestiges of -Wunsafe-loop-optimisations.

	* conf/Makefile.common (CFLAGS_GNULIB): Remove
	-Wno-unsafe-loop-optimisations.
	* grub-core/commands/legacycfg.c: Remove -Wunsafe-loop-optimisations
	pragma.
	* grub-core/io/gzio.c: Likewise.
	* grub-core/script/parser.y: Likewise.
	* grub-core/script/yylex.l: Likewise.
	* util/grub-mkfont.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index bf926a007..7236ad756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove vestiges of -Wunsafe-loop-optimisations.
+
+	* conf/Makefile.common (CFLAGS_GNULIB): Remove
+	-Wno-unsafe-loop-optimisations.
+	* grub-core/commands/legacycfg.c: Remove -Wunsafe-loop-optimisations
+	pragma.
+	* grub-core/io/gzio.c: Likewise.
+	* grub-core/script/parser.y: Likewise.
+	* grub-core/script/yylex.l: Likewise.
+	* util/grub-mkfont.c: Likewise.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkfont.c (process_cursive): Remove nested function.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 0852d0a51..9eaff2e49 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -102,7 +102,7 @@ grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
 starfielddir = $(pkgdatadir)/themes/starfield
 
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-old-style-definition -Wno-unsafe-loop-optimizations
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -Wno-old-style-definition
 CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_POSIX = -fno-builtin
diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
index ac6a2136d..103380754 100644
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -546,8 +546,6 @@ struct legacy_md5_password
   grub_uint8_t hash[MD5_HASHLEN];
 };
 
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-
 static int
 check_password_md5_real (const char *entered,
 			 struct legacy_md5_password *pw)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 6f93b30e4..59ad6daff 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -363,8 +363,6 @@ static ush mask_bits[] =
   0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
 };
 
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-
 #define NEEDBITS(n) do {while(k<(n)){b|=((ulg)get_byte(gzio))<<k;k+=8;}} while (0)
 #define DUMPBITS(n) do {b>>=(n);k-=(n);} while (0)
 
diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y
index 74c813bbe..1d60e9de2 100644
--- a/grub-core/script/parser.y
+++ b/grub-core/script/parser.y
@@ -32,7 +32,6 @@
 
 #pragma GCC diagnostic ignored "-Wunreachable-code"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
 
 %}
 
diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
index f7f463804..6c61f855f 100644
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@ -28,7 +28,6 @@
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wsign-compare"
 
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index c576be6a4..0d8eb787c 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -707,8 +707,6 @@ write_be16_section (const char *name, grub_uint16_t data, int* offset,
   *offset += 10;
 }
 
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-
 static void
 print_glyphs (struct grub_font_info *font_info)
 {