From: Gavin Hu Date: Thu, 17 May 2018 02:46:10 +0000 (+0800) Subject: raw/ifpga: fix ARM build with clang X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=e8995ed72c863f6d8ffb8cbdab8b855d565c0a3d raw/ifpga: fix ARM build with clang The patch fixes the compile issue with clang on ARM64, as well as clang + X86 builing hosts. Newly introduced #pragma pack(1) in the header file caused compiling issues for the files who included it. In file included from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c:5: In file included from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h:8: drivers/raw/ifpga_rawdev/base/ifpga_hw.h:8:10: error: the current #pragma pack alignment value is modified in the included file The fix is to change the #pragma pack alignment locally and not have effect on other files who included this header file. Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code") Signed-off-by: Gavin Hu Reviewed-by: Honnappa Nagarahalli Reviewed-by: Jerin Jacob --- diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga_rawdev/base/ifpga_defines.h index 0b9622d5f9..aa02527208 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h +++ b/drivers/raw/ifpga_rawdev/base/ifpga_defines.h @@ -97,7 +97,7 @@ enum port_feature_id { /* * All headers and structures must be byte-packed to match the spec. */ -#pragma pack(1) +#pragma pack(push, 1) struct feature_header { union { @@ -1659,4 +1659,5 @@ struct bts_header { (((bts_hdr)->guid_h == GBS_GUID_H) && \ ((bts_hdr)->guid_l == GBS_GUID_L)) +#pragma pack(pop) #endif /* _BASE_IFPGA_DEFINES_H_ */