diff options
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mkheader.c | 4 | ||||
| -rw-r--r-- | src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h | 23 | ||||
| -rw-r--r-- | src/syscfg/lock-obj-pub.i686-pc-gnu.h (renamed from src/syscfg/lock-obj-pub.i486-pc-gnu.h) | 2 | ||||
| -rw-r--r-- | src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h (renamed from src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h) | 2 |
5 files changed, 8 insertions, 27 deletions
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-linux-gnu.h b/src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h deleted file mode 100644 index f1849c4..0000000 --- a/src/syscfg/lock-obj-pub.i486-pc-linux-gnu.h +++ /dev/null @@ -1,23 +0,0 @@ -## lock-obj-pub.i486-pc-linux-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 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-kfreebsd-gnu.h b/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h index 8a680d1..4cf12fc 100644 --- a/src/syscfg/lock-obj-pub.i486-pc-kfreebsd-gnu.h +++ b/src/syscfg/lock-obj-pub.i686-pc-kfreebsd-gnu.h @@ -1,4 +1,4 @@ -## lock-obj-pub.i486-pc-kfreebsd-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 |