[coreboot-gerrit] Patch set updated for coreboot: cbfstool: clang build error when comparing enum

[Zheng Bao (zheng.bao@amd.com)]

Zheng Bao (zheng.bao at amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12330

-gerrit

commit 04acd214403bbfce95bd1229644f6286c44129cb
Author: zbao <fishbaozi at gmail.com>
Date:   Thu Nov 5 14:35:57 2015 +0800

    cbfstool: clang build error when comparing enum
    
    If HOSTCC=clang, the -Wtautological-constant-out-of-range-compare is
    set automaticaaly. That assume the value of type enum is in the defined
    range. Then testing if a type enum is out of range causes build error.
    
    Error:
    coreboot/util/cbfstool/cbfs_image.c:1387:16: error:
     comparison of constant 4 with expression of type 'enum vb2_hash_algorithm'
     is always false [-Werror,-Wtautological-constant-out-of-range-compare]
     if (hash_type >= CBFS_NUM_SUPPORTED_HASHES)
        ~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~
    1 error generated.
    
    clang version:
    FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
    Target: x86_64-unknown-freebsd10.2
    Thread model: posix
    
    Change-Id: I3e1722bf6f9553793a9f0c7f4e790706b6938522
    Signed-off-by: zbao <fishbaozi at gmail.com>
---
 util/cbfstool/cbfs_image.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 2b25011..1cfe90d 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -1389,7 +1389,9 @@ struct cbfs_file_attribute *cbfs_add_file_attr(struct cbfs_file *header,
 int cbfs_add_file_hash(struct cbfs_file *header, struct buffer *buffer,
 	enum vb2_hash_algorithm hash_type)
 {
-	if (hash_type >= CBFS_NUM_SUPPORTED_HASHES)
+	uint32_t hash_index = hash_type;
+
+	if (hash_index >= CBFS_NUM_SUPPORTED_HASHES)
 		return -1;
 
 	unsigned hash_size = widths_cbfs_hash[hash_type];