aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am3
-rw-r--r--src/mkheader.c7
-rw-r--r--src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabihf.h23
-rw-r--r--src/syscfg/lock-obj-pub.armv5-unknown-linux-musleabi.h23
-rw-r--r--src/syscfg/lock-obj-pub.armv6-unknown-linux-musleabihf.h23
5 files changed, 7 insertions, 72 deletions
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:
-##