[SFrame-V3] sframe: gas: libsframe: remove padding field from FDE

Remove the unused sfde_func_padding2 member from the
sframe_func_desc_entry_v3 structure.

A later patch in this series reorganizes the members of the FDE
structure in a way explicit padding is no longer necessary to keep
natural alignment.  So remove the explicit padding now.

Reviewed-by: Jens Remus <jremus@linux.ibm.com>
include/
	* sframe.h: Remove sfde_func_padding2 from
	sframe_func_desc_entry_v3.
gas/
	* gen-sframe.c (output_sframe_funcdesc): Stop writing
	sfde_func_padding2.
libsframe/
	* sframe.c (sframe_encoder_write_fde): Stop writing
	sfde_func_padding2.
	* testsuite/libsframe.decode/DATA2: Regenerate binary test data.

diff --git a/gas/gen-sframe.c b/gas/gen-sframe.c
index ce9243e99dde09beb41ea9ce3cd6c9621651af7a..0aadaafa1ec355ef34d43054318a76b33c48489c 100644 (file)
--- a/gas/gen-sframe.c
+++ b/gas/gen-sframe.c
@@ -738,7 +738,6 @@ output_sframe_funcdesc (symbolS *start_of_fre_section,
   else
     out_one (func_info);
   out_one (0);
-  out_two (0);
 }
 
 static void

diff --git a/include/sframe.h b/include/sframe.h
index aa3c0872e0c13cc7abad2c45f79db310b2d69cd8..c137b49e806bbd1c8f02fd71deabe18358fd80bd 100644 (file)
--- a/include/sframe.h
+++ b/include/sframe.h
@@ -271,7 +271,6 @@ typedef struct sframe_func_desc_entry_v3
   /* Size of the block of repeating insns.  Used for SFrame FDEs of type
      SFRAME_FDE_TYPE_PCMASK.  */
   uint8_t sfde_func_rep_size;
-  uint16_t sfde_func_padding2;
 } ATTRIBUTE_PACKED sframe_func_desc_entry_v3;
 
 #define SFRAME_V3_FDE_FUNC_INFO(fde_pc_type, fre_type) \

diff --git a/libsframe/sframe.c b/libsframe/sframe.c
index b942a2c381041f0299a78214862c2058182e80a7..eb68ddfc1d8465c94fdde929a20c1e5d9ee18a9a 100644 (file)
--- a/libsframe/sframe.c
+++ b/libsframe/sframe.c
@@ -2143,7 +2143,6 @@ sframe_encoder_write_fde (const sframe_header *sfhp ATTRIBUTE_UNUSED,
   fdep->sfde_func_num_fres = (uint16_t)fde->func_num_fres;
   fdep->sfde_func_info = fde->func_info;
   fdep->sfde_func_rep_size = fde->func_rep_size;
-  fdep->sfde_func_padding2 = 0;
 
   *fde_write_size = sizeof (sframe_func_desc_entry_v3);
 

diff --git a/libsframe/testsuite/libsframe.decode/DATA2 b/libsframe/testsuite/libsframe.decode/DATA2
index 7a218f86bcce9e3a6e3446c7c725dfedbd6d687b..b1069c3c4d106a6d6985832fa8c1610548155b90 100644 (file)
Binary files a/libsframe/testsuite/libsframe.decode/DATA2 and b/libsframe/testsuite/libsframe.decode/DATA2 differ