Wed Sep 10 12:18:54 2014 UTC ()
Fix build on NetBSD 7+


(joerg)
diff -r1.25 -r1.26 pkgsrc/lang/gcc34/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/gcc34/patches/patch-ac
diff -r0 -r1.1 pkgsrc/lang/gcc34/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
diff -r0 -r1.1 pkgsrc/lang/gcc34/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
cvs diff -r1.25 -r1.26 pkgsrc/lang/gcc34/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc34/Attic/distinfo 2014/07/02 22:10:40 1.25
+++ pkgsrc/lang/gcc34/Attic/distinfo 2014/09/10 12:18:54 1.26
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1$NetBSD: distinfo,v 1.25 2014/07/02 22:10:40 asau Exp $ 1$NetBSD: distinfo,v 1.26 2014/09/10 12:18:54 joerg Exp $
2 2
3SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b 3SHA1 (gcc-3.4.6.tar.bz2) = 97b290fdc572c8e490b3b39f243e69bacad23c2b
4RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442 4RMD160 (gcc-3.4.6.tar.bz2) = b15003368cedc7964f6ceaee0c39ddc43a46c442
5Size (gcc-3.4.6.tar.bz2) = 28193401 bytes 5Size (gcc-3.4.6.tar.bz2) = 28193401 bytes
6SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6 6SHA1 (patch-aa) = 40ba26c4af81ecc0effce3b7ac3c74bdfe4b56a6
7SHA1 (patch-ab) = 53fa4226d3ee30a2d165aa1ef8f64e0da03cadd4 7SHA1 (patch-ab) = 53fa4226d3ee30a2d165aa1ef8f64e0da03cadd4
8SHA1 (patch-ac) = 3366f3f779771a9b0aad013ce23a257f11d9ae70 8SHA1 (patch-ac) = 83ffa3ecd0938e435aa19437f8d4cf855c43825e
9SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192 9SHA1 (patch-ae) = 928fa6155e614ca85b02359cf893d6c62231b192
10SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee 10SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
11SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 11SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
12SHA1 (patch-ah) = 3b3471f42e801f8588c1e0959d5cfa704ce16a3e 12SHA1 (patch-ah) = 3b3471f42e801f8588c1e0959d5cfa704ce16a3e
13SHA1 (patch-ai) = 78320fde6d073cb4bc87b281b83168f173344341 13SHA1 (patch-ai) = 78320fde6d073cb4bc87b281b83168f173344341
14SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e 14SHA1 (patch-aj) = ea0bef88be9e823ed2acfa54a59f29016de8cc5e
15SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5 15SHA1 (patch-ak) = 1188e98e65fce3b968f9a2c211ffe315644d87d5
16SHA1 (patch-al) = 3368a43981499dd46b2caa111eae19a0549d7499 16SHA1 (patch-al) = 3368a43981499dd46b2caa111eae19a0549d7499
17SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c 17SHA1 (patch-am) = 5a27d8f6a289f9b110a4bdc640547e43b799f08c
18SHA1 (patch-at) = f74c2cd4919c59c0591e5aac7fdf8bb20fb87b96 18SHA1 (patch-at) = f74c2cd4919c59c0591e5aac7fdf8bb20fb87b96
19SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 19SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6
20SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 20SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0
21SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386 21SHA1 (patch-ca) = e04ff912406505abd015789f288ef09a7e1ae386
22SHA1 (patch-cc) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12 22SHA1 (patch-cc) = 0af9845a62f9a6f8ec27657d0ae0c16394e9fc12
23SHA1 (patch-cd) = a22078951e1369900fcb58a281c75b3a86edd3ea 23SHA1 (patch-cd) = a22078951e1369900fcb58a281c75b3a86edd3ea
24SHA1 (patch-gcc_config_freebsd-spec.h) = 447c789c1162c4f7e6a132a630a6f6b360026b0e 24SHA1 (patch-gcc_config_freebsd-spec.h) = 447c789c1162c4f7e6a132a630a6f6b360026b0e
25SHA1 (patch-gcc_config_sol2.h) = 2c701850bc752e73b2b8c1eb46f123c5c6fa1d93 25SHA1 (patch-gcc_config_sol2.h) = 2c701850bc752e73b2b8c1eb46f123c5c6fa1d93
 26SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = cb1aff0b78e46c62c9e419b8db75527c3bcfb7ae
 27SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h) = 42260bd6dfbd67cef270258d96b0dd914291ac0e
cvs diff -r1.3 -r1.4 pkgsrc/lang/gcc34/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/lang/gcc34/patches/Attic/patch-ac 2012/06/08 15:42:28 1.3
+++ pkgsrc/lang/gcc34/patches/Attic/patch-ac 2014/09/10 12:18:54 1.4
@@ -1,30 +1,44 @@ @@ -1,30 +1,44 @@
1$NetBSD: patch-ac,v 1.3 2012/06/08 15:42:28 joerg Exp $ 1$NetBSD: patch-ac,v 1.4 2014/09/10 12:18:54 joerg Exp $
2 2
3--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2002-06-24 07:50:58.000000000 +0200 3--- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig 2002-06-24 05:50:58.000000000 +0000
4+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 4+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
5@@ -44,6 +44,7 @@ 5@@ -43,6 +43,33 @@
 6
