Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src build cc1objplus. don't forget debug set this time.



details:   https://anonhg.NetBSD.org/src/rev/c35e1a625c57
branches:  trunk
changeset: 961508:c35e1a625c57
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Apr 23 22:50:05 2021 +0000

description:
build cc1objplus.  don't forget debug set this time.

diffstat:

 distrib/sets/lists/comp/mi                    |   3 +-
 distrib/sets/lists/debug/mi                   |   3 +-
 external/gpl3/gcc/usr.bin/Makefile            |   4 +-
 external/gpl3/gcc/usr.bin/cc1/Makefile        |   5 +-
 external/gpl3/gcc/usr.bin/cc1obj/Makefile     |   5 +-
 external/gpl3/gcc/usr.bin/cc1objplus/Makefile |  90 +++++++++++++++++++++++++++
 6 files changed, 98 insertions(+), 12 deletions(-)

diffs (184 lines):

diff -r ce767c0be40c -r c35e1a625c57 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Fri Apr 23 20:26:43 2021 +0000
+++ b/distrib/sets/lists/comp/mi        Fri Apr 23 22:50:05 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2382 2021/04/23 01:56:14 mrg Exp $
+#      $NetBSD: mi,v 1.2383 2021/04/23 22:50:05 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -4198,6 +4198,7 @@
 ./usr/libdata/lint/strict-bool/stdbool.h       comp-c-bin
 ./usr/libexec/cc1                              comp-c-bin              gcccmds
 ./usr/libexec/cc1obj                           comp-objc-bin           gcccmds
+./usr/libexec/cc1objplus                       comp-objc-bin           gcccmds,gcc=10
 ./usr/libexec/cc1plus                          comp-cxx-bin            gcccmds
 ./usr/libexec/ccom                             comp-c-bin              pcc
 ./usr/libexec/collect2                         comp-obsolete           obsolete
diff -r ce767c0be40c -r c35e1a625c57 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Fri Apr 23 20:26:43 2021 +0000
+++ b/distrib/sets/lists/debug/mi       Fri Apr 23 22:50:05 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.350 2021/04/23 15:21:49 rin Exp $
+# $NetBSD: mi,v 1.351 2021/04/23 22:50:06 mrg Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib                                      comp-sys-usr            compatdir
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib,compatfile
@@ -957,6 +957,7 @@
 ./usr/libdata/debug/usr/libexec/bozohttpd.debug        comp-netutil-debug      debug
 ./usr/libdata/debug/usr/libexec/cc1.debug      comp-c-debug            gcccmds,debug
 ./usr/libdata/debug/usr/libexec/cc1obj.debug   comp-objc-debug         gcccmds,debug
+./usr/libdata/debug/usr/libexec/cc1objplus.debug       comp-objc-debug         gcccmds,gcc=10,debug
 ./usr/libdata/debug/usr/libexec/cc1plus.debug  comp-cxx-debug          gcccmds,debug
 ./usr/libdata/debug/usr/libexec/ccom.debug     comp-c-debug            pcc,debug
 ./usr/libdata/debug/usr/libexec/ching/castching.debug  comp-games-debug        debug
diff -r ce767c0be40c -r c35e1a625c57 external/gpl3/gcc/usr.bin/Makefile
--- a/external/gpl3/gcc/usr.bin/Makefile        Fri Apr 23 20:26:43 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile        Fri Apr 23 22:50:05 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2021/04/23 01:56:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2021/04/23 22:50:06 mrg Exp $
 
 NOOBJ=# defined
 
@@ -17,7 +17,7 @@
                frontend .WAIT \
                common common-target .WAIT \
                libcpp libdecnumber .WAIT \
-               gcov gcov-dump cc1 cc1obj cc1plus cpp g++ gcc \
+               gcov gcov-dump cc1 cc1obj cc1objplus cc1plus cpp g++ gcc \
                lto1 lto-wrapper lto-dump \
                include
 
diff -r ce767c0be40c -r c35e1a625c57 external/gpl3/gcc/usr.bin/cc1/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1/Makefile    Fri Apr 23 20:26:43 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1/Makefile    Fri Apr 23 22:50:05 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2020/09/05 14:24:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.20 2021/04/23 22:50:06 mrg Exp $
 
 PROG=          cc1
 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}
@@ -40,9 +40,6 @@
 COPTS.c-pragma.c=      -Wno-stack-protector
 COPTS.c-typeck.c=      -Wno-stack-protector
 
-COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-COPTS.c-typeck.c+=     ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-
 CPPFLAGS.default-c.c+= -I${BACKENDOBJ}
 
 .if ${MACHINE_CPU} == "sh3"
diff -r ce767c0be40c -r c35e1a625c57 external/gpl3/gcc/usr.bin/cc1obj/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile Fri Apr 23 20:26:43 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile Fri Apr 23 22:50:05 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2020/09/05 14:24:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.18 2021/04/23 22:50:06 mrg Exp $
 
 MYOBJS=                ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=          cc1obj
@@ -44,9 +44,6 @@
 COPTS.objc-gnu-runtime-abi-01.c+=      -Wno-stack-protector
 COPTS.objc-next-runtime-abi-01.c+=     -Wno-stack-protector
 
-COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-COPTS.c-typeck.c+=     ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
-
 .if ${MACHINE_ARCH} == "vax"
 COPTS.c-decl.c+=-O0
 COPTS.c-typeck.c+=-O0
diff -r ce767c0be40c -r c35e1a625c57 external/gpl3/gcc/usr.bin/cc1objplus/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1objplus/Makefile     Fri Apr 23 22:50:05 2021 +0000
@@ -0,0 +1,90 @@
+#      $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}



Home | Main Index | Thread Index | Old Index