-mt should be discarded, not ignored.

2 files changed, 30 insertions, 26 deletions

diff --git a/pkgtools/cwrappers/files/bin/transform-gcc-rules b/pkgtools/cwrappers/files/bin/transform-gcc-rules
index 1b3126dbfd4..c2130685a84 100644
--- a/pkgtools/cwrappers/files/bin/transform-gcc-rules
+++ b/pkgtools/cwrappers/files/bin/transform-gcc-rules
@@ -1,4 +1,4 @@
-# $NetBSD: transform-gcc-rules,v 1.2 2015/03/18 14:54:53 joerg Exp $
+# $NetBSD: transform-gcc-rules,v 1.3 2015/03/18 15:01:21 joerg Exp $
 #
 # Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -162,6 +162,8 @@
 # Options specific to Objective C
 -fconstant-string-class=*
 -fgnu-runtime
+# Solaris compilers used this for threading
+-mt ==|
 # Compatibility with other compilers
 -Kpic ==> -fPIC
 -kpic ==> -fPIC
diff --git a/pkgtools/cwrappers/files/bin/transform-gcc.c b/pkgtools/cwrappers/files/bin/transform-gcc.c
index 414afdddece..3d50d576456 100644
--- a/pkgtools/cwrappers/files/bin/transform-gcc.c
+++ b/pkgtools/cwrappers/files/bin/transform-gcc.c
@@ -3,34 +3,35 @@
 static uint32_t
 transform_cc_fixed(const void * __restrict key, size_t keylen)
 {
-	static const uint8_t g[219] = {
-	    0x00, 0x00, 0x00, 0x14, 0x00, 0x35, 0x49, 0x15, 0x53, 0x45,
-	    0x56, 0x00, 0x12, 0x1b, 0x40, 0x00, 0x00, 0x3b, 0x3a, 0x00,
-	    0x00, 0x50, 0x00, 0x00, 0x06, 0x00, 0x18, 0x00, 0x00, 0x00,
-	    0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	    0x62, 0x4c, 0x00, 0x00, 0x1f, 0x3c, 0x00, 0x3d, 0x00, 0x00,
-	    0x15, 0x00, 0x03, 0x00, 0x1c, 0x10, 0x00, 0x00, 0x4a, 0x00,
-	    0x33, 0x00, 0x00, 0x00, 0x50, 0x00, 0x15, 0x00, 0x00, 0x00,
-	    0x24, 0x27, 0x3f, 0x24, 0x46, 0x00, 0x6a, 0x00, 0x00, 0x32,
-	    0x66, 0x00, 0x00, 0x48, 0x60, 0x01, 0x6b, 0x00, 0x28, 0x10,
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x20, 0x4c, 0x33, 0x00,
-	    0x32, 0x61, 0x08, 0x54, 0x00, 0x00, 0x48, 0x00, 0x4c, 0x56,
-	    0x00, 0x5f, 0x00, 0x00, 0x00, 0x5b, 0x55, 0x64, 0x68, 0x2f,
-	    0x00, 0x5a, 0x64, 0x51, 0x00, 0x00, 0x00, 0x26, 0x4e, 0x00,
-	    0x00, 0x0e, 0x00, 0x00, 0x00, 0x6c, 0x13, 0x1c, 0x00, 0x00,
-	    0x0c, 0x00, 0x00, 0x09, 0x2e, 0x00, 0x0d, 0x00, 0x00, 0x1e,
-	    0x12, 0x00, 0x23, 0x3e, 0x58, 0x00, 0x00, 0x36, 0x00, 0x0f,
-	    0x00, 0x0e, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x29, 0x30,
-	    0x00, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00,
-	    0x00, 0x13, 0x00, 0x00, 0x25, 0x65, 0x00, 0x00, 0x31, 0x00,
-	    0x00, 0x32, 0x29, 0x22, 0x54, 0x41, 0x14, 0x00, 0x00, 0x00,
-	    0x00, 0x5e, 0x05, 0x38, 0x2e, 0x00, 0x00, 0x00, 0x38, 0x5f,
-	    0x43, 0x00, 0x1e, 0x44, 0x26, 0x00, 0x00, 0x4e, 0x19,
+	static const uint8_t g[221] = {
+	    0x00, 0x28, 0x00, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
+	    0x60, 0x29, 0x63, 0x10, 0x00, 0x2c, 0x57, 0x0e, 0x26, 0x00,
+	    0x2c, 0x00, 0x2a, 0x00, 0x2d, 0x00, 0x00, 0x67, 0x2e, 0x00,
+	    0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x1b, 0x4e, 0x00,
+	    0x00, 0x00, 0x00, 0x1c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	    0x21, 0x55, 0x0b, 0x20, 0x00, 0x46, 0x00, 0x00, 0x4d, 0x3e,
+	    0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x5f, 0x22, 0x00,
+	    0x42, 0x58, 0x14, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x41, 0x07,
+	    0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x55, 0x00,
+	    0x42, 0x00, 0x00, 0x40, 0x04, 0x4e, 0x09, 0x00, 0x00, 0x00,
+	    0x42, 0x67, 0x00, 0x20, 0x34, 0x68, 0x39, 0x00, 0x69, 0x00,
+	    0x00, 0x00, 0x00, 0x21, 0x00, 0x31, 0x17, 0x00, 0x00, 0x3d,
+	    0x38, 0x5b, 0x00, 0x61, 0x00, 0x55, 0x00, 0x00, 0x3b, 0x4b,
+	    0x55, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x44,
+	    0x00, 0x6d, 0x00, 0x5c, 0x06, 0x3e, 0x00, 0x4d, 0x45, 0x59,
+	    0x39, 0x2c, 0x00, 0x45, 0x00, 0x00, 0x6d, 0x00, 0x0b, 0x00,
+	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x63,
+	    0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x1a, 0x5f,
+	    0x1e, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x57, 0x2a,
+	    0x5f, 0x38, 0x5a, 0x00, 0x08, 0x2f, 0x30, 0x00, 0x00, 0x64,
+	    0x18, 0x00, 0x51, 0x20, 0x00, 0x0d, 0x00, 0x55, 0x18, 0x15,
+	    0x48, 0x00, 0x00, 0x4f, 0x37, 0x58, 0x00, 0x62, 0x1d, 0x00,
+	    0x05,
 	};
 	uint32_t h[3];
 
-	mi_vector_hash(key, keylen, 0x507ed7abU, h);
-	return (g[h[0] % 219] + g[h[1] % 219]) % 109;
+	mi_vector_hash(key, keylen, 0x327b23c6U, h);
+	return (g[h[0] % 221] + g[h[1] % 221]) % 110;
 }
 
 static struct transformation fixed_transforms[] = {
@@ -138,6 +139,7 @@ static struct transformation fixed_transforms[] = {
 	{ "-fno-rtti", 9, transform_pass, NULL },
 	{ "-Wno-non-virtual-dtor", 21, transform_pass, NULL },
 	{ "-fgnu-runtime", 13, transform_pass, NULL },
+	{ "-mt", 3, transform_discard, NULL },
 	{ "-Kpic", 5, transform_replace, "-fPIC" },
 	{ "-kpic", 5, transform_replace, "-fPIC" },
 	{ "-KPIC", 5, transform_replace, "-fPIC" },