6 // NB: Offsets into ctype<char>::_M_table force a particular size 7 // NB: Offsets into ctype<char>::_M_table force a particular size
7 // on the mask type. Because of this, we don't use an enum. 8 // on the mask type. Because of this, we don't use an enum.
8 typedef unsigned char mask; 9+#if defined(_CTYPE_BL)
9+#if !defined(_CTYPE_U) 10+ typedef unsigned short mask;
10 static const mask upper = _U; 11+ static const mask upper = _CTYPE_U;
11 static const mask lower = _L; 12+ static const mask lower = _CTYPE_L;
12 static const mask alpha = _U | _L; 13+ static const mask alpha = _CTYPE_A;
13@@ -55,4 +56,17 @@ 14+ static const mask digit = _CTYPE_D;
14 static const mask cntrl = _C; 15+ static const mask xdigit = _CTYPE_X;
15 static const mask punct = _P; 16+ static const mask space = _CTYPE_S;
16 static const mask alnum = _U | _L | _N; 17+ static const mask print = _CTYPE_R;
17+#else 18+ static const mask graph = _CTYPE_G;
 19+ static const mask cntrl = _CTYPE_C;
 20+ static const mask punct = _CTYPE_P;
 21+ static const mask alnum = _CTYPE_A | _CTYPE_D;
 22+#elif defined(_CTYPE_U)
 23+ typedef unsigned char mask;
18+ static const mask upper = _CTYPE_U; 24+ static const mask upper = _CTYPE_U;
19+ static const mask lower = _CTYPE_L; 25+ static const mask lower = _CTYPE_L;
20+ static const mask alpha = _CTYPE_U | _CTYPE_L; 26+ static const mask alpha = _CTYPE_U | _CTYPE_L;
21+ static const mask digit = _CTYPE_N; 27+ static const mask digit = _CTYPE_N;
22+ static const mask xdigit = _CTYPE_N | _CTYPE_X; 28+ static const mask xdigit = _CTYPE_N | _CTYPE_X;
23+ static const mask space = _CTYPE_S; 29+ static const mask space = _CTYPE_S;
24+ static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B; 30+ static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B;
25+ static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N; 31+ static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N;
26+ static const mask cntrl = _CTYPE_C; 32+ static const mask cntrl = _CTYPE_C;
27+ static const mask punct = _CTYPE_P; 33+ static const mask punct = _CTYPE_P;
28+ static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; 34+ static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N;
 35+#else
 36 typedef unsigned char mask;
 37 static const mask upper = _U;
 38 static const mask lower = _L;
 39@@ -55,4 +82,5 @@
 40 static const mask cntrl = _C;
 41 static const mask punct = _P;
 42 static const mask alnum = _U | _L | _N;
29+#endif 43+#endif
30 }; 44 };
File Added: pkgsrc/lang/gcc34/patches/Attic/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h
$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h,v 1.1 2014/09/10 12:18:54 joerg Exp $

--- libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h.orig	2002-06-24 05:50:58.000000000 +0000
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_inline.h
@@ -44,7 +44,7 @@
   is(const char* __low, const char* __high, mask* __vec) const
   {
     while (__low < __high)
-      *__vec++ = _M_table[*__low++];
+      *__vec++ = _M_table[(unsigned char)*__low++];
     return __high;
   }
File Added: pkgsrc/lang/gcc34/patches/Attic/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h
$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__noninline.h,v 1.1 2014/09/10 12:18:54 joerg Exp $

--- libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h.orig	2003-12-16 01:57:03.000000000 +0000
+++ libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h
@@ -33,11 +33,17 @@
   
 // Information as gleaned from /usr/include/ctype.h
 
+#ifndef _CTYPE_BL
   extern "C" const u_int8_t _C_ctype_[];
+#endif
 
   const ctype_base::mask*
   ctype<char>::classic_table() throw()
-  { return _C_ctype_ + 1; }
+#ifdef _CTYPE_BL
+  { return _C_ctype_tab_ + 1; }
+#else
+   { return _C_ctype_ + 1; }
+#endif
 
   ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
 		     size_t __refs) 
@@ -64,14 +70,14 @@
 
   char
   ctype<char>::do_toupper(char __c) const
-  { return ::toupper((int) __c); }
+  { return ::toupper((int)(unsigned char) __c); }
 
   const char*
   ctype<char>::do_toupper(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = ::toupper((int) *__low);
+	*__low = ::toupper((int)(unsigned char) *__low);
 	++__low;
       }
     return __high;
@@ -79,14 +85,14 @@
 
   char
   ctype<char>::do_tolower(char __c) const
-  { return ::tolower((int) __c); }
+  { return ::tolower((int)(unsigned char) __c); }
 
   const char* 
   ctype<char>::do_tolower(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = ::tolower((int) *__low);
+	*__low = ::tolower((int)(unsigned char) *__low);
 	++__low;
       }
     return __high;