[PATCH 3/3] "-Wall -Wextra -Werror" compilation patches - part 3/3 grub/grub-core/lib/libgcrypt-grub

[Doron Tsur]

Tests: Ubuntu 13.10 compilation
.../configure --prefix=/usr --enable-mm-debug --enable-cache-stats 
EFI_ARCH=x86_64 --with-platform=efi --enable-boot-time CFLAGS="-Wall -Wextra 
-Werror" && make
---
 conf/Makefile.common |    2 +-
 util/import_gcry.py  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/Makefile.common b/conf/Makefile.common
index 8a71f13..9b898d2 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -79,7 +79,7 @@ CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib 
-I$(top_srcdir)/grub-core/g
 CFLAGS_POSIX = -fno-builtin
 CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
 
-CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers -Wno-redundant-decls 
-Wno-undef $(CFLAGS_POSIX)
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers -Wno-redundant-decls 
-Wno-undef $(CFLAGS_POSIX) -Wno-empty-body
 CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap $(CPPFLAGS_POSIX) 
-D_GCRYPT_IN_LIBGCRYPT=1 -I$(top_srcdir)/include/grub/gcrypt
 
 CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 1319a8c..9e00b8b 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -473,7 +473,7 @@ for cipher_file in cipher_files:
                 conf.write ("  cflags = '$(CFLAGS_GCRY) -Wno-redundant-decls 
-Wno-sign-compare';\n")
             elif modname == "gcry_rijndael" or modname == "gcry_md4" or 
modname == "gcry_md5" or modname == "gcry_rmd160" or modname == "gcry_sha1" or 
modname == "gcry_sha256" or modname == "gcry_sha512" or modname == "gcry_tiger":
                 # Alignment checked by hand
-                conf.write ("  cflags = '$(CFLAGS_GCRY) -Wno-cast-align';\n");
+                conf.write ("  cflags = '$(CFLAGS_GCRY) -Wno-cast-align 
-fno-strict-aliasing';\n");
             else:
                 conf.write ("  cflags = '$(CFLAGS_GCRY)';\n");
             conf.write ("  cppflags = '$(CPPFLAGS_GCRY)';\n");
-- 
1.7.8.2