[dpdk-dev,v2,4/4] ifpgai_rawdev: fix the clang compiling issue

Message ID 1526376227-25534-4-git-send-email-gavin.hu@arm.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation fail Compilation issues

Commit Message

Gavin Hu May 15, 2018, 9:23 a.m. UTC
  Newly introduced #pragma pack(1) in the header file caused comipiling
issues for the files who included it.

In file included from ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c:5:
In file included from ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h:8:
~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_hw.h:8:10: error: the current #pragma
pack aligment value is modified in the included file [-Werror,-Wpragma-pack]
~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_defines.h:100:9: note: previous
'#pragma pack' directive that modifies alignment is here.

The fix is to change the #pragma pack alignment locally and not have
effect on other files who included this header file.

Signed-off-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
---
 drivers/raw/ifpga_rawdev/base/ifpga_defines.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
  

Comments

Jerin Jacob May 16, 2018, 5:13 a.m. UTC | #1
-----Original Message-----
> Date: Tue, 15 May 2018 05:23:47 -0400
> From: Gavin Hu <gavin.hu@arm.com>
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v2 4/4] ifpgai_rawdev: fix the clang compiling
>  issue
> X-Mailer: git-send-email 2.1.4
> 
> Newly introduced #pragma pack(1) in the header file caused comipiling
> issues for the files who included it.
> 
> In file included from ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c:5:
> In file included from ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h:8:
> ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_hw.h:8:10: error: the current #pragma
> pack aligment value is modified in the included file [-Werror,-Wpragma-pack]
> ~/dpdk/drivers/raw/ifpga_rawdev/base/ifpga_defines.h:100:9: note: previous
> '#pragma pack' directive that modifies alignment is here.
> 
> The fix is to change the #pragma pack alignment locally and not have
> effect on other files who included this header file.
> 
> Signed-off-by: Gavin Hu <gavin.hu@arm.com>
> Reviewed-by: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>

Perhaps this fixes compilation issues clang6 + x86 too.

Please change the  subject line to start with raw/ifpga:....

With above change:
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>



> ---
>  drivers/raw/ifpga_rawdev/base/ifpga_defines.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga_rawdev/base/ifpga_defines.h
> index 0b9622d..aa02527 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_ */
> -- 
> 2.1.4
>
  

Patch

diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga_rawdev/base/ifpga_defines.h
index 0b9622d..aa02527 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_ */