[git] GPG-ERROR - branch, master, updated. libgpg-error-1.20-2-g9decdd7

by Daniel Kahn Gillmor cvs at cvs.gnupg.org
Thu Sep 17 09:22:57 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  9decdd7bd105ff6a0973cc1f6652e0eb0625d640 (commit)
      from  17f8cd76419eec7f1b73c4036e82061cf48b67b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9decdd7bd105ff6a0973cc1f6652e0eb0625d640
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Sep 16 21:20:46 2015 -0400

    Support i[456]86-pc{,-linux,-kfreebsd}-gnu.h
    
    * src/mkheader (canon_host_triplet): Add new entries.
    * src/syscfg/lock-obj-pub.i486-pc-gnu.h: Rename to ...
    * src/syscfg/lock-obj-pub.i686-pc-gnu.h: this.
    * src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h: Rename to ...
    * src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h: this.
    * src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h: Remove.
    * src/Makefile.am (lock_obj_pub): Update.
    --
    
    i486-pc, i586-pc, and i686-pc all use the same ABI given the GNU
    userland and a specific kernel.
    
    This changeset updates the arch-specific lock-obj header generation to
    treat the hardware aliases explicitly and should improve
    cross-building for anyone wanting to target any of these 9
    architectures.
    
    It also removes src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h, which
    should be handled by the alias to
    src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h
    
    Debian-Bug-Id: 799177

diff --git a/src/Makefile.am b/src/Makefile.am
index e038d7f..e4fe305 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,8 +49,8 @@ lock_obj_pub = \
         syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h   \
 	syscfg/lock-obj-pub.arm-apple-darwin.h              \
         syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h        \
-        syscfg/lock-obj-pub.i486-pc-gnu.h                   \
-        syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h          \
+        syscfg/lock-obj-pub.i686-pc-gnu.h                   \
+        syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h          \
         syscfg/lock-obj-pub.i686-pc-linux-gnu.h             \
         syscfg/lock-obj-pub.m68k-unknown-linux-gnu.h        \
         syscfg/lock-obj-pub.mips-unknown-linux-gnu.h        \
diff --git a/src/mkheader.c b/src/mkheader.c
index b8fd783..875a0f5 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -77,6 +77,10 @@ canon_host_triplet (const char *triplet)
   } tbl[] = {
     {"i486-pc-linux-gnu", "i686-pc-linux-gnu" },
     {"i586-pc-linux-gnu" },
+    {"i486-pc-gnu", "i686-pc-gnu"},
+    {"i586-pc-gnu"},
+    {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"},
+    {"i586-pc-kfreebsd-gnu"},
 
     { NULL }
   };
diff --git a/src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h
deleted file mode 100644
index 8a680d1..0000000
--- a/src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h
+++ /dev/null
@@ -1,23 +0,0 @@
-## lock-obj-pub.i486-pc-kfreebsd-gnu.h
-## File created by gen-posix-lock-obj - DO NOT EDIT
-## To be included by mkheader into gpg-error.h
-
-typedef struct
-{
-  long _vers;
-  union {
-    volatile char _priv[24];
-    long _x_align;
-    long *_xp_align;
-  } u;
-} gpgrt_lock_t;
-
-#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
-                                    0,0,0,0,0,0,0,0, \
-                                    0,0,0,0,0,0,0,0}}}
-##
-## Local Variables:
-## mode: c
-## buffer-read-only: t
-## End:
-##
diff --git a/src/syscfg/lock-obj-pub.i486-pc-gnu.h b/src/syscfg/lock-obj-pub.i686-pc-gnu.h
similarity index 94%
rename from src/syscfg/lock-obj-pub.i486-pc-gnu.h
rename to src/syscfg/lock-obj-pub.i686-pc-gnu.h
index 59b61e1..0522462 100644
--- a/src/syscfg/lock-obj-pub.i486-pc-gnu.h
+++ b/src/syscfg/lock-obj-pub.i686-pc-gnu.h
@@ -1,4 +1,4 @@
-## lock-obj-pub.i486-pc-gnu.h
+## lock-obj-pub.i686-pc-gnu.h
 ## File created by gen-posix-lock-obj - DO NOT EDIT
 ## To be included by mkheader into gpg-error.h
 
diff --git a/src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h b/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h
similarity index 92%
rename from src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h
rename to src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h
index f1849c4..4cf12fc 100644
--- a/src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h
+++ b/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h
@@ -1,4 +1,4 @@
-## lock-obj-pub.i486-pc-linux-gnu.h
+## lock-obj-pub.i686-pc-kfreebsd-gnu.h
 ## File created by gen-posix-lock-obj - DO NOT EDIT
 ## To be included by mkheader into gpg-error.h
 

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                                    |  4 ++--
 src/mkheader.c                                     |  4 ++++
 src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h     | 23 ----------------------
 ...ub.i486-pc-gnu.h => lock-obj-pub.i686-pc-gnu.h} |  2 +-
 ...x-gnu.h => lock-obj-pub.i686-pc-kfreebsd-gnu.h} |  2 +-
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h
 rename src/syscfg/{lock-obj-pub.i486-pc-gnu.h => lock-obj-pub.i686-pc-gnu.h} (94%)
 rename src/syscfg/{lock-obj-pub.i486-pc-linux-gnu.h => lock-obj-pub.i686-pc-kfreebsd-gnu.h} (92%)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list