Module Name: src
Committed By: plunky
Date: Thu Sep 1 13:00:15 UTC 2011
Modified Files:
src/external/bsd/pcc: Makefile Makefile.inc prepare-import.sh
src/external/bsd/pcc/include: config.h
src/external/bsd/pcc/libexec/ccom: Makefile
src/external/bsd/pcc/usr.bin/pcc: Makefile
Removed Files:
src/external/bsd/pcc/lib: Makefile Makefile.inc
src/external/bsd/pcc/lib/libpcc: Makefile
Log Message:
update build machinery for pcc-20110901
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/pcc/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pcc/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/include/config.h
cvs rdiff -u -r1.3 -r0 src/external/bsd/pcc/lib/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/pcc/lib/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/external/bsd/pcc/lib/libpcc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pcc/libexec/ccom/Makefile
cvs rdiff -u -r1.7 -r1.8 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
diff -u src/external/bsd/pcc/Makefile:1.2 src/external/bsd/pcc/Makefile:1.3
--- src/external/bsd/pcc/Makefile:1.2 Wed Jan 20 11:45:54 2010
+++ src/external/bsd/pcc/Makefile Thu Sep 1 13:00:14 2011
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2010/01/20 11:45:54 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2011/09/01 13:00:14 plunky Exp $
-SUBDIR= lib libexec usr.bin
+SUBDIR= libexec usr.bin
.include <bsd.subdir.mk>
Index: src/external/bsd/pcc/Makefile.inc
diff -u src/external/bsd/pcc/Makefile.inc:1.14 src/external/bsd/pcc/Makefile.inc:1.15
--- src/external/bsd/pcc/Makefile.inc:1.14 Tue Jun 7 13:30:35 2011
+++ src/external/bsd/pcc/Makefile.inc Thu Sep 1 13:00:14 2011
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.14 2011/06/07 13:30:35 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.15 2011/09/01 13:00:14 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=20110901
+
TARGOS = netbsd
.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
@@ -18,8 +22,7 @@
ERROR!= echo "ERROR: ${TARGMACH} not yet supported - write code!" >&2;echo
.endif
-# this string will be updated by the prepare-import.sh script
-VERSSTR = PACKAGE_STRING " for ${TARGOS}-${TARGMACH}"
+VERSSTR="pcc ${PCC_VERSION} ${PCC_DATESTAMP} for ${TARGOS}-${TARGMACH}"
CPPFLAGS+= -DGCC_COMPAT
CPPFLAGS+= -DPCC_DEBUG
Index: src/external/bsd/pcc/prepare-import.sh
diff -u src/external/bsd/pcc/prepare-import.sh:1.5 src/external/bsd/pcc/prepare-import.sh:1.6
--- src/external/bsd/pcc/prepare-import.sh:1.5 Tue Jun 7 13:07:26 2011
+++ src/external/bsd/pcc/prepare-import.sh Thu Sep 1 13:00:14 2011
@@ -17,10 +17,10 @@
set -e
-if [ ! -d work -o ! -d work/pcc -o ! -d work/pcc-libs ]; then
- echo "checkout or unpack pcc and pcc-libs to work/ first, eg"
+if [ ! -d work -o ! -d work/pcc ]; then
+ echo "checkout or unpack pcc to work/ first, eg"
echo ""
- echo " cvs -d :pserver:[email protected]:/cvsroot -f checkout -P -d work -N pcc pcc-libs"
+ echo " cvs -d :pserver:[email protected]:/cvsroot -f checkout -P -d work -N pcc"
echo ""
exit 1
fi
@@ -46,7 +46,7 @@
echo "====> Creating pcc \"config.h\" file..."
mkdir work/tmp
cd work/tmp
-env -i PATH=/bin:/usr/bin /bin/sh ../pcc/configure
+env -i PATH=/bin:/usr/bin /bin/sh ../pcc/configure --enable-tls
cd ../..
#
# comment out items we provide at build time from Makefile.inc
@@ -65,12 +65,13 @@
#
datestamp=$(cat work/pcc/DATESTAMP)
version=$(sed -n -e "/PACKAGE_VERSION/s/.*\"\(.*\)\"/\1/p" < work/config.h)
-sed -e "s,^VERSSTR=.*$,VERSSTR=\"pcc ${version} ${datestamp} for \${TARGMACH}-\${TARGOS}\"," \
+sed -e "/^PCC_DATESTAMP=/s/=.*$/=${datestamp}/" \
+ -e "/^PCC_VERSION=/s/=.*$/=${version}/" \
< Makefile.inc > work/Makefile.inc
echo "====> Replacing pcc sources..."
rm -Rf dist/pcc dist/pcc-libs
-mv work/pcc work/pcc-libs dist
+mv work/pcc dist
if cmp -s work/config.h include/config.h; then :; else
echo "====> Updating include/config.h..."
mv work/config.h include/config.h
Index: src/external/bsd/pcc/include/config.h
diff -u src/external/bsd/pcc/include/config.h:1.3 src/external/bsd/pcc/include/config.h:1.4
--- src/external/bsd/pcc/include/config.h:1.3 Thu Jun 3 19:17:22 2010
+++ src/external/bsd/pcc/include/config.h Thu Sep 1 13:00:14 2011
@@ -22,6 +22,9 @@
/* Using ELF ABI */
#define ELFABI
+/* Enable STABS debugging output */
+#define STABS 1
+
/* Define to 1 if you have the `basename' function. */
#define HAVE_BASENAME 1
@@ -119,22 +122,22 @@
#define PACKAGE_NAME "pcc"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pcc 0.9.9 [20100603]"
+#define PACKAGE_STRING "pcc 1.1.0.DEVEL"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcc"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.9.9"
+#define PACKAGE_VERSION "1.1.0.DEVEL"
/* Major version no */
-#define PCC_MAJOR 0
+#define PCC_MAJOR 1
/* Minor version no */
-#define PCC_MINOR 9
+#define PCC_MINOR 1
/* Minor minor version no */
-#define PCC_MINORMINOR 9
+#define PCC_MINORMINOR 0
/* Using PE/COFF ABI */
/* #undef PECOFFABI */
@@ -154,19 +157,13 @@
/* Define if target defaults to LITTLE endian */
/* #define TARGET_LITTLE_ENDIAN 1 */
-/* Target OS */
-#define TARGOS netbsd
-
-/* Target OS version */
-#define TARGOSVER 5
-
/* Enable thread-local storage (TLS). */
-/* #undef TLS */
+#define TLS 1
/* Version string */
-/* #define VERSSTR "pcc 0.9.9 for i386-unknown-netbsdelf5.99.29, plunky@galant Thu Jun 3 19:37:55 BST 2010" */
+/* #define VERSSTR "pcc 1.1.0.DEVEL 20110901 for i386-unknown-netbsdelf5.99.55" */
-/* Size of wide character type */
+/* Size of wide-character type in chars */
#define WCHAR_SIZE 4
/* Type to use for wide characters */
@@ -174,4 +171,4 @@
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
-/* #undef YYTEXT_POINTER */
+#define YYTEXT_POINTER 1
Index: src/external/bsd/pcc/libexec/ccom/Makefile
diff -u src/external/bsd/pcc/libexec/ccom/Makefile:1.10 src/external/bsd/pcc/libexec/ccom/Makefile:1.11
--- src/external/bsd/pcc/libexec/ccom/Makefile:1.10 Wed Aug 10 08:10:39 2011
+++ src/external/bsd/pcc/libexec/ccom/Makefile Thu Sep 1 13:00:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/10 08:10:39 plunky Exp $
+# $NetBSD: Makefile,v 1.11 2011/09/01 13:00:14 plunky Exp $
WARNS?= 2
@@ -28,7 +28,6 @@
CPPFLAGS+= -I${PCC_DIST}/arch/${TARGMACH}
CPPFLAGS+= -I${PCC_DIST}/cc/ccom
-COPTS.scan.c+= -Wno-unused
COPTS.pftn.c+= -Wno-uninitialized
DPSRCS= external.c
Index: src/external/bsd/pcc/usr.bin/pcc/Makefile
diff -u src/external/bsd/pcc/usr.bin/pcc/Makefile:1.7 src/external/bsd/pcc/usr.bin/pcc/Makefile:1.8
--- src/external/bsd/pcc/usr.bin/pcc/Makefile:1.7 Fri Jun 3 13:31:25 2011
+++ src/external/bsd/pcc/usr.bin/pcc/Makefile Thu Sep 1 13:00:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/06/03 13:31:25 plunky Exp $
+# $NetBSD: Makefile,v 1.8 2011/09/01 13:00:15 plunky Exp $
WARNS?= 2
@@ -14,7 +14,8 @@
SRCS= cc.c
MAN= pcc.1
-CPPFLAGS+= -DTARGMACH=${TARGMACH}
+CPPFLAGS+= -DTARGOS=\"${TARGOS}\"
+CPPFLAGS+= -DTARGMACH=\"${TARGMACH}\"
CPPFLAGS+= -DLIBEXECDIR=\"/usr/libexec/\"
CPPFLAGS+= -DINCLUDEDIR=\"/usr/include/\"
CPPFLAGS+= -I${PCC_DIST}/mip
