Module Name: src
Committed By: plunky
Date: Tue Feb 9 20:40:46 UTC 2016
Modified Files:
src/external/bsd/pcc: Makefile.inc
src/external/bsd/pcc/include: config.h
src/external/bsd/pcc/libexec/ccom: Makefile
src/external/bsd/pcc/libexec/cpp: Makefile
src/external/bsd/pcc/libexec/cxxcom: Makefile
src/external/bsd/pcc/usr.bin/pcc: Makefile
Log Message:
update build machinery for pcc-20160208
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/pcc/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pcc/include/config.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/pcc/libexec/ccom/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pcc/libexec/cpp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/pcc/libexec/cxxcom/Makefile
cvs rdiff -u -r1.10 -r1.11 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.18 src/external/bsd/pcc/Makefile.inc:1.19
--- src/external/bsd/pcc/Makefile.inc:1.18 Thu Jul 24 20:20:48 2014
+++ src/external/bsd/pcc/Makefile.inc Tue Feb 9 20:40:45 2016
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.18 2014/07/24 20:20:48 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.19 2016/02/09 20:40:45 plunky Exp $
PCC_DIR:=${.PARSEDIR}
PCC_DIST=${PCC_DIR}/dist/pcc
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=20140706
+PCC_VERSION=1.2.0.DEVEL
+PCC_DATESTAMP=20160208
TARGOS = netbsd
@@ -22,10 +22,11 @@ TARGMACH = ${MACHINE_ARCH}
ERROR!= echo "ERROR: ${TARGMACH} not yet supported - write code!" >&2;echo
.endif
-VERSSTR="pcc ${PCC_VERSION} ${PCC_DATESTAMP} for ${TARGOS}-${TARGMACH}"
+VERSSTR="pcc ${PCC_VERSION} ${PCC_DATESTAMP} for ${TARGMACH}--${TARGOS}"
CPPFLAGS+= -DGCC_COMPAT
CPPFLAGS+= -DPCC_DEBUG
+CPPFLAGS+= -D_ISOC99_SOURCE
CPPFLAGS+= -DVERSSTR=${VERSSTR:Q}
CPPFLAGS+= -Dos_${TARGOS}
CPPFLAGS+= -Dmach_${TARGMACH}
Index: src/external/bsd/pcc/include/config.h
diff -u src/external/bsd/pcc/include/config.h:1.7 src/external/bsd/pcc/include/config.h:1.8
--- src/external/bsd/pcc/include/config.h:1.7 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/include/config.h Tue Feb 9 20:40:45 2016
@@ -1,6 +1,9 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
/* Using a.out ABI */
/* #undef AOUTABI */
@@ -22,9 +25,6 @@
/* Using ELF ABI */
#define ELFABI 1
-/* Define to 1 if you have the `basename' function. */
-#define HAVE_BASENAME 1
-
/* Define to 1 if printf supports C99 size specifiers */
#define HAVE_C99_FORMAT 1
@@ -106,26 +106,32 @@
/* Using Mach-O ABI */
/* #undef MACHOABI */
+/* Define target Multi-Arch path */
+/* #undef MULTIARCH_PATH */
+
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "<pcc-l...@ludd.ltu.se>"
+#define PACKAGE_BUGREPORT "p...@lists.ludd.ltu.se"
/* Define to the full name of this package. */
-#define PACKAGE_NAME "pcc"
+#define PACKAGE_NAME "Portable C Compiler"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pcc 1.1.0.DEVEL"
+#define PACKAGE_STRING "Portable C Compiler 1.2.0.DEVEL"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcc"
+/* Define to the home page for this package. */
+#define PACKAGE_URL "http://pcc.ludd.ltu.se/";
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0.DEVEL"
+#define PACKAGE_VERSION "1.2.0.DEVEL"
/* Major version no */
#define PCC_MAJOR 1
/* Minor version no */
-#define PCC_MINOR 1
+#define PCC_MINOR 2
/* Minor minor version no */
#define PCC_MINORMINOR 0
@@ -155,7 +161,7 @@
#define TLS 1
/* Version string */
-/* #define VERSSTR "pcc 1.1.0.DEVEL 20140706 for i386-unknown-netbsdelf6.99.40" */
+/* #define VERSSTR "Portable C Compiler 1.2.0.DEVEL 20160208 for i386-unknown-netbsdelf7.99.25" */
/* Size of wide-character type in chars */
#define WCHAR_SIZE 4
@@ -163,6 +169,18 @@
/* Type to use for wide characters */
#define WCHAR_TYPE INT
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#define YYTEXT_POINTER 1
Index: src/external/bsd/pcc/libexec/ccom/Makefile
diff -u src/external/bsd/pcc/libexec/ccom/Makefile:1.13 src/external/bsd/pcc/libexec/ccom/Makefile:1.14
--- src/external/bsd/pcc/libexec/ccom/Makefile:1.13 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/libexec/ccom/Makefile Tue Feb 9 20:40:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/24 20:20:49 plunky Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/09 20:40:45 plunky Exp $
WARNS?= 2
@@ -10,14 +10,14 @@ WARNS?= 2
PROG= ccom
-SRCS= cgram.y
+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 unicode.c
-MAN= ccom.1
+MAN= ccom.1
# generate cgram.h
YHEADER=
@@ -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+= ${${ACTIVE_CC} == "gcc" :? -Wno-uninitialized :}
+COPTS+= ${${ACTIVE_CC} == "gcc" :? -Wno-error=stack-protector :}
DPSRCS= external.c
Index: src/external/bsd/pcc/libexec/cpp/Makefile
diff -u src/external/bsd/pcc/libexec/cpp/Makefile:1.10 src/external/bsd/pcc/libexec/cpp/Makefile:1.11
--- src/external/bsd/pcc/libexec/cpp/Makefile:1.10 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/libexec/cpp/Makefile Tue Feb 9 20:40:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/07/24 20:20:49 plunky Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/09 20:40:45 plunky Exp $
.include <bsd.init.mk>
@@ -10,8 +10,7 @@
PROG= pcpp
-SRCS= cpy.y
-SRCS+= cpp.c token.c
+SRCS+= cpc.c cpp.c token.c
MAN= pcpp.1
@@ -24,8 +23,7 @@ CPPFLAGS+= -I${.OBJDIR}
CPPFLAGS+= -I${PCC_DIST}/mip
CPPFLAGS+= -I${PCC_DIST}/cc/cpp
-# generate cpy.h
-YHEADER=
+COPTS.cpp.c+= ${${ACTIVE_CC} == "gcc" :? -Wno-error=cast-qual :}
CLEANFILES+= pcpp.1
Index: src/external/bsd/pcc/libexec/cxxcom/Makefile
diff -u src/external/bsd/pcc/libexec/cxxcom/Makefile:1.1 src/external/bsd/pcc/libexec/cxxcom/Makefile:1.2
--- src/external/bsd/pcc/libexec/cxxcom/Makefile:1.1 Thu Jul 24 20:20:49 2014
+++ src/external/bsd/pcc/libexec/cxxcom/Makefile Tue Feb 9 20:40:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/07/24 20:20:49 plunky Exp $
+# $NetBSD: Makefile,v 1.2 2016/02/09 20:40:45 plunky Exp $
WARNS?= 2
@@ -22,14 +22,13 @@ MAN=
# generate cgram.h
YHEADER=
+CPPFLAGS+= -DLANG_CXX
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}
Index: src/external/bsd/pcc/usr.bin/pcc/Makefile
diff -u src/external/bsd/pcc/usr.bin/pcc/Makefile:1.10 src/external/bsd/pcc/usr.bin/pcc/Makefile:1.11
--- src/external/bsd/pcc/usr.bin/pcc/Makefile:1.10 Thu Jul 24 20:55:45 2014
+++ src/external/bsd/pcc/usr.bin/pcc/Makefile Tue Feb 9 20:40:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/07/24 20:55:45 plunky Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/09 20:40:46 plunky Exp $
WARNS?= 2
@@ -29,7 +29,11 @@ pcc.1: cc.1
-e "s,Xr cpp,Xr pcpp," \
${.ALLSRC} > ${.TARGET}
+CPPFLAGS+= -DCPPROGNAME=\"pcpp\"
+SYMLINKS+= ${BINDIR}/pcc /usr/bin/pcpp
+
.if ${MKCXX} != "no"
+CPPFLAGS+= -DCXXPROGNAME=\"p++\"
SYMLINKS+= ${BINDIR}/pcc /usr/bin/p++
.endif
