[src/trunk]: src/external/bsd/pcc update build machinery for pcc-20110901

[plunky <plunky%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/252fd11a7779
branches:  trunk
changeset: 769148:252fd11a7779
user:      plunky <plunky%NetBSD.org@localhost>
date:      Thu Sep 01 13:00:14 2011 +0000

description:
update build machinery for pcc-20110901

diffstat:

 external/bsd/pcc/Makefile              |   4 ++--
 external/bsd/pcc/Makefile.inc          |   9 ++++++---
 external/bsd/pcc/include/config.h      |  27 ++++++++++++---------------
 external/bsd/pcc/lib/Makefile          |   5 -----
 external/bsd/pcc/lib/Makefile.inc      |   4 ----
 external/bsd/pcc/lib/libpcc/Makefile   |  26 --------------------------
 external/bsd/pcc/libexec/ccom/Makefile |   3 +--
 external/bsd/pcc/prepare-import.sh     |  13 +++++++------
 external/bsd/pcc/usr.bin/pcc/Makefile  |   5 +++--
 9 files changed, 31 insertions(+), 65 deletions(-)

diffs (234 lines):

diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/Makefile
--- a/external/bsd/pcc/Makefile Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/Makefile Thu Sep 01 13:00:14 2011 +0000
@@ -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>
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/Makefile.inc
--- a/external/bsd/pcc/Makefile.inc     Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/Makefile.inc     Thu Sep 01 13:00:14 2011 +0000
@@ -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
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/include/config.h
--- a/external/bsd/pcc/include/config.h Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/include/config.h Thu Sep 01 13:00:14 2011 +0000
@@ -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
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/lib/Makefile
--- a/external/bsd/pcc/lib/Makefile     Thu Sep 01 12:55:29 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: Makefile,v 1.3 2010/02/05 08:46:25 plunky Exp $
-
-SUBDIR=                libpcc
-
-.include <bsd.subdir.mk>
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/lib/Makefile.inc
--- a/external/bsd/pcc/lib/Makefile.inc Thu Sep 01 12:55:29 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: Makefile.inc,v 1.2 2010/02/05 08:41:13 plunky Exp $
-
-.include "../Makefile.inc"
-.include "../../../../lib/Makefile.inc"
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/lib/libpcc/Makefile
--- a/external/bsd/pcc/lib/libpcc/Makefile      Thu Sep 01 12:55:29 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2011/05/22 12:01:26 plunky Exp $
-
-.include <bsd.init.mk>
-
-.PATH: ${PCC_LIBS}/libpcc
-
-LIB=   pcc
-
-SRCS=  cmpdi2.c divdi3.c fixdfdi.c fixsfdi.c fixunsdfdi.c \
-       fixunssfdi.c floatdidf.c floatdisf.c floatunsdidf.c \
-       moddi3.c muldi3.c negdi2.c qdivrem.c \
-       ucmpdi2.c udivdi3.c umoddi3.c 
-SRCS+= ashldi3.c ashrdi3.c lshrdi3.c
-SRCS+= ssp.c
-
-COPTS.ssp.c+=  -Wno-error
-
-.if ${TARGET_ENDIANNESS} == "1234"
-CPPFLAGS+=      -D__LITTLE_ENDIAN__
-.elif ${TARGET_ENDIANNESS} == "4321"
-CPPFLAGS+=      -D__BIG_ENDIAN__
-.else
-ERROR!= echo "ERROR: Unknown TARGET_ENDIANNESS" >&2;echo
-.endif
-
-.include <bsd.lib.mk>
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/libexec/ccom/Makefile
--- a/external/bsd/pcc/libexec/ccom/Makefile    Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/libexec/ccom/Makefile    Thu Sep 01 13:00:14 2011 +0000
@@ -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
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/prepare-import.sh
--- a/external/bsd/pcc/prepare-import.sh        Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/prepare-import.sh        Thu Sep 01 13:00:14 2011 +0000
@@ -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:anonymous%pcc.ludd.ltu.se@localhost:/cvsroot -f checkout -P -d work -N pcc pcc-libs"
+       echo "    cvs -d :pserver:anonymous%pcc.ludd.ltu.se@localhost:/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
diff -r 4e44db313149 -r 252fd11a7779 external/bsd/pcc/usr.bin/pcc/Makefile
--- a/external/bsd/pcc/usr.bin/pcc/Makefile     Thu Sep 01 12:55:29 2011 +0000
+++ b/external/bsd/pcc/usr.bin/pcc/Makefile     Thu Sep 01 13:00:14 2011 +0000
@@ -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