diff options
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/auto-host.h | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/size-host.h | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/libcpp/config.h | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/libdecnumber/config.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index dd4aaf44ba3..49524e78812 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $ -# $OpenBSD: Makefile,v 1.1.1.1 2009/10/15 20:50:21 robert Exp $ +# $OpenBSD: Makefile,v 1.2 2009/11/02 09:50:39 jsg Exp $ .include <bsd.own.mk> @@ -48,7 +48,7 @@ TARGET_INC+= ${GCC_CPU}/sysv4.h TARgET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/openbsd64.h .else -TARGET_INC+= ${GCC_CPU}/openbsd.h +TARGET_INC+= ${GCC_CPU}/openbsdelf.h .endif TARGET_INC+= defaults.h diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h index bcde74fc2b0..ff1feb8aae1 100644 --- a/gnu/usr.bin/cc/cc_tools/auto-host.h +++ b/gnu/usr.bin/cc/cc_tools/auto-host.h @@ -1,6 +1,6 @@ /* auto-host.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $OpenBSD: auto-host.h,v 1.1.1.1 2009/10/15 20:50:21 robert Exp $ */ +/* $OpenBSD: auto-host.h,v 1.2 2009/11/02 09:50:39 jsg Exp $ */ /* Define as the number of bits in a byte, if \`limits.h' doesn't. */ #ifndef USED_FOR_TARGET @@ -1205,7 +1205,7 @@ /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */ #ifndef USED_FOR_TARGET -#define NEED_64BIT_HOST_WIDE_INT 1 +/* #undef NEED_64BIT_HOST_WIDE_INT 1 */ #endif @@ -1399,3 +1399,5 @@ /* #undef vfork */ #endif +/* Override SIZEOF_?? using proper values. */ +#include <size-host.h> diff --git a/gnu/usr.bin/cc/cc_tools/size-host.h b/gnu/usr.bin/cc/cc_tools/size-host.h index af03841ccee..ae730fccaac 100644 --- a/gnu/usr.bin/cc/cc_tools/size-host.h +++ b/gnu/usr.bin/cc/cc_tools/size-host.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/size-host.h,v 1.1.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -/* $OpenBSD: size-host.h,v 1.1.1.1 2009/10/15 20:50:21 robert Exp $ */ +/* $OpenBSD: size-host.h,v 1.2 2009/11/02 09:50:39 jsg Exp $ */ #ifdef SIZEOF_INT # undef SIZEOF_INT @@ -21,10 +21,6 @@ # undef SIZEOF_LONG_LONG #endif -#ifdef HOST_WIDE_INT -# undef HOST_WIDE_INT -#endif - #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 #define SIZEOF_LONG_LONG 8 @@ -32,11 +28,9 @@ #if __LP64__ #define SIZEOF_LONG 8 #define SIZEOF_VOID_P 8 -#define HOST_WIDE_INT long #else #define SIZEOF_LONG 4 #define SIZEOF_VOID_P 4 -#define HOST_WIDE_INT long long #endif #ifdef WORDS_BIGENDIAN diff --git a/gnu/usr.bin/cc/libcpp/config.h b/gnu/usr.bin/cc/libcpp/config.h index 69c6f2b1d37..f640da59b36 100644 --- a/gnu/usr.bin/cc/libcpp/config.h +++ b/gnu/usr.bin/cc/libcpp/config.h @@ -1,6 +1,6 @@ /* config.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $OpenBSD: config.h,v 1.1.1.1 2009/10/15 20:50:20 robert Exp $ */ +/* $OpenBSD: config.h,v 1.2 2009/11/02 09:50:39 jsg Exp $ */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. @@ -282,3 +282,5 @@ /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ + +#include <size-host.h> diff --git a/gnu/usr.bin/cc/libdecnumber/config.h b/gnu/usr.bin/cc/libdecnumber/config.h index 3fbeda9462c..d2d547dd761 100644 --- a/gnu/usr.bin/cc/libdecnumber/config.h +++ b/gnu/usr.bin/cc/libdecnumber/config.h @@ -76,3 +76,5 @@ /* Define to `long' if <sys/types.h> does not define. */ /* #undef off_t */ + +#include <size-host.h> |