From 840bf04e2a0432c1ab59a6ea500dcc3c742b6531 Mon Sep 17 00:00:00 2001 From: ru Date: Wed, 13 Nov 2002 11:50:40 +0000 Subject: [PATCH] Bootstrapping aid for 4.0-RELEASE. --- gnu/usr.bin/cc/cc_tools/auto-host.h | 3 +++ lib/libncurses/Makefile | 4 ++++ lib/ncurses/ncurses/Makefile | 4 ++++ usr.sbin/crunch/crunchide/exec_elf32.c | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h index a25c9b67a10b..321bb3231a67 100644 --- a/gnu/usr.bin/cc/cc_tools/auto-host.h +++ b/gnu/usr.bin/cc/cc_tools/auto-host.h @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index b757bc133c72..3e4fdae0f0ce 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -25,7 +25,11 @@ BROKEN_LINKER= 0 BUILTIN_BOOL= 1 BOOL_TYPE= 0 HAVE_VSSCANF= 1 +.if defined(BOOTSTRAPPING) +HEADER_STDBOOL= 0 +.else HEADER_STDBOOL= 1 +.endif TYPE_OF_BOOL= unsigned char TYPEOF_CHTYPE= long WIDEC_SHIFT= 8 diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index b757bc133c72..3e4fdae0f0ce 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -25,7 +25,11 @@ BROKEN_LINKER= 0 BUILTIN_BOOL= 1 BOOL_TYPE= 0 HAVE_VSSCANF= 1 +.if defined(BOOTSTRAPPING) +HEADER_STDBOOL= 0 +.else HEADER_STDBOOL= 1 +.endif TYPE_OF_BOOL= unsigned char TYPEOF_CHTYPE= long WIDEC_SHIFT= 8 diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 5750ced63e3e..571c5a84b86a 100644 --- a/usr.sbin/crunch/crunchide/exec_elf32.c +++ b/usr.sbin/crunch/crunchide/exec_elf32.c @@ -155,7 +155,13 @@ ELFNAMEEND(check)(int fd, const char *fn) switch (xe16toh(eh.e_machine)) { case EM_386: break; case EM_ALPHA: break; +#ifndef EM_IA_64 +#define EM_IA_64 50 +#endif case EM_IA_64: break; +#ifndef EM_SPARCV9 +#define EM_SPARCV9 43 +#endif case EM_SPARCV9: break; /* ELFDEFNNAME(MACHDEP_ID_CASES) */