From 76b95ff59a3101f01f5667faa654957bbb9a476b Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 24 Apr 2013 18:57:59 +0200 Subject: [PATCH] install_gcc 1 Change-Id: Ibb4c8af4644668493911e572e79d1d6929d7d4c4 --- etc/mtree/NetBSD.dist.base | 1 + external/gpl3/gcc/Makefile | 4 -- external/gpl3/gcc/lib/Makefile | 2 +- .../gpl3/gcc/lib/libiberty/arch/i386/config.h | 20 +++++----- external/gpl3/gcc/lib/libiberty/defs.mk | 7 ++-- external/gpl3/gcc/usr.bin/Makefile | 2 +- external/gpl3/gcc/usr.bin/Makefile.inc | 9 ++++- external/gpl3/gcc/usr.bin/backend/Makefile | 7 ++-- external/gpl3/gcc/usr.bin/cc1/Makefile | 5 +++ external/gpl3/gcc/usr.bin/cc1obj/Makefile | 5 +++ external/gpl3/gcc/usr.bin/cc1plus/Makefile | 5 +++ external/gpl3/gcc/usr.bin/cpp/Makefile | 2 + external/gpl3/gcc/usr.bin/g++/Makefile | 2 + external/gpl3/gcc/usr.bin/gcc/Makefile | 2 + .../gcc/usr.bin/gcc/arch/i386/auto-host.h | 40 +++++++++---------- .../gpl3/gcc/usr.bin/gcc/arch/i386/bconfig.h | 2 +- .../gcc/usr.bin/gcc/arch/i386/configargs.h | 6 +-- .../gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk | 4 +- .../gcc/usr.bin/gcc/arch/i386/gthr-default.h | 5 --- .../gcc/usr.bin/gcc/arch/i386/gtyp-input.list | 6 +-- external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h | 9 ++--- external/gpl3/gcc/usr.bin/gcov/Makefile | 4 ++ .../gcc/usr.bin/libcpp/arch/i386/config.h | 2 +- share/mk/bsd.own.mk | 1 + 24 files changed, 85 insertions(+), 67 deletions(-) delete mode 100644 external/gpl3/gcc/usr.bin/gcc/arch/i386/gthr-default.h diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base index 0ae0da35e..87dbd87be 100644 --- a/etc/mtree/NetBSD.dist.base +++ b/etc/mtree/NetBSD.dist.base @@ -49,6 +49,7 @@ ./usr/include/ddekit ./usr/include/ddekit/minix ./usr/include/g++ +./usr/include/gcc-4.5 ./usr/include/i386 ./usr/include/lzma ./usr/include/minix diff --git a/external/gpl3/gcc/Makefile b/external/gpl3/gcc/Makefile index 0116bdb9d..906e8f398 100644 --- a/external/gpl3/gcc/Makefile +++ b/external/gpl3/gcc/Makefile @@ -1,9 +1,5 @@ # $NetBSD: Makefile,v 1.1 2011/06/21 04:53:33 mrg Exp $ -.if !defined(__MINIX) SUBDIR+= lib .WAIT usr.bin -.else -SUBDIR+= lib .WAIT -.endif # !defined(__MINIX) .include diff --git a/external/gpl3/gcc/lib/Makefile b/external/gpl3/gcc/lib/Makefile index 9f011bd7c..7606c832d 100644 --- a/external/gpl3/gcc/lib/Makefile +++ b/external/gpl3/gcc/lib/Makefile @@ -2,7 +2,7 @@ # crtstuff is built out of elsewhere, or not at all .if defined(__MINIX) -SUBDIR+= libgcc +SUBDIR+= libgcc libiberty .else SUBDIR+= libgcc libiberty libobjc libsupc++ libstdc++-v3 libgomp SUBDIR+= libmudflap libmudflapth diff --git a/external/gpl3/gcc/lib/libiberty/arch/i386/config.h b/external/gpl3/gcc/lib/libiberty/arch/i386/config.h index 66d7202cf..18c9304d5 100644 --- a/external/gpl3/gcc/lib/libiberty/arch/i386/config.h +++ b/external/gpl3/gcc/lib/libiberty/arch/i386/config.h @@ -112,7 +112,7 @@ #define HAVE_GETPAGESIZE 1 /* Define to 1 if you have the `getrusage' function. */ -#define HAVE_GETRUSAGE 1 +/* #undef HAVE_GETRUSAGE */ /* Define to 1 if you have the `getsysinfo' function. */ /* #undef HAVE_GETSYSINFO */ @@ -169,7 +169,7 @@ /* #undef HAVE_MKSTEMPS */ /* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* #undef HAVE_MMAP */ /* Define to 1 if you have the `on_exit' function. */ /* #undef HAVE_ON_EXIT */ @@ -205,7 +205,7 @@ #define HAVE_SETENV 1 /* Define to 1 if you have the `sigsetmask' function. */ -#define HAVE_SIGSETMASK 1 +/* #undef HAVE_SIGSETMASK */ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 @@ -274,13 +274,13 @@ #define HAVE_SYSCONF 1 /* Define to 1 if you have the `sysctl' function. */ -#define HAVE_SYSCTL 1 +/* #undef HAVE_SYSCTL */ /* Define to 1 if you have the `sysmp' function. */ /* #undef HAVE_SYSMP */ /* Define if you have the sys_errlist variable. */ -#define HAVE_SYS_ERRLIST 1 +/* #undef HAVE_SYS_ERRLIST */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_FILE_H 1 @@ -289,7 +289,7 @@ #define HAVE_SYS_MMAN_H 1 /* Define if you have the sys_nerr variable. */ -#define HAVE_SYS_NERR 1 +/* #undef HAVE_SYS_NERR */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 @@ -301,7 +301,7 @@ #define HAVE_SYS_RESOURCE_H 1 /* Define if you have the sys_siglist variable. */ -#define HAVE_SYS_SIGLIST 1 +/* #undef HAVE_SYS_SIGLIST */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -370,10 +370,10 @@ #define HAVE_VSPRINTF 1 /* Define to 1 if you have the `wait3' function. */ -#define HAVE_WAIT3 1 +/* #undef HAVE_WAIT3 */ /* Define to 1 if you have the `wait4' function. */ -#define HAVE_WAIT4 1 +/* #undef HAVE_WAIT4 */ /* Define to 1 if you have the `waitpid' function. */ #define HAVE_WAITPID 1 @@ -427,7 +427,7 @@ it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ -#define STACK_DIRECTION 0 +#define STACK_DIRECTION -1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/external/gpl3/gcc/lib/libiberty/defs.mk b/external/gpl3/gcc/lib/libiberty/defs.mk index df03106cf..ac22ba291 100644 --- a/external/gpl3/gcc/lib/libiberty/defs.mk +++ b/external/gpl3/gcc/lib/libiberty/defs.mk @@ -1,8 +1,9 @@ -# This file is automatically generated. DO NOT EDIT! -# Generated from: NetBSD: mknative-gcc,v 1.65 2011/10/13 19:52:33 matt Exp +# This file is automatically generated. DO NOT EDIT! +# Generated from: NetBSD: mknative-gcc,v 1.65 2011/10/13 19:52:33 matt Exp # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp # G_ALLOCA= G_EXTRA_OFILES= -G_LIBOBJS=mempcpy.o mkstemps.o strverscmp.o strncmp.o +G_LIBOBJS=mempcpy.o mkstemps.o sigsetmask.o strverscmp.o + G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o sha1.o alloca.o argv.o choose-temp.o concat.o cp-demint.o crc32.o dyn-string.o fdmatch.o fibheap.o filename_cmp.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o safe-ctype.o sort.o spaces.o splay-tree.o strerror.o strsignal.o unlink-if-ordinary.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o diff --git a/external/gpl3/gcc/usr.bin/Makefile b/external/gpl3/gcc/usr.bin/Makefile index 2b759844a..e150981a2 100644 --- a/external/gpl3/gcc/usr.bin/Makefile +++ b/external/gpl3/gcc/usr.bin/Makefile @@ -12,7 +12,7 @@ SUBDIR+= host-libiberty .WAIT \ backend .WAIT \ frontend .WAIT \ libcpp libdecnumber gcov .WAIT \ - cc1 cc1obj cc1plus cpp g++ gcc \ + cc1 cc1plus cpp g++ gcc \ include .include diff --git a/external/gpl3/gcc/usr.bin/Makefile.inc b/external/gpl3/gcc/usr.bin/Makefile.inc index 891b441e7..0927fdb73 100644 --- a/external/gpl3/gcc/usr.bin/Makefile.inc +++ b/external/gpl3/gcc/usr.bin/Makefile.inc @@ -10,7 +10,7 @@ DIST= ${TOP}/external/gpl3/gcc/dist GCCARCH= ${.CURDIR}/../gcc/arch/${MACHINE_ARCH} -CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE +CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" HOST_CPPFLAGS+= -I${.CURDIR}/.. # Link in the GMP/MPFR/MPC headers since we don't install them @@ -94,4 +94,11 @@ CPPFLAGS+= -std=gnu89 NOCLANGERROR= # defined +.if defined(__MINIX) +CPPFLAGS+= -DSTANDARD_EXEC_PREFIX=\"/usr/lib/gcc\" +CPPFLAGS+= -DSTANDARD_LIBEXEC_PREFIX=\"/usr/libexec/gcc\" +CPPFLAGS+= -DSTANDARD_BINDIR_PREFIX=\"/usr/bin/\" +CPPFLAGS+= -DTOOLDIR_BASE_PREFIX=\"../../../../\" +.endif # defined(__MINIX) + .endif diff --git a/external/gpl3/gcc/usr.bin/backend/Makefile b/external/gpl3/gcc/usr.bin/backend/Makefile index cefcc7458..1b180b727 100644 --- a/external/gpl3/gcc/usr.bin/backend/Makefile +++ b/external/gpl3/gcc/usr.bin/backend/Makefile @@ -181,8 +181,8 @@ options.o: options.c coretypes.h opts.h intl.h #options.o: options.c ${G_CONFIG_H} ${G_SYSTEM_H} coretypes.h ${G_TM_H} opts.h intl.h # Yuck, we have to run configure to generate this one... -CLEANFILES+= auto-build.h -auto-build.h: Makefile +CLEANFILES+= auto-host.h +auto-host.h: Makefile ${_MKTARGET_CREATE} rm -rf .ab && \ mkdir .ab && \ @@ -194,8 +194,7 @@ auto-build.h: Makefile ${HOST_SH} ${GNUHOSTDIST}/gcc/configure \ --build=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \ --host=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \ - --target=${MACHINE_GNU_PLATFORM} && \ - mv auto-host.h ../auto-build.h) && \ + --target=${MACHINE_GNU_PLATFORM}) && \ rm -rf .ab # diff --git a/external/gpl3/gcc/usr.bin/cc1/Makefile b/external/gpl3/gcc/usr.bin/cc1/Makefile index 85cb7d4f7..0c9d47c9a 100644 --- a/external/gpl3/gcc/usr.bin/cc1/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1/Makefile @@ -13,7 +13,12 @@ CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} COPTS+= -Wno-stack-protector +.if defined(__MINIX) +LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lz -lm +DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBZ} ${LIBM} +.else LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM} +.endif # defined(__MINIX) .PATH: ${DIST}/gcc ${G_out_file:H} diff --git a/external/gpl3/gcc/usr.bin/cc1obj/Makefile b/external/gpl3/gcc/usr.bin/cc1obj/Makefile index fa0c99112..94207ec19 100644 --- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile @@ -16,7 +16,12 @@ CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} COPTS+= -Wno-stack-protector +.if defined(__MINIX) +LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lz -lm +DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBZ} ${LIBM} +.else LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM} +.endif # defined(__MINIX) .PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H} diff --git a/external/gpl3/gcc/usr.bin/cc1plus/Makefile b/external/gpl3/gcc/usr.bin/cc1plus/Makefile index 2f76a9a75..676fdaa9a 100644 --- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile +++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile @@ -16,7 +16,12 @@ CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS} # YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN CFLAGS+= -Wno-error # not good enough: -Wno-return-type +.if defined(__MINIX) +LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lz -lm +DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBZ} ${LIBM} +.else LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM} +.endif # defined(__MINIX) .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H} diff --git a/external/gpl3/gcc/usr.bin/cpp/Makefile b/external/gpl3/gcc/usr.bin/cpp/Makefile index c870fdac5..8f85f1f49 100644 --- a/external/gpl3/gcc/usr.bin/cpp/Makefile +++ b/external/gpl3/gcc/usr.bin/cpp/Makefile @@ -36,7 +36,9 @@ MLINKS+= cpp.1 gcpp.1 cpp.1 cccp.1 .include "../Makefile.frontend" +.if !defined(__MINIX) LDADD+= -lintl +.endif # !defined(__MINIX) COPTS+= -Wno-stack-protector diff --git a/external/gpl3/gcc/usr.bin/g++/Makefile b/external/gpl3/gcc/usr.bin/g++/Makefile index a53d1dae7..8029c7145 100644 --- a/external/gpl3/gcc/usr.bin/g++/Makefile +++ b/external/gpl3/gcc/usr.bin/g++/Makefile @@ -16,5 +16,7 @@ LINKS+= ${BINDIR}/g++ ${BINDIR}/c++ .PATH: ${DIST}/gcc ${DIST}/gcc/cp +.if !defined(__MINIX) LDADD+= -lintl DPADD+= ${LIBINTL} +.endif # !defined(__MINIX) diff --git a/external/gpl3/gcc/usr.bin/gcc/Makefile b/external/gpl3/gcc/usr.bin/gcc/Makefile index 565d563a4..44bd2c2a5 100644 --- a/external/gpl3/gcc/usr.bin/gcc/Makefile +++ b/external/gpl3/gcc/usr.bin/gcc/Makefile @@ -23,7 +23,9 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/gcc/doc/include COPTS.builtins.c = -Wno-stack-protector +.if !defined(__MINIX) LDADD+= -lintl DPADD+= ${LIBINTL} +.endif # !defined(__MINIX) gcc.info: gcc-vers.texi diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h b/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h index 5859002c2..5c7c5b9b5 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h @@ -1,7 +1,3 @@ -/* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.65 2011/10/13 19:52:33 matt Exp */ -/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ - /* auto-host.h. Generated from config.in by configure. */ /* config.in. Generated from configure.ac by autoheader. */ @@ -127,13 +123,13 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ #ifndef USED_FOR_TARGET -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ #endif /* Define to enable plugin support. */ #ifndef USED_FOR_TARGET -#define ENABLE_PLUGIN 1 +/* #undef ENABLE_PLUGIN */ #endif @@ -504,7 +500,7 @@ /* Define 0/1 if your assembler and linker support COMDAT groups. */ #ifndef USED_FOR_TARGET -#define HAVE_COMDAT_GROUP 1 +#define HAVE_COMDAT_GROUP 0 #endif @@ -704,7 +700,7 @@ /* Define to 1 if we found a declaration for 'getrusage', otherwise define to 0. */ #ifndef USED_FOR_TARGET -#define HAVE_DECL_GETRUSAGE 1 +#define HAVE_DECL_GETRUSAGE 0 #endif @@ -759,14 +755,14 @@ /* Define to 1 if we found a declaration for 'setrlimit', otherwise define to 0. */ #ifndef USED_FOR_TARGET -#define HAVE_DECL_SETRLIMIT 1 +#define HAVE_DECL_SETRLIMIT 0 #endif /* Define to 1 if we found a declaration for 'sigaltstack', otherwise define to 0. */ #ifndef USED_FOR_TARGET -#define HAVE_DECL_SIGALTSTACK 1 +#define HAVE_DECL_SIGALTSTACK 0 #endif @@ -833,7 +829,7 @@ /* Define to 1 if you have the `elf_getshdrstrndx' function. */ #ifndef USED_FOR_TARGET -/* #undef HAVE_ELF_GETSHDRSTRNDX */ +#define HAVE_ELF_GETSHDRSTRNDX 1 #endif @@ -971,7 +967,7 @@ /* Define if your assembler and linker support .hidden. */ -#define HAVE_GAS_HIDDEN 1 +/* #undef HAVE_GAS_HIDDEN */ /* Define if your assembler supports .lcomm with an alignment field. */ #ifndef USED_FOR_TARGET @@ -1057,7 +1053,7 @@ /* Define to 1 if you have the `getrusage' function. */ #ifndef USED_FOR_TARGET -#define HAVE_GETRUSAGE 1 +/* #undef HAVE_GETRUSAGE */ #endif @@ -1267,31 +1263,31 @@ /* Define to 1 if you have the `mincore' function. */ #ifndef USED_FOR_TARGET -#define HAVE_MINCORE 1 +/* #undef HAVE_MINCORE */ #endif /* Define to 1 if you have the `mmap' function. */ #ifndef USED_FOR_TARGET -#define HAVE_MMAP 1 +/* #undef HAVE_MMAP */ #endif /* Define if mmap with MAP_ANON(YMOUS) works. */ #ifndef USED_FOR_TARGET -#define HAVE_MMAP_ANON 1 +/* #undef HAVE_MMAP_ANON */ #endif /* Define if mmap of /dev/zero works. */ #ifndef USED_FOR_TARGET -#define HAVE_MMAP_DEV_ZERO 1 +/* #undef HAVE_MMAP_DEV_ZERO */ #endif /* Define if read-only mmap of a plain file works. */ #ifndef USED_FOR_TARGET -#define HAVE_MMAP_FILE 1 +/* #undef HAVE_MMAP_FILE */ #endif @@ -1321,7 +1317,7 @@ /* Define to 1 if you have the `setrlimit' function. */ #ifndef USED_FOR_TARGET -#define HAVE_SETRLIMIT 1 +/* #undef HAVE_SETRLIMIT */ #endif @@ -1753,20 +1749,20 @@ /* Define to 1 if on MINIX. */ #ifndef USED_FOR_TARGET -/* #undef _MINIX */ +#define _MINIX 1 #endif /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ #ifndef USED_FOR_TARGET -/* #undef _POSIX_1_SOURCE */ +#define _POSIX_1_SOURCE 2 #endif /* Define to 1 if you need to in order for `stat' and other things to work. */ #ifndef USED_FOR_TARGET -/* #undef _POSIX_SOURCE */ +#define _POSIX_SOURCE 1 #endif diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/bconfig.h b/external/gpl3/gcc/usr.bin/gcc/arch/i386/bconfig.h index 8e8bdaa85..3cc357dec 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/bconfig.h +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/bconfig.h @@ -4,7 +4,7 @@ #ifndef GCC_BCONFIG_H #define GCC_BCONFIG_H -#include "auto-build.h" +#include "auto-host.h" #ifdef IN_GCC # include "ansidecl.h" #endif diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h b/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h index 052fccc3a..95dbcbf89 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h @@ -3,9 +3,9 @@ /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ /* Generated automatically. */ -static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20120916' --with-system-zlib --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona --with-mpc=/var/obj/mknative/i386/usr/src/destdir.i386/usr --with-mpfr=/var/obj/mknative/i386/usr/src/destdir.i386/usr --with-gmp=/var/obj/mknative/i386/usr/src/destdir.i386/usr --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd5.99.56 --host=i486--netbsdelf"; -static const char thread_model[] = "posix"; +static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i586-elf32-minix --disable-libssp --disable-threads --disable-visibility --disable-libunwind --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20120916' --with-system-zlib --enable-__cxa_atexit --with-arch=i586 --with-tune=nocona --with-mpc=/usr/objs/i386/tooldir.Minix-3.2.1-i686 --with-mpfr=/usr/objs/i386/tooldir.Minix-3.2.1-i686 --with-gmp=/usr/objs/i386/tooldir.Minix-3.2.1-i686 --disable-nls --disable-multilib --program-transform-name=s,^,i586-elf32-minix-, --enable-languages=c --prefix=/usr/objs/i386/tooldir.Minix-3.2.1-i686"; +static const char thread_model[] = "single"; static const struct { const char *name, *value; -} configure_default_options[] = { { "cpu", "i486" }, { "arch", "i486" }, { "tune", "nocona" } }; +} configure_default_options[] = { { "cpu", "pentium" }, { "arch", "i586" }, { "tune", "nocona" } }; diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk b/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk index 089a74c94..2d16ba6c5 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/defs.mk @@ -31,7 +31,7 @@ G_GTFILES_FILES_FILES= G_GTFILES_FILES_LANGS= G_GTFILES=${GNUHOSTDIST}/gcc/../libcpp/include/line-map.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpplib.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpp-id-data.h ${GNUHOSTDIST}/gcc/input.h ${GNUHOSTDIST}/gcc/coretypes.h auto-host.h ${GNUHOSTDIST}/gcc/../include/ansidecl.h options.h ${GNUHOSTDIST}/gcc/config/vxworks-dummy.h ${GNUHOSTDIST}/gcc/config/i386/i386.h ${GNUHOSTDIST}/gcc/config/i386/unix.h ${GNUHOSTDIST}/gcc/config/i386/att.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/i386/netbsd-elf.h ${GNUHOSTDIST}/gcc/defaults.h ${GNUHOSTDIST}/gcc/../include/hashtab.h ${GNUHOSTDIST}/gcc/../include/splay-tree.h ${GNUHOSTDIST}/gcc/bitmap.h ${GNUHOSTDIST}/gcc/alias.h ${GNUHOSTDIST}/gcc/coverage.c ${GNUHOSTDIST}/gcc/rtl.h ${GNUHOSTDIST}/gcc/vecprim.h ${GNUHOSTDIST}/gcc/optabs.h ${GNUHOSTDIST}/gcc/tree.h ${GNUHOSTDIST}/gcc/varray.h ${GNUHOSTDIST}/gcc/libfuncs.h ${GNUHOSTDIST}/gcc/../libcpp/include/symtab.h ${GNUHOSTDIST}/gcc/../include/obstack.h ${GNUHOSTDIST}/gcc/real.h ${GNUHOSTDIST}/gcc/function.h ${GNUHOSTDIST}/gcc/insn-addr.h ${GNUHOSTDIST}/gcc/hwint.h ${GNUHOSTDIST}/gcc/fixed-value.h ${GNUHOSTDIST}/gcc/ipa-reference.h ${GNUHOSTDIST}/gcc/output.h ${GNUHOSTDIST}/gcc/cfgloop.h ${GNUHOSTDIST}/gcc/cselib.h ${GNUHOSTDIST}/gcc/basic-block.h ${GNUHOSTDIST}/gcc/cgraph.h ${GNUHOSTDIST}/gcc/reload.h ${GNUHOSTDIST}/gcc/caller-save.c ${GNUHOSTDIST}/gcc/alias.c ${GNUHOSTDIST}/gcc/bitmap.c ${GNUHOSTDIST}/gcc/cselib.c ${GNUHOSTDIST}/gcc/cgraph.c ${GNUHOSTDIST}/gcc/ipa-prop.c ${GNUHOSTDIST}/gcc/ipa-cp.c ${GNUHOSTDIST}/gcc/ipa-inline.c ${GNUHOSTDIST}/gcc/matrix-reorg.c ${GNUHOSTDIST}/gcc/dbxout.c ${GNUHOSTDIST}/gcc/ipa-struct-reorg.c ${GNUHOSTDIST}/gcc/dwarf2out.c ${GNUHOSTDIST}/gcc/dwarf2asm.c ${GNUHOSTDIST}/gcc/tree-vect-generic.c ${GNUHOSTDIST}/gcc/dojump.c ${GNUHOSTDIST}/gcc/emit-rtl.c ${GNUHOSTDIST}/gcc/except.h ${GNUHOSTDIST}/gcc/explow.c ${GNUHOSTDIST}/gcc/expr.c ${GNUHOSTDIST}/gcc/expr.h ${GNUHOSTDIST}/gcc/function.c ${GNUHOSTDIST}/gcc/except.c ${GNUHOSTDIST}/gcc/gcse.c ${GNUHOSTDIST}/gcc/integrate.c ${GNUHOSTDIST}/gcc/lists.c ${GNUHOSTDIST}/gcc/optabs.c ${GNUHOSTDIST}/gcc/profile.c ${GNUHOSTDIST}/gcc/reginfo.c ${GNUHOSTDIST}/gcc/mcf.c ${GNUHOSTDIST}/gcc/reg-stack.c ${GNUHOSTDIST}/gcc/cfglayout.c ${GNUHOSTDIST}/gcc/cfglayout.h ${GNUHOSTDIST}/gcc/sdbout.c ${GNUHOSTDIST}/gcc/stor-layout.c ${GNUHOSTDIST}/gcc/stringpool.c ${GNUHOSTDIST}/gcc/tree.c ${GNUHOSTDIST}/gcc/varasm.c ${GNUHOSTDIST}/gcc/gimple.h ${GNUHOSTDIST}/gcc/gimple.c ${GNUHOSTDIST}/gcc/tree-mudflap.c ${GNUHOSTDIST}/gcc/tree-flow.h ${GNUHOSTDIST}/gcc/tree-ssanames.c ${GNUHOSTDIST}/gcc/tree-eh.c ${GNUHOSTDIST}/gcc/tree-ssa-address.c ${GNUHOSTDIST}/gcc/tree-cfg.c ${GNUHOSTDIST}/gcc/tree-dfa.c ${GNUHOSTDIST}/gcc/tree-iterator.c ${GNUHOSTDIST}/gcc/gimplify.c ${GNUHOSTDIST}/gcc/tree-chrec.h ${GNUHOSTDIST}/gcc/tree-scalar-evolution.c ${GNUHOSTDIST}/gcc/tree-ssa-operands.h ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/tree-nested.c ${GNUHOSTDIST}/gcc/varpool.c ${GNUHOSTDIST}/gcc/tree-parloops.c ${GNUHOSTDIST}/gcc/omp-low.c ${GNUHOSTDIST}/gcc/targhooks.c ${GNUHOSTDIST}/gcc/config/i386/i386.c ${GNUHOSTDIST}/gcc/passes.c ${GNUHOSTDIST}/gcc/cgraphunit.c ${GNUHOSTDIST}/gcc/tree-ssa-propagate.c ${GNUHOSTDIST}/gcc/tree-phinodes.c ${GNUHOSTDIST}/gcc/ipa-reference.c ${GNUHOSTDIST}/gcc/tree-ssa-structalias.c ${GNUHOSTDIST}/gcc/lto-symtab.c ${GNUHOSTDIST}/gcc/tree-ssa-alias.h ${GNUHOSTDIST}/gcc/ipa-prop.h [cp] ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/class.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c ${GNUHOSTDIST}/gcc/cp/cp-lang.c [lto] ${GNUHOSTDIST}/gcc/lto/lto-tree.h ${GNUHOSTDIST}/gcc/lto/lto-lang.c ${GNUHOSTDIST}/gcc/lto/lto.c [objc] ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/objc/objc-act.c [objcp] ${GNUHOSTDIST}/gcc/objcp/objcp-decl.c ${GNUHOSTDIST}/gcc/objc/objc-act.c ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c [c] ${GNUHOSTDIST}/gcc/c-lang.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-lang.h G_GTFILES_LANG_DIR_NAMES= -G_tm_defines=NETBSD_ENABLE_PTHREADS +G_tm_defines= G_host_xm_file= G_host_xm_defines= G_tm_p_file= @@ -39,7 +39,7 @@ G_target_cpu_default= G_TM_H=tm.h options.h ${GNUHOSTDIST}/gcc/config/vxworks-dummy.h ${GNUHOSTDIST}/gcc/config/i386/i386.h ${GNUHOSTDIST}/gcc/config/i386/unix.h ${GNUHOSTDIST}/gcc/config/i386/att.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/i386/netbsd-elf.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/i386/i386.opt G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/vxworks-dummy.h ${GNUHOSTDIST}/gcc/config/i386/i386.h ${GNUHOSTDIST}/gcc/config/i386/unix.h ${GNUHOSTDIST}/gcc/config/i386/att.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/i386/netbsd-elf.h ${GNUHOSTDIST}/gcc/defaults.h -G_build_xm_include_list=auto-build.h ansidecl.h +G_build_xm_include_list=auto-host.h ansidecl.h G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/lto/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h G_tm_p_include_list=config/i386/i386-protos.h tm-preds.h G_LIB2ADDEHDEP= unwind-dw2-fde.h unwind-dw2-fde.c diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/gthr-default.h b/external/gpl3/gcc/usr.bin/gcc/arch/i386/gthr-default.h deleted file mode 100644 index 8a13671da..000000000 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/gthr-default.h +++ /dev/null @@ -1,5 +0,0 @@ -/* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.53 2011/06/29 05:06:03 mrg Exp */ -/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ - -#include "gthr-posix.h" diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/gtyp-input.list b/external/gpl3/gcc/usr.bin/gcc/arch/i386/gtyp-input.list index 2365929da..36b752f22 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/gtyp-input.list +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/gtyp-input.list @@ -12,9 +12,9 @@ SRCDIR/gcc/config/i386/unix.h SRCDIR/gcc/config/i386/att.h SRCDIR/gcc/config/dbxelf.h SRCDIR/gcc/config/elfos.h -SRCDIR/gcc/config/netbsd.h -SRCDIR/gcc/config/netbsd-elf.h -SRCDIR/gcc/config/i386/netbsd-elf.h +SRCDIR/gcc/config/minix-spec.h +SRCDIR/gcc/config/minix.h +SRCDIR/gcc/config/i386/minix.h SRCDIR/gcc/defaults.h SRCDIR/gcc/../include/hashtab.h SRCDIR/gcc/../include/splay-tree.h diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h b/external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h index 30f713983..80e5e8a69 100644 --- a/external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h +++ b/external/gpl3/gcc/usr.bin/gcc/arch/i386/tm.h @@ -4,9 +4,6 @@ #ifndef GCC_TM_H #define GCC_TM_H -#ifndef NETBSD_ENABLE_PTHREADS -# define NETBSD_ENABLE_PTHREADS -#endif #ifdef IN_GCC # include "options.h" # include "config/vxworks-dummy.h" @@ -15,9 +12,9 @@ # include "config/i386/att.h" # include "config/dbxelf.h" # include "config/elfos.h" -# include "config/netbsd.h" -# include "config/netbsd-elf.h" -# include "config/i386/netbsd-elf.h" +# include "config/minix-spec.h" +# include "config/minix.h" +# include "config/i386/minix.h" # include "defaults.h" #endif #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET diff --git a/external/gpl3/gcc/usr.bin/gcov/Makefile b/external/gpl3/gcc/usr.bin/gcov/Makefile index b7c74d3de..534ad90a7 100644 --- a/external/gpl3/gcc/usr.bin/gcov/Makefile +++ b/external/gpl3/gcc/usr.bin/gcov/Makefile @@ -13,7 +13,11 @@ MAN= gcov.1 .include +.if defined(__MINIX) +LDADD= -L${LIBIBERTYOBJ} -liberty +.else LDADD= -L${LIBIBERTYOBJ} -liberty -lintl +.endif # defined(__MINIX) COPTS+= -Wno-stack-protector diff --git a/external/gpl3/gcc/usr.bin/libcpp/arch/i386/config.h b/external/gpl3/gcc/usr.bin/libcpp/arch/i386/config.h index 4c8b4dffb..27f358702 100644 --- a/external/gpl3/gcc/usr.bin/libcpp/arch/i386/config.h +++ b/external/gpl3/gcc/usr.bin/libcpp/arch/i386/config.h @@ -18,7 +18,7 @@ /* Define to 1 if translation of program messages to the user's native language is requested. */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7a1377bcd..859df57fd 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -25,6 +25,7 @@ DOCGRP?= operator MKBINUTILS?= no MKGDB:= no MKGCC?= no +MKGCCCMDS?= no # LSC To check if works #DESTDIR?= /usr/destdir.${MACHINE_ARCH}