Module Name: src
Committed By: plunky
Date: Thu Jul 24 20:20:49 UTC 2014
Modified Files:
src/external/bsd/pcc: Makefile.inc
src/external/bsd/pcc/include: config.h
src/external/bsd/pcc/libexec: Makefile
src/external/bsd/pcc/libexec/ccom: Makefile
src/external/bsd/pcc/libexec/cpp: Makefile
src/external/bsd/pcc/usr.bin/pcc: Makefile
Added Files:
src/external/bsd/pcc/libexec/cxxcom: Makefile
Log Message:
update build framework for import of pcc-20140706
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/pcc/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pcc/include/config.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pcc/libexec/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/pcc/libexec/ccom/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pcc/libexec/cpp/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/pcc/libexec/cxxcom/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pcc/usr.bin/pcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/Makefile.inc
diff -u src/external/bsd/pcc/Makefile.inc:1.17 src/external/bsd/pcc/Makefile.inc:1.18
--- src/external/bsd/pcc/Makefile.inc:1.17 Mon Mar 26 14:31:12 2012
+++ src/external/bsd/pcc/Makefile.inc Thu Jul 24 20:20:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2012/03/26 14:31:12 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.18 2014/07/24 20:20:48 plunky Exp $
PCC_DIR:=${.PARSEDIR}
PCC_DIST=${PCC_DIR}/dist/pcc
@@ -6,7 +6,7 @@ PCC_LIBS=${PCC_DIR}/dist/pcc-libs
# (these strings will be updated by the prepare-import.sh script)
PCC_VERSION=1.1.0.DEVEL
-PCC_DATESTAMP=20120325
+PCC_DATESTAMP=20140706
TARGOS = netbsd
Index: src/external/bsd/pcc/include/config.h
diff -u src/external/bsd/pcc/include/config.h:1.6 src/external/bsd/pcc/include/config.h:1.7
--- src/external/bsd/pcc/include/config.h:1.6 Mon Mar 26 14:31:12 2012
+++ src/external/bsd/pcc/include/config.h Thu Jul 24 20:20:49 2014
@@ -20,10 +20,7 @@
/* #undef ECOFFABI */
/* Using ELF ABI */
-#define ELFABI
-
-/* Enable STABS debugging output */
-#define STABS 1
+#define ELFABI 1
/* Define to 1 if you have the `basename' function. */
#define HAVE_BASENAME 1
@@ -31,9 +28,6 @@
/* Define to 1 if printf supports C99 size specifiers */
#define HAVE_C99_FORMAT 1
-/* Define to 1 if your compiler supports C99 variadic macros */
-#define HAVE_CPP_VARARG_MACRO_GCC 1
-
/* Define to 1 if you have the `ffs' function. */
#define HAVE_FFS 1
@@ -101,10 +95,7 @@
/* #undef HOST_BIG_ENDIAN */
/* Define if host is LITTLE endian */
-/* #define HOST_LITTLE_ENDIAN */
-
-/* lex is flex */
-#define ISFLEX 1
+/* #define HOST_LITTLE_ENDIAN 1 */
/* Define alternate standard lib directory */
/* #undef LIBDIR */
@@ -145,6 +136,9 @@
/* Define path to alternate preprocessor */
#define PREPROCESSOR "pcpp"
+/* Enable STABS debugging output */
+#define STABS 1
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -161,7 +155,7 @@
#define TLS 1
/* Version string */
-/* #define VERSSTR "pcc 1.1.0.DEVEL 20120325 for i386-unknown-netbsdelf6.99.3" */
+/* #define VERSSTR "pcc 1.1.0.DEVEL 20140706 for i386-unknown-netbsdelf6.99.40" */
/* Size of wide-character type in chars */
#define WCHAR_SIZE 4
Index: src/external/bsd/pcc/libexec/Makefile
diff -u src/external/bsd/pcc/libexec/Makefile:1.6 src/external/bsd/pcc/libexec/Makefile:1.7
--- src/external/bsd/pcc/libexec/Makefile:1.6 Fri May 20 16:02:23 2011
+++ src/external/bsd/pcc/libexec/Makefile Thu Jul 24 20:20:49 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 16:02:23 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/24 20:20:49 plunky Exp $
.include <bsd.own.mk>
-SUBDIR= mkext .WAIT ccom cpp
+SUBDIR= mkext .WAIT ccom cpp cxxcom
.include <bsd.subdir.mk>
Index: src/external/bsd/pcc/libexec/ccom/Makefile
diff -u src/external/bsd/pcc/libexec/ccom/Makefile:1.12 src/external/bsd/pcc/libexec/ccom/Makefile:1.13
--- src/external/bsd/pcc/libexec/ccom/Makefile:1.12 Fri Mar 14 00:06:52 2014
+++ src/external/bsd/pcc/libexec/ccom/Makefile Thu Jul 24 20:20:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/14 00:06:52 christos Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/24 20:20:49 plunky Exp $
WARNS?= 2
@@ -15,7 +15,7 @@ SRCS+= scan.l
SRCS+= optim.c pftn.c trees.c inline.c symtabs.c
SRCS+= gcc_compat.c init.c local.c code.c stabs.c builtins.c
SRCS+= match.c reader.c optim2.c regs.c local2.c order.c table.c
-SRCS+= common.c main.c external.c
+SRCS+= common.c main.c external.c unicode.c
MAN= ccom.1
@@ -28,7 +28,7 @@ CPPFLAGS+= -I${PCC_DIST}/os/${TARGOS}
CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
CPPFLAGS+= -I${PCC_DIST}/cc/ccom
-COPTS.pftn.c+= -Wno-uninitialized
+COPTS.pftn.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-uninitialized :}
DPSRCS= external.c
Index: src/external/bsd/pcc/libexec/cpp/Makefile
diff -u src/external/bsd/pcc/libexec/cpp/Makefile:1.9 src/external/bsd/pcc/libexec/cpp/Makefile:1.10
--- src/external/bsd/pcc/libexec/cpp/Makefile:1.9 Tue Jun 7 13:30:35 2011
+++ src/external/bsd/pcc/libexec/cpp/Makefile Thu Jul 24 20:20:49 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/06/07 13:30:35 plunky Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/24 20:20:49 plunky Exp $
.include <bsd.init.mk>
-.PATH: ${PCC_DIST}/cc/cpp \
- ${PCC_DIST}/mip
+.PATH: ${PCC_DIST}/cc/cpp
#
# We build cpp(1) as pcpp(1) to avoid confusion with GCC
@@ -28,12 +27,6 @@ CPPFLAGS+= -I${PCC_DIST}/cc/cpp
# generate cpy.h
YHEADER=
-# some files include y.tab.h instead
-DPSRCS= y.tab.h
-
-y.tab.h: cpy.h
- ${HOST_LN} -f ${.ALLSRC} ${.TARGET}
-
-CLEANFILES+= pcpp.1 y.tab.h
+CLEANFILES+= pcpp.1
.include <bsd.prog.mk>
Index: src/external/bsd/pcc/usr.bin/pcc/Makefile
diff -u src/external/bsd/pcc/usr.bin/pcc/Makefile:1.8 src/external/bsd/pcc/usr.bin/pcc/Makefile:1.9
--- src/external/bsd/pcc/usr.bin/pcc/Makefile:1.8 Thu Sep 1 13:00:15 2011
+++ src/external/bsd/pcc/usr.bin/pcc/Makefile Thu Jul 24 20:20:49 2014
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2011/09/01 13:00:15 plunky Exp $
+# $NetBSD: Makefile,v 1.9 2014/07/24 20:20:49 plunky Exp $
WARNS?= 2
.include <bsd.init.mk>
-.PATH: ${PCC_DIST}/cc/cc
+.PATH: ${PCC_DIST}/cc/cc ${PCC_DIST}/cc/driver
#
# we build PCC cc(1) as pcc(1) to avoid conflicts with GCC
#
PROG= pcc
-SRCS= cc.c
+SRCS= cc.c strlist.o xalloc.o
MAN= pcc.1
CPPFLAGS+= -DTARGOS=\"${TARGOS}\"
CPPFLAGS+= -DTARGMACH=\"${TARGMACH}\"
CPPFLAGS+= -DLIBEXECDIR=\"/usr/libexec/\"
CPPFLAGS+= -DINCLUDEDIR=\"/usr/include/\"
+CPPFLAGS+= -I${PCC_DIST}/cc/driver
CPPFLAGS+= -I${PCC_DIST}/mip
CPPFLAGS+= -I${PCC_DIST}/os/${TARGOS}
CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
Added files:
Index: src/external/bsd/pcc/libexec/cxxcom/Makefile
diff -u /dev/null src/external/bsd/pcc/libexec/cxxcom/Makefile:1.1
--- /dev/null Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/libexec/cxxcom/Makefile Thu Jul 24 20:20:49 2014
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1 2014/07/24 20:20:49 plunky Exp $
+
+WARNS?= 2
+
+.include <bsd.init.mk>
+
+.PATH: ${PCC_DIST}/cc/cxxcom \
+ ${PCC_DIST}/arch/${TARGMACH} \
+ ${PCC_DIST}/mip
+
+PROG= cxxcom
+
+SRCS= cgram.y
+SRCS+= scan.l
+SRCS+= optim.c pftn.c trees.c inline.c symtabs.c
+SRCS+= gcc_compat.c init.c local.c code.c stabs.c builtins.c
+SRCS+= match.c reader.c optim2.c regs.c local2.c order.c table.c
+SRCS+= common.c main.c external.c cxxcode.c
+
+MAN=
+
+# generate cgram.h
+YHEADER=
+
+CPPFLAGS+= -I${.OBJDIR}
+CPPFLAGS+= -I${PCC_DIST}/mip
+CPPFLAGS+= -I${PCC_DIST}/os/${TARGOS}
+CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
+CPPFLAGS+= -I${PCC_DIST}/cc/cxxcom
+
+COPTS.pftn.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-uninitialized :}
+
+DPSRCS= external.c
+
+MKEXTDIR!= cd ${.CURDIR}/../mkext && ${PRINTOBJDIR}
+
+external.c: ${MKEXTDIR}/mkext
+ ${_MKTARGET_CREATE}
+ ${MKEXTDIR}/mkext
+
+CLEANFILES+= external.c external.h
+
+.include <bsd.prog.mk>
