Use 8-byte alignment for x86_64 GNU Property notes.

diff --git a/annocheck/annocheck.c b/annocheck/annocheck.c
index 645542b1cb992c1da17d6d39b83e7bcc85342d26..2ca3e0e6f8774397ccd401e58428ab36523cfa6a 100644 (file)
--- a/annocheck/annocheck.c
+++ b/annocheck/annocheck.c
@@ -28,8 +28,8 @@
 /* -1: silent, 0: normal, 1: verbose, 2: very verbose.  */
 ulong         verbosity = 0;
 
-uint          major_version = 8;
-uint          minor_version = 58;
+const uint              major_version = 8;
+const uint              minor_version = 59;
 
 static ulong           num_files = 0;
 static const char *     files[MAX_NUM_FILES];

diff --git a/annocheck/annocheck.h b/annocheck/annocheck.h
index 334186a1a878b8b1787554878b22c8dbd6d2047c..61a03ff2cb75eec5d551c0ba3fb5d260b9bf0955 100644 (file)
--- a/annocheck/annocheck.h
+++ b/annocheck/annocheck.h
@@ -247,7 +247,7 @@ extern ulong        verbosity;
 #define BE_QUIET         (verbosity == -1UL)
 
 /* The version numbers of the checksec framework.  */
-extern uint major_version;
-extern uint minor_version;
+extern const uint major_version;
+extern const uint minor_version;
 
 #endif /* __ANNOCHECK_H__ */

diff --git a/plugin/annobin.cc b/plugin/annobin.cc
index a1bdc573e4b640ffdbe47fd28b4f174c6bb1ccaf..e70c69a4bfbba8203f8fc5088abb7eb1423ff8ce 100644 (file)
--- a/plugin/annobin.cc
+++ b/plugin/annobin.cc
@@ -26,8 +26,8 @@
 /* The version of the annotation specification supported by this plugin.  */
 #define SPEC_VERSION  3
 
-static unsigned int   annobin_version = 858; /* NB. Keep in sync with version_string below.  */
-static const char *   version_string = N_("Version 858");
+static unsigned int   annobin_version = 859; /* NB. Keep in sync with version_string below.  */
+static const char *   version_string = N_("Version 859");
 
 
 

diff --git a/plugin/x86_64.annobin.cc b/plugin/x86_64.annobin.cc
index 756b2e566f58d13861ed8f0b6fe3ca55f6723ada..ac1bcf691cbe11c3bdc111287b6e7194a3df5bc0 100644 (file)
--- a/plugin/x86_64.annobin.cc
+++ b/plugin/x86_64.annobin.cc
@@ -239,7 +239,10 @@ annobin_target_specific_loader_notes (void)
   annobin_inform (1, "Creating notes for the dynamic loader");
 
   fprintf (asm_out_file, "\t.section %s, \"a\", %%note\n", NOTE_GNU_PROPERTY_SECTION_NAME);
-  fprintf (asm_out_file, "\t.balign 4\n");
+  if (annobin_is_64bit)
+    fprintf (asm_out_file, "\t.balign 8\n");
+  else
+    fprintf (asm_out_file, "\t.balign 4\n");
 
   ptr = buffer;