build cc1objplus. don't forget debug set this time.diff -r1.2382 -r1.2383 src/distrib/sets/lists/comp/mi
(mrg)
--- src/distrib/sets/lists/comp/mi 2021/04/23 01:56:14 1.2382
+++ src/distrib/sets/lists/comp/mi 2021/04/23 22:50:05 1.2383
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: mi,v 1.2382 2021/04/23 01:56:14 mrg Exp $ | 1 | # $NetBSD: mi,v 1.2383 2021/04/23 22:50:05 mrg Exp $ | |
2 | # | 2 | # | |
3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | 3 | # Note: don't delete entries from here - mark them as "obsolete" instead. | |
4 | ./etc/mtree/set.comp comp-sys-root | 4 | ./etc/mtree/set.comp comp-sys-root | |
5 | ./usr/bin/addr2line comp-debug-bin binutils | 5 | ./usr/bin/addr2line comp-debug-bin binutils | |
6 | ./usr/bin/ar comp-util-bin binutils | 6 | ./usr/bin/ar comp-util-bin binutils | |
7 | ./usr/bin/as comp-util-bin binutils | 7 | ./usr/bin/as comp-util-bin binutils | |
8 | ./usr/bin/asa comp-fortran-bin | 8 | ./usr/bin/asa comp-fortran-bin | |
9 | ./usr/bin/atf-compile comp-obsolete obsolete | 9 | ./usr/bin/atf-compile comp-obsolete obsolete | |
10 | ./usr/bin/c++ comp-cxx-bin gcccmds | 10 | ./usr/bin/c++ comp-cxx-bin gcccmds | |
11 | ./usr/bin/c++filt comp-cxx-bin binutils | 11 | ./usr/bin/c++filt comp-cxx-bin binutils | |
12 | ./usr/bin/c11 comp-c-bin | 12 | ./usr/bin/c11 comp-c-bin | |
13 | ./usr/bin/c89 comp-c-bin | 13 | ./usr/bin/c89 comp-c-bin | |
14 | ./usr/bin/c99 comp-c-bin | 14 | ./usr/bin/c99 comp-c-bin | |
@@ -4188,26 +4188,27 @@ | @@ -4188,26 +4188,27 @@ | |||
4188 | ./usr/libdata/lint/llib-ltre.ln comp-c-lintlib lint | 4188 | ./usr/libdata/lint/llib-ltre.ln comp-c-lintlib lint | |
4189 | ./usr/libdata/lint/llib-ltspi.ln comp-c-lintlib tpm,lint | 4189 | ./usr/libdata/lint/llib-ltspi.ln comp-c-lintlib tpm,lint | |
4190 | ./usr/libdata/lint/llib-lukfs.ln comp-c-lintlib lint,rump | 4190 | ./usr/libdata/lint/llib-lukfs.ln comp-c-lintlib lint,rump | |
4191 | ./usr/libdata/lint/llib-lunbound.ln comp-c-lintlib lint,unbound | 4191 | ./usr/libdata/lint/llib-lunbound.ln comp-c-lintlib lint,unbound | |
4192 | ./usr/libdata/lint/llib-lusb.ln comp-obsolete obsolete | 4192 | ./usr/libdata/lint/llib-lusb.ln comp-obsolete obsolete | |
4193 | ./usr/libdata/lint/llib-lusbhid.ln comp-c-lintlib lint | 4193 | ./usr/libdata/lint/llib-lusbhid.ln comp-c-lintlib lint | |
4194 | ./usr/libdata/lint/llib-lutil.ln comp-c-lintlib lint | 4194 | ./usr/libdata/lint/llib-lutil.ln comp-c-lintlib lint | |
4195 | ./usr/libdata/lint/llib-lwrap.ln comp-c-lintlib lint | 4195 | ./usr/libdata/lint/llib-lwrap.ln comp-c-lintlib lint | |
4196 | ./usr/libdata/lint/llib-ly.ln comp-c-lintlib lint | 4196 | ./usr/libdata/lint/llib-ly.ln comp-c-lintlib lint | |
4197 | ./usr/libdata/lint/llib-lz.ln comp-c-lintlib lint | 4197 | ./usr/libdata/lint/llib-lz.ln comp-c-lintlib lint | |
4198 | ./usr/libdata/lint/strict-bool/stdbool.h comp-c-bin | 4198 | ./usr/libdata/lint/strict-bool/stdbool.h comp-c-bin | |
4199 | ./usr/libexec/cc1 comp-c-bin gcccmds | 4199 | ./usr/libexec/cc1 comp-c-bin gcccmds | |
4200 | ./usr/libexec/cc1obj comp-objc-bin gcccmds | 4200 | ./usr/libexec/cc1obj comp-objc-bin gcccmds | |
4201 | ./usr/libexec/cc1objplus comp-objc-bin gcccmds,gcc=10 | |||
4201 | ./usr/libexec/cc1plus comp-cxx-bin gcccmds | 4202 | ./usr/libexec/cc1plus comp-cxx-bin gcccmds | |
4202 | ./usr/libexec/ccom comp-c-bin pcc | 4203 | ./usr/libexec/ccom comp-c-bin pcc | |
4203 | ./usr/libexec/collect2 comp-obsolete obsolete | 4204 | ./usr/libexec/collect2 comp-obsolete obsolete | |
4204 | ./usr/libexec/cpp comp-obsolete pcc,obsolete | 4205 | ./usr/libexec/cpp comp-obsolete pcc,obsolete | |
4205 | ./usr/libexec/cxxcom comp-cxx-bin pcc | 4206 | ./usr/libexec/cxxcom comp-cxx-bin pcc | |
4206 | ./usr/libexec/f771 comp-obsolete obsolete | 4207 | ./usr/libexec/f771 comp-obsolete obsolete | |
4207 | ./usr/libexec/lint1 comp-c-bin | 4208 | ./usr/libexec/lint1 comp-c-bin | |
4208 | ./usr/libexec/lint2 comp-c-bin | 4209 | ./usr/libexec/lint2 comp-c-bin | |
4209 | ./usr/libexec/lto-wrapper comp-c-bin gcc,gcccmds,pic | 4210 | ./usr/libexec/lto-wrapper comp-c-bin gcc,gcccmds,pic | |
4210 | ./usr/libexec/lto1 comp-c-bin gcc,gcccmds,pic | 4211 | ./usr/libexec/lto1 comp-c-bin gcc,gcccmds,pic | |
4211 | ./usr/libexec/pcpp comp-c-bin pcc | 4212 | ./usr/libexec/pcpp comp-c-bin pcc | |
4212 | ./usr/sbin/config comp-obsolete obsolete | 4213 | ./usr/sbin/config comp-obsolete obsolete | |
4213 | ./usr/sbin/config.new comp-obsolete obsolete | 4214 | ./usr/sbin/config.new comp-obsolete obsolete |
--- src/distrib/sets/lists/debug/mi 2021/04/23 15:21:49 1.350
+++ src/distrib/sets/lists/debug/mi 2021/04/23 22:50:06 1.351
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: mi,v 1.350 2021/04/23 15:21:49 rin Exp $ | 1 | # $NetBSD: mi,v 1.351 2021/04/23 22:50:06 mrg Exp $ | |
2 | ./etc/mtree/set.debug comp-sys-root | 2 | ./etc/mtree/set.debug comp-sys-root | |
3 | ./usr/lib comp-sys-usr compatdir | 3 | ./usr/lib comp-sys-usr compatdir | |
4 | ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile | 4 | ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile | |
5 | ./usr/lib/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compatfile | 5 | ./usr/lib/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compatfile | |
6 | ./usr/lib/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compatfile | 6 | ./usr/lib/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compatfile | |
7 | ./usr/lib/i18n/libEUC_g.a comp-c-debuglib debuglib,compatfile | 7 | ./usr/lib/i18n/libEUC_g.a comp-c-debuglib debuglib,compatfile | |
8 | ./usr/lib/i18n/libGBK2K_g.a comp-c-debuglib debuglib,compatfile | 8 | ./usr/lib/i18n/libGBK2K_g.a comp-c-debuglib debuglib,compatfile | |
9 | ./usr/lib/i18n/libHZ_g.a comp-c-debuglib debuglib,compatfile | 9 | ./usr/lib/i18n/libHZ_g.a comp-c-debuglib debuglib,compatfile | |
10 | ./usr/lib/i18n/libISO2022_g.a comp-c-debuglib debuglib,compatfile | 10 | ./usr/lib/i18n/libISO2022_g.a comp-c-debuglib debuglib,compatfile | |
11 | ./usr/lib/i18n/libJOHAB_g.a comp-c-debuglib debuglib,compatfile | 11 | ./usr/lib/i18n/libJOHAB_g.a comp-c-debuglib debuglib,compatfile | |
12 | ./usr/lib/i18n/libMSKanji_g.a comp-c-debuglib debuglib,compatfile | 12 | ./usr/lib/i18n/libMSKanji_g.a comp-c-debuglib debuglib,compatfile | |
13 | ./usr/lib/i18n/libUES_g.a comp-c-debuglib debuglib,compatfile | 13 | ./usr/lib/i18n/libUES_g.a comp-c-debuglib debuglib,compatfile | |
14 | ./usr/lib/i18n/libUTF1632_g.a comp-c-debuglib debuglib,compatfile | 14 | ./usr/lib/i18n/libUTF1632_g.a comp-c-debuglib debuglib,compatfile | |
@@ -947,26 +947,27 @@ | @@ -947,26 +947,27 @@ | |||
947 | ./usr/libdata/debug/usr/games/warp.debug comp-games-debug debug | 947 | ./usr/libdata/debug/usr/games/warp.debug comp-games-debug debug | |
948 | ./usr/libdata/debug/usr/games/worm.debug comp-games-debug debug | 948 | ./usr/libdata/debug/usr/games/worm.debug comp-games-debug debug | |
949 | ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug | 949 | ./usr/libdata/debug/usr/games/worms.debug comp-games-debug debug | |
950 | ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug | 950 | ./usr/libdata/debug/usr/games/wump.debug comp-games-debug debug | |
951 | ./usr/libdata/debug/usr/libexec/atf-check.debug comp-atf-debug atf,debug | 951 | ./usr/libdata/debug/usr/libexec/atf-check.debug comp-atf-debug atf,debug | |
952 | ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-obsolete obsolete | 952 | ./usr/libdata/debug/usr/libexec/atf-cleanup.debug comp-obsolete obsolete | |
953 | ./usr/libdata/debug/usr/libexec/atf-exec.debug comp-obsolete obsolete | 953 | ./usr/libdata/debug/usr/libexec/atf-exec.debug comp-obsolete obsolete | |
954 | ./usr/libdata/debug/usr/libexec/atf-format.debug comp-obsolete obsolete | 954 | ./usr/libdata/debug/usr/libexec/atf-format.debug comp-obsolete obsolete | |
955 | ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete | 955 | ./usr/libdata/debug/usr/libexec/atf-killpg.debug comp-obsolete obsolete | |
956 | ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug | 956 | ./usr/libdata/debug/usr/libexec/atrun.debug comp-cron-debug debug | |
957 | ./usr/libdata/debug/usr/libexec/bozohttpd.debug comp-netutil-debug debug | 957 | ./usr/libdata/debug/usr/libexec/bozohttpd.debug comp-netutil-debug debug | |
958 | ./usr/libdata/debug/usr/libexec/cc1.debug comp-c-debug gcccmds,debug | 958 | ./usr/libdata/debug/usr/libexec/cc1.debug comp-c-debug gcccmds,debug | |
959 | ./usr/libdata/debug/usr/libexec/cc1obj.debug comp-objc-debug gcccmds,debug | 959 | ./usr/libdata/debug/usr/libexec/cc1obj.debug comp-objc-debug gcccmds,debug | |
960 | ./usr/libdata/debug/usr/libexec/cc1objplus.debug comp-objc-debug gcccmds,gcc=10,debug | |||
960 | ./usr/libdata/debug/usr/libexec/cc1plus.debug comp-cxx-debug gcccmds,debug | 961 | ./usr/libdata/debug/usr/libexec/cc1plus.debug comp-cxx-debug gcccmds,debug | |
961 | ./usr/libdata/debug/usr/libexec/ccom.debug comp-c-debug pcc,debug | 962 | ./usr/libdata/debug/usr/libexec/ccom.debug comp-c-debug pcc,debug | |
962 | ./usr/libdata/debug/usr/libexec/ching/castching.debug comp-games-debug debug | 963 | ./usr/libdata/debug/usr/libexec/ching/castching.debug comp-games-debug debug | |
963 | ./usr/libdata/debug/usr/libexec/ching/printching.debug comp-games-debug debug | 964 | ./usr/libdata/debug/usr/libexec/ching/printching.debug comp-games-debug debug | |
964 | ./usr/libdata/debug/usr/libexec/comsat.debug comp-mail-debug debug | 965 | ./usr/libdata/debug/usr/libexec/comsat.debug comp-mail-debug debug | |
965 | ./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcc,obsolete | 966 | ./usr/libdata/debug/usr/libexec/cpp.debug comp-obsolete pcc,obsolete | |
966 | ./usr/libdata/debug/usr/libexec/cxxcom.debug comp-cxx-debug pcc,debug | 967 | ./usr/libdata/debug/usr/libexec/cxxcom.debug comp-cxx-debug pcc,debug | |
967 | ./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug | 968 | ./usr/libdata/debug/usr/libexec/digest-service.debug comp-krb5-debug kerberos,debug | |
968 | ./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete obsolete | 969 | ./usr/libdata/debug/usr/libexec/f771.debug comp-obsolete obsolete | |
969 | ./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug | 970 | ./usr/libdata/debug/usr/libexec/fingerd.debug comp-netutil-debug debug | |
970 | ./usr/libdata/debug/usr/libexec/ftp-proxy.debug comp-obsolete obsolete | 971 | ./usr/libdata/debug/usr/libexec/ftp-proxy.debug comp-obsolete obsolete | |
971 | ./usr/libdata/debug/usr/libexec/ftpd.debug comp-netutil-debug debug | 972 | ./usr/libdata/debug/usr/libexec/ftpd.debug comp-netutil-debug debug | |
972 | ./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug | 973 | ./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug |
--- src/external/gpl3/gcc/usr.bin/Makefile 2021/04/23 01:56:14 1.12
+++ src/external/gpl3/gcc/usr.bin/Makefile 2021/04/23 22:50:06 1.13
@@ -1,31 +1,31 @@ | @@ -1,31 +1,31 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2021/04/23 01:56:14 mrg Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2021/04/23 22:50:06 mrg Exp $ | |
2 | 2 | |||
3 | NOOBJ=# defined | 3 | NOOBJ=# defined | |
4 | 4 | |||
5 | .include <bsd.init.mk> | 5 | .include <bsd.init.mk> | |
6 | 6 | |||
7 | GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} | 7 | GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} | |
8 | 8 | |||
9 | .if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk) | 9 | .if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk) | |
10 | 10 | |||
11 | .if ${MKGCCCMDS} != "no" || make(includes) | 11 | .if ${MKGCCCMDS} != "no" || make(includes) | |
12 | 12 | |||
13 | # We keep libcpp here since it depends upon frontend. | 13 | # We keep libcpp here since it depends upon frontend. | |
14 | SUBDIR+= host-libiberty .WAIT \ | 14 | SUBDIR+= host-libiberty .WAIT \ | |
15 | host-libcpp .WAIT \ | 15 | host-libcpp .WAIT \ | |
16 | backend .WAIT \ | 16 | backend .WAIT \ | |
17 | frontend .WAIT \ | 17 | frontend .WAIT \ | |
18 | common common-target .WAIT \ | 18 | common common-target .WAIT \ | |
19 | libcpp libdecnumber .WAIT \ | 19 | libcpp libdecnumber .WAIT \ | |
20 | gcov gcov-dump cc1 cc1obj cc1plus cpp g++ gcc \ | 20 | gcov gcov-dump cc1 cc1obj cc1objplus cc1plus cpp g++ gcc \ | |
21 | lto1 lto-wrapper lto-dump \ | 21 | lto1 lto-wrapper lto-dump \ | |
22 | include | 22 | include | |
23 | 23 | |||
24 | .endif | 24 | .endif | |
25 | 25 | |||
26 | .include <bsd.subdir.mk> | 26 | .include <bsd.subdir.mk> | |
27 | 27 | |||
28 | .else | 28 | .else | |
29 | # Do nothing. (PROG undefined) | 29 | # Do nothing. (PROG undefined) | |
30 | .include <bsd.prog.mk> | 30 | .include <bsd.prog.mk> | |
31 | .endif | 31 | .endif |
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile 2020/09/05 14:24:26 1.19
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile 2021/04/23 22:50:06 1.20
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2020/09/05 14:24:26 mrg Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2021/04/23 22:50:06 mrg Exp $ | |
2 | 2 | |||
3 | PROG= cc1 | 3 | PROG= cc1 | |
4 | SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c} | 4 | SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c} | |
5 | SRCS+= main.c ${PROG}-checksum.c | 5 | SRCS+= main.c ${PROG}-checksum.c | |
6 | CPPFLAGS+= -DPREFIX=\"/usr\" | 6 | CPPFLAGS+= -DPREFIX=\"/usr\" | |
7 | 7 | |||
8 | .include "../Makefile.backend" | 8 | .include "../Makefile.backend" | |
9 | .include "../Makefile.backtrace" | 9 | .include "../Makefile.backtrace" | |
10 | .include "../Makefile.libcpp" | 10 | .include "../Makefile.libcpp" | |
11 | .include "../Makefile.libdecnumber" | 11 | .include "../Makefile.libdecnumber" | |
12 | 12 | |||
13 | CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \ | 13 | CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \ | |
14 | main.o \ | 14 | main.o \ | |
@@ -30,29 +30,26 @@ COPTS.c-ada-spec.c= -Wno-stack-protector | @@ -30,29 +30,26 @@ COPTS.c-ada-spec.c= -Wno-stack-protector | |||
30 | COPTS.c-attribs.c= -Wno-stack-protector | 30 | COPTS.c-attribs.c= -Wno-stack-protector | |
31 | COPTS.c-aux-info.c= -Wno-stack-protector | 31 | COPTS.c-aux-info.c= -Wno-stack-protector | |
32 | COPTS.c-common.c= -Wno-stack-protector | 32 | COPTS.c-common.c= -Wno-stack-protector | |
33 | COPTS.c-cppbuiltin.c= -Wno-stack-protector | 33 | COPTS.c-cppbuiltin.c= -Wno-stack-protector | |
34 | COPTS.c-decl.c= -Wno-stack-protector | 34 | COPTS.c-decl.c= -Wno-stack-protector | |
35 | COPTS.c-format.c= -Wno-stack-protector | 35 | COPTS.c-format.c= -Wno-stack-protector | |
36 | COPTS.c-format.h= -Wno-stack-protector | 36 | COPTS.c-format.h= -Wno-stack-protector | |
37 | COPTS.c-lex.c= -Wno-stack-protector | 37 | COPTS.c-lex.c= -Wno-stack-protector | |
38 | COPTS.c-opts.c= -Wno-stack-protector | 38 | COPTS.c-opts.c= -Wno-stack-protector | |
39 | COPTS.c-ppoutput.c= -Wno-stack-protector | 39 | COPTS.c-ppoutput.c= -Wno-stack-protector | |
40 | COPTS.c-pragma.c= -Wno-stack-protector | 40 | COPTS.c-pragma.c= -Wno-stack-protector | |
41 | COPTS.c-typeck.c= -Wno-stack-protector | 41 | COPTS.c-typeck.c= -Wno-stack-protector | |
42 | 42 | |||
43 | COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :} | |||
44 | COPTS.c-typeck.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :} | |||
45 | ||||
46 | CPPFLAGS.default-c.c+= -I${BACKENDOBJ} | 43 | CPPFLAGS.default-c.c+= -I${BACKENDOBJ} | |
47 | 44 | |||
48 | .if ${MACHINE_CPU} == "sh3" | 45 | .if ${MACHINE_CPU} == "sh3" | |
49 | BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh-c.cc sh-c.c | 46 | BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh-c.cc sh-c.c | |
50 | .endif | 47 | .endif | |
51 | 48 | |||
52 | .if ${MACHINE_CPU} == "vax" | 49 | .if ${MACHINE_CPU} == "vax" | |
53 | COPTS.c-decl.c+=-O0 | 50 | COPTS.c-decl.c+=-O0 | |
54 | COPTS.c-typeck.c+=-O0 | 51 | COPTS.c-typeck.c+=-O0 | |
55 | COPTS.c-array-notation.c+=-O0 | 52 | COPTS.c-array-notation.c+=-O0 | |
56 | COPTS.c-common.c+=-O0 | 53 | COPTS.c-common.c+=-O0 | |
57 | COPTS.c-ada-spec.c+=-O0 | 54 | COPTS.c-ada-spec.c+=-O0 | |
58 | COPTS.cilk.c+=-O0 | 55 | COPTS.cilk.c+=-O0 |
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile 2020/09/05 14:24:26 1.17
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile 2021/04/23 22:50:06 1.18
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2020/09/05 14:24:26 mrg Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2021/04/23 22:50:06 mrg Exp $ | |
2 | 2 | |||
3 | MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} | 3 | MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} | |
4 | PROG= cc1obj | 4 | PROG= cc1obj | |
5 | SRCS= ${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c} | 5 | SRCS= ${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c} | |
6 | SRCS+= main.c ${PROG}-checksum.c | 6 | SRCS+= main.c ${PROG}-checksum.c | |
7 | 7 | |||
8 | CPPFLAGS+= -I${DIST}/gcc/objc | 8 | CPPFLAGS+= -I${DIST}/gcc/objc | |
9 | CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\" | 9 | CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\" | |
10 | 10 | |||
11 | .include "../Makefile.backend" | 11 | .include "../Makefile.backend" | |
12 | .include "../Makefile.backtrace" | 12 | .include "../Makefile.backtrace" | |
13 | .include "../Makefile.libcpp" | 13 | .include "../Makefile.libcpp" | |
14 | .include "../Makefile.libdecnumber" | 14 | .include "../Makefile.libdecnumber" | |
@@ -34,29 +34,26 @@ COPTS.c-attribs.c+= -Wno-stack-protect | @@ -34,29 +34,26 @@ COPTS.c-attribs.c+= -Wno-stack-protect | |||
34 | COPTS.c-aux-info.c+= -Wno-stack-protector | 34 | COPTS.c-aux-info.c+= -Wno-stack-protector | |
35 | COPTS.c-common.c+= -Wno-stack-protector | 35 | COPTS.c-common.c+= -Wno-stack-protector | |
36 | COPTS.c-cppbuiltin.c+= -Wno-stack-protector | 36 | COPTS.c-cppbuiltin.c+= -Wno-stack-protector | |
37 | COPTS.c-decl.c+= -Wno-stack-protector | 37 | COPTS.c-decl.c+= -Wno-stack-protector | |
38 | COPTS.c-format.c+= -Wno-stack-protector | 38 | COPTS.c-format.c+= -Wno-stack-protector | |
39 | COPTS.c-lex.c+= -Wno-stack-protector | 39 | COPTS.c-lex.c+= -Wno-stack-protector | |
40 | COPTS.c-ppoutput.c+= -Wno-stack-protector | 40 | COPTS.c-ppoutput.c+= -Wno-stack-protector | |
41 | COPTS.c-pragma.c+= -Wno-stack-protector | 41 | COPTS.c-pragma.c+= -Wno-stack-protector | |
42 | COPTS.c-typeck.c+= -Wno-stack-protector | 42 | COPTS.c-typeck.c+= -Wno-stack-protector | |
43 | COPTS.objc-act.c+= -Wno-stack-protector | 43 | COPTS.objc-act.c+= -Wno-stack-protector | |
44 | COPTS.objc-gnu-runtime-abi-01.c+= -Wno-stack-protector | 44 | COPTS.objc-gnu-runtime-abi-01.c+= -Wno-stack-protector | |
45 | COPTS.objc-next-runtime-abi-01.c+= -Wno-stack-protector | 45 | COPTS.objc-next-runtime-abi-01.c+= -Wno-stack-protector | |
46 | 46 | |||
47 | COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :} | |||
48 | COPTS.c-typeck.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :} | |||
49 | ||||
50 | .if ${MACHINE_ARCH} == "vax" | 47 | .if ${MACHINE_ARCH} == "vax" | |
51 | COPTS.c-decl.c+=-O0 | 48 | COPTS.c-decl.c+=-O0 | |
52 | COPTS.c-typeck.c+=-O0 | 49 | COPTS.c-typeck.c+=-O0 | |
53 | COPTS.c-array-notation.c+=-O0 | 50 | COPTS.c-array-notation.c+=-O0 | |
54 | COPTS.c-common.c+=-O0 | 51 | COPTS.c-common.c+=-O0 | |
55 | COPTS.c-ada-spec.c+=-O0 | 52 | COPTS.c-ada-spec.c+=-O0 | |
56 | COPTS.cilk.c+=-O0 | 53 | COPTS.cilk.c+=-O0 | |
57 | COPTS.c-ubsan.c+=-O0 | 54 | COPTS.c-ubsan.c+=-O0 | |
58 | COPTS.cc1obj-checksum.c+=-O0 | 55 | COPTS.cc1obj-checksum.c+=-O0 | |
59 | .endif | 56 | .endif | |
60 | 57 | |||
61 | .if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel" | 58 | .if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel" | |
62 | COPTS.c-common.c+=-O3 | 59 | COPTS.c-common.c+=-O3 |
# $NetBSD: Makefile,v 1.1 2021/04/23 22:50:06 mrg Exp $
# XXX: Pull this (G_OBJCXX_OBJS) out with mknative-gcc. Needs some
# minor re-org of cc1plus and perhaps cc1obj. G_CXX_AND_OBJCXX_OBJS
# is reverse-derived from G_CXX_OBJS for now - when G_OBJCXX_OBJS is
# pulled out by mknative-gcc, it will include G_CXX_AND_OBJCXX_OBJS.
G_CXX_AND_OBJCXX_OBJS= ${G_CXX_OBJS:S,cp-lang.o,,:S,c-family/stub-objc.o,,}
G_OBJCXX_OBJS= \
objcp-act.o \
objcp-lang.o \
objcp/objcp-decl.o \
objcp/objc-runtime-shared-support.o \
objcp/objc-gnu-runtime-abi-01.o \
objcp/objc-next-runtime-abi-01.o \
objcp/objc-next-runtime-abi-02.o \
objcp/objc-encoding.o \
objcp/objc-map.o \
${G_CXX_AND_OBJCXX_OBJS}
BUILDSYMLINKS+= ${DIST}/gcc/objc/objc-act.c objcp-act.c \
${DIST}/gcc/objc/objc-lang.c objcp-lang.c
MYOBJS= ${G_OBJCXX_OBJS}
MY2OBJS= ${MYOBJS:S,objcp/,,:S,objc/,,:S,cp/,,:S,c-family/,,:S,c/,,}
PROG= cc1objplus
SRCS= ${MY2OBJS:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
SRCS+= main.c ${PROG}-checksum.c
CPPFLAGS+= -I${DIST}/gcc/objc
CPPFLAGS+= -I${DIST}/gcc/objcp
CPPFLAGS+= -I${DIST}/gcc/cp
CPPFLAGS+= -DOBJCPLUS
CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\"
.include "../Makefile.backend"
.include "../Makefile.backtrace"
.include "../Makefile.libcpp"
.include "../Makefile.libdecnumber"
CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \
main.o \
${LIBBACKTRACEOBJ}/libbacktrace.a \
${COMMONTARGETOBJ}/libcommon-target.a \
${COMMONOBJ}/libcommon.a \
${LIBCPPOBJ}/libcpp.a \
${LIBDECNUMBEROBJ}/libdecnumber.a \
${LIBIBERTYOBJ}/libiberty.a \
${MY2OBJS} \
checksum-options
.include "../Makefile.checksum"
COPTS.c-ada-spec.c+= -Wno-stack-protector
COPTS.c-attribs.c+= -Wno-stack-protector
COPTS.c-aux-info.c+= -Wno-stack-protector
COPTS.c-common.c+= -Wno-stack-protector
COPTS.c-cppbuiltin.c+= -Wno-stack-protector
COPTS.c-decl.c+= -Wno-stack-protector
COPTS.c-format.c+= -Wno-stack-protector
COPTS.c-lex.c+= -Wno-stack-protector
COPTS.c-ppoutput.c+= -Wno-stack-protector
COPTS.c-pragma.c+= -Wno-stack-protector
COPTS.c-typeck.c+= -Wno-stack-protector
COPTS.objc-act.c+= -Wno-stack-protector
COPTS.objc-gnu-runtime-abi-01.c+= -Wno-stack-protector
COPTS.objc-next-runtime-abi-01.c+= -Wno-stack-protector
.if ${MACHINE_ARCH} == "vax"
COPTS.c-decl.c+=-O0
COPTS.c-typeck.c+=-O0
COPTS.c-array-notation.c+=-O0
COPTS.c-common.c+=-O0
COPTS.c-ada-spec.c+=-O0
COPTS.cilk.c+=-O0
COPTS.c-ubsan.c+=-O0
COPTS.cc1obj-checksum.c+=-O0
COPTS.decl.c+=-O0
.endif
.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
COPTS.c-common.c+=-O3
.endif
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
.PATH: ${DIST}/gcc/objcp ${DIST}/gcc/objc ${DIST}/gcc/c ${DIST}/gcc/c-family
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/config
.PATH: ${G_out_file:H}