From 8d45ec8f8f61268a74d9c40b840a8fbd6f805a07 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 28 Feb 2017 13:37:12 +0100 Subject: Add support for armv7-unknown-linux-gnueabihf. * src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h: Remove. * src/syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h: Remove. * src/syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h: Remove. * src/Makefile.am (lock_obj_pub): Remove them. * src/mkheader.c (canon_host_triplet): Add removed as aliases. Addn alias for armv7-unknown-linux-gnueabihf. -- Info provided by Marvin Schmidt via gnupg-devel@gnupg.org on Tue, 14 Feb 2017 15:00:15 +0100 Consilidated arm syscfg file by aliasing them. Signed-off-by: Werner Koch --- src/Makefile.am | 3 --- src/mkheader.c | 7 +++++++ .../lock-obj-pub.arm-unknown-linux-gnueabihf.h | 23 ---------------------- .../lock-obj-pub.armv5-unknown-linux-musleabi.h | 23 ---------------------- .../lock-obj-pub.armv6-unknown-linux-musleabihf.h | 23 ---------------------- 5 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h delete mode 100644 src/syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h delete mode 100644 src/syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h diff --git a/src/Makefile.am b/src/Makefile.am index 4c77521..398ec5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,10 +46,7 @@ lock_obj_pub = \ syscfg/lock-obj-pub.alpha-unknown-linux-gnu.h \ syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h \ syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h \ - syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h \ syscfg/lock-obj-pub.arm-apple-darwin.h \ - syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h \ - syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h \ syscfg/lock-obj-pub.hppa-unknown-linux-gnu.h \ syscfg/lock-obj-pub.i386-apple-darwin.h \ syscfg/lock-obj-pub.i686-pc-gnu.h \ diff --git a/src/mkheader.c b/src/mkheader.c index 64d0904..5aeb1e7 100644 --- a/src/mkheader.c +++ b/src/mkheader.c @@ -81,9 +81,16 @@ canon_host_triplet (const char *triplet) {"i586-pc-gnu"}, {"i486-pc-kfreebsd-gnu", "i686-pc-kfreebsd-gnu"}, {"i586-pc-kfreebsd-gnu"}, + {"x86_64-pc-linux-gnuhardened1", "x86_64-pc-linux-gnu" }, + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, + {"armv7-unknown-linux-gnueabihf" }, + {"armv5-unknown-linux-musleabi" }, + {"armv6-unknown-linux-musleabihf" }, + { NULL } }; int i; diff --git a/src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h b/src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h deleted file mode 100644 index 6636400..0000000 --- a/src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h +++ /dev/null @@ -1,23 +0,0 @@ -## lock-obj-pub.arm-unknown-linux-gnueabihf.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.armv5-unknown-linux-musleabi.h b/src/syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h deleted file mode 100644 index c7b6165..0000000 --- a/src/syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h +++ /dev/null @@ -1,23 +0,0 @@ -## lock-obj-pub.armv5-unknown-linux-musleabi.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.armv6-unknown-linux-musleabihf.h b/src/syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h deleted file mode 100644 index 6535a9b..0000000 --- a/src/syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h +++ /dev/null @@ -1,23 +0,0 @@ -## lock-obj-pub.armv6-unknown-linux-musleabihf.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: -## -- cgit v1.2.3