Re: CVS commit: pkgsrc/pkgtools/cwrappers

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

From: Jonathan Perkin <jperkin%joyent.com@localhost>, Date: Wed, 18 Mar 2015 14:31:17 +0000

> * On 2015-03-18 at 14:16 GMT, Ryo ONODERA wrote:
> 
>> From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>, Date: Tue, 17 Mar 2015 18:39:45 +0000
>> 
>> > Module Name:       pkgsrc
>> > Committed By:      jperkin
>> > Date:              Tue Mar 17 18:39:45 UTC 2015
>> > 
>> > Modified Files:
>> >    pkgsrc/pkgtools/cwrappers: Makefile
>> >    pkgsrc/pkgtools/cwrappers/files/bin: transform-gcc.c
>> > 
>> > Log Message:
>> > cwrappers-20150317: Discard obsolete GCC '-mt' argument.
>> 
>> Hi,
>> 
>> I believe following patch and "make transform-gcc.c" is correct.
>> 
>> --mt ==> -threads
> 
> Not quite, my reading of the syntax is that it should be:
> 
>   --mt ==|
> 
> as we want to delete the argument, not pass it through.  However,
> thanks for the heads up, I wasn't aware it was a generated file.
> 
> In any case I can't use this method as it requires the NetBSD-only
> 'nbperf' utility, so feel free to tidy this up and verify that
> transform-gcc.c remains unchanged.

Hi,

Sorry, I misunderstood your English sentence.

With ==| patch, diff for transform-gcc.c is here.
Your part is unchanged.

Thank you.

Index: transform-gcc.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/cwrappers/files/bin/transform-gcc.c,v
retrieving revision 1.2
diff -u -r1.2 transform-gcc.c
--- transform-gcc.c     17 Mar 2015 18:39:45 -0000      1.2
+++ transform-gcc.c     18 Mar 2015 14:35:09 -0000
@@ -4,33 +4,33 @@
 transform_cc_fixed(const void * __restrict key, size_t keylen)
 {
        static const uint8_t g[221] = {
-           0x00, 0x6b, 0x00, 0x3d, 0x12, 0x21, 0x67, 0x16, 0x0d, 0x0b,
-           0x00, 0x1e, 0x00, 0x45, 0x0a, 0x0b, 0x00, 0x52, 0x00, 0x00,
-           0x00, 0x4a, 0x00, 0x2a, 0x00, 0x00, 0x5c, 0x2a, 0x45, 0x68,
-           0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x2a,
-           0x12, 0x57, 0x00, 0x43, 0x2f, 0x29, 0x00, 0x00, 0x00, 0x38,
-           0x67, 0x00, 0x00, 0x00, 0x00, 0x36, 0x50, 0x04, 0x00, 0x08,
-           0x32, 0x52, 0x00, 0x00, 0x3e, 0x67, 0x1f, 0x45, 0x00, 0x0f,
-           0x5b, 0x00, 0x00, 0x00, 0x00, 0x50, 0x58, 0x62, 0x00, 0x00,
-           0x17, 0x6b, 0x29, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x46, 0x00,
-           0x69, 0x00, 0x47, 0x19, 0x27, 0x00, 0x00, 0x00, 0x00, 0x2e,
-           0x00, 0x00, 0x2e, 0x00, 0x00, 0x39, 0x19, 0x68, 0x64, 0x00,
-           0x36, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x40, 0x00, 0x06, 0x43,
-           0x00, 0x00, 0x00, 0x6b, 0x00, 0x5f, 0x3f, 0x3c, 0x00, 0x51,
-           0x00, 0x00, 0x00, 0x39, 0x00, 0x04, 0x00, 0x41, 0x3e, 0x5e,
-           0x00, 0x00, 0x00, 0x56, 0x4b, 0x00, 0x17, 0x00, 0x00, 0x00,
-           0x47, 0x40, 0x00, 0x00, 0x00, 0x11, 0x0e, 0x00, 0x59, 0x33,
-           0x3f, 0x52, 0x00, 0x18, 0x42, 0x14, 0x00, 0x00, 0x00, 0x00,
-           0x18, 0x00, 0x00, 0x00, 0x68, 0x6b, 0x00, 0x00, 0x00, 0x2c,
-           0x1a, 0x00, 0x12, 0x00, 0x31, 0x00, 0x00, 0x16, 0x4a, 0x00,
-           0x00, 0x1a, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x3a, 0x00,
-           0x00, 0x00, 0x54, 0x4b, 0x00, 0x4c, 0x53, 0x1c, 0x00, 0x00,
-           0x00, 0x6d, 0x00, 0x00, 0x6b, 0x24, 0x00, 0x00, 0x22, 0x00,
+           0x17, 0x4d, 0x27, 0x00, 0x32, 0x4d, 0x18, 0x00, 0x6a, 0x00,
+           0x6b, 0x0b, 0x00, 0x00, 0x00, 0x24, 0x37, 0x00, 0x00, 0x00,
+           0x20, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x09, 0x03, 0x00,
+           0x00, 0x00, 0x00, 0x3f, 0x2c, 0x00, 0x5f, 0x00, 0x00, 0x0e,
+           0x6d, 0x19, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x53, 0x40,
+           0x22, 0x08, 0x2b, 0x00, 0x00, 0x4e, 0x5d, 0x57, 0x2a, 0x00,
+           0x00, 0x66, 0x05, 0x00, 0x49, 0x00, 0x00, 0x2f, 0x61, 0x00,
+           0x00, 0x4e, 0x10, 0x00, 0x54, 0x59, 0x00, 0x00, 0x00, 0x00,
+           0x33, 0x00, 0x60, 0x6c, 0x00, 0x00, 0x09, 0x6b, 0x0e, 0x00,
+           0x64, 0x64, 0x00, 0x62, 0x00, 0x00, 0x53, 0x00, 0x67, 0x00,
+           0x26, 0x08, 0x00, 0x30, 0x11, 0x58, 0x3f, 0x00, 0x00, 0x00,
+           0x4f, 0x32, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x15,
+           0x0a, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00,
+           0x00, 0x00, 0x15, 0x0d, 0x00, 0x5c, 0x17, 0x00, 0x00, 0x38,
+           0x05, 0x10, 0x00, 0x00, 0x14, 0x11, 0x00, 0x4c, 0x00, 0x4b,
+           0x2b, 0x00, 0x00, 0x20, 0x05, 0x0e, 0x11, 0x0b, 0x64, 0x6a,
+           0x00, 0x49, 0x54, 0x0e, 0x49, 0x6c, 0x00, 0x0b, 0x5f, 0x00,
+           0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x57, 0x62, 0x0b, 0x20,
+           0x00, 0x13, 0x00, 0x12, 0x00, 0x00, 0x46, 0x00, 0x66, 0x00,
+           0x64, 0x00, 0x58, 0x00, 0x00, 0x00, 0x35, 0x00, 0x31, 0x00,
+           0x42, 0x00, 0x00, 0x69, 0x51, 0x00, 0x00, 0x0c, 0x00, 0x01,
+           0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x19, 0x00, 0x31,
            0x00,
        };
        uint32_t h[3];
 
-       mi_vector_hash(key, keylen, 0xcee3bdd8U, h);
+       mi_vector_hash(key, keylen, 0x61ddae9bU, h);
        return (g[h[0] % 221] + g[h[1] % 221]) % 110;
 }
 


> Thanks,
> 
> -- 
> Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3