[118773] trunk/dports/devel/valgrind

[sean at macports.org]

Revision: 118773
          https://trac.macports.org/changeset/118773
Author:   sean at macports.org
Date:     2014-04-10 17:13:22 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
valgrind{,-devel}: add patch for depracted __private_extern__; fixes #42910

Modified Paths:
--------------
    trunk/dports/devel/valgrind/Portfile

Added Paths:
-----------
    trunk/dports/devel/valgrind/files/patch-gcc.diff

Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile	2014-04-11 00:13:17 UTC (rev 118772)
+++ trunk/dports/devel/valgrind/Portfile	2014-04-11 00:13:22 UTC (rev 118773)
@@ -63,6 +63,12 @@
     }
 }
 
+pre-patch {
+    if {[gcc_variant_isset]} {
+        patchfiles-append patch-gcc.diff
+    }
+}
+
 pre-configure {
     if {[mpi_variant_isset]} {
         configure.args-delete --without-mpicc

Added: trunk/dports/devel/valgrind/files/patch-gcc.diff
===================================================================
--- trunk/dports/devel/valgrind/files/patch-gcc.diff	                        (rev 0)
+++ trunk/dports/devel/valgrind/files/patch-gcc.diff	2014-04-11 00:13:22 UTC (rev 118773)
@@ -0,0 +1,72 @@
+diff -rupN ../valgrind-orig/coregrind/m_syscall.c ./coregrind/m_syscall.c
+--- ../valgrind-orig/coregrind/m_syscall.c	2014-04-09 15:07:48.000000000 -0500
++++ ./coregrind/m_syscall.c	2014-04-09 15:09:06.000000000 -0500
+@@ -505,7 +505,7 @@ asm(
+    nb here, sizeof(UWord) == sizeof(UInt)
+ */
+ 
+-__private_extern__ ULong 
++__attribute__((visibility("hidden"))) ULong 
+ do_syscall_unix_WRK ( UWord a1, UWord a2, UWord a3, /* 4(esp)..12(esp) */
+                       UWord a4, UWord a5, UWord a6, /* 16(esp)..24(esp) */
+                       UWord a7, UWord a8, /* 28(esp)..32(esp) */
+@@ -525,7 +525,7 @@ asm(".private_extern _do_syscall_unix_WR
+     "    1:  ret                      \n"
+     );
+ 
+-__private_extern__ UInt 
++__attribute__((visibility("hidden"))) UInt 
+ do_syscall_mach_WRK ( UWord a1, UWord a2, UWord a3, /* 4(esp)..12(esp) */
+                       UWord a4, UWord a5, UWord a6, /* 16(esp)..24(esp) */
+                       UWord a7, UWord a8, /* 28(esp)..32(esp) */
+@@ -538,7 +538,7 @@ asm(".private_extern _do_syscall_mach_WR
+     "        ret                      \n"
+     );
+ 
+-__private_extern__ UInt 
++__attribute__((visibility("hidden"))) UInt 
+ do_syscall_mdep_WRK ( UWord a1, UWord a2, UWord a3, /* 4(esp)..12(esp) */
+                       UWord a4, UWord a5, UWord a6, /* 16(esp)..24(esp) */
+                       UWord a7, UWord a8, /* 28(esp)..32(esp) */
+@@ -571,7 +571,7 @@ asm(
+    nb here, sizeof(UWord) == sizeof(ULong)
+ */
+ 
+-__private_extern__ UWord 
++__attribute__((visibility("hidden"))) UWord 
+ do_syscall_unix_WRK ( UWord a1, UWord a2, UWord a3, /* rdi, rsi, rdx */
+                       UWord a4, UWord a5, UWord a6, /* rcx, r8,  r9 */
+                       UWord a7, UWord a8,           /* 8(rsp), 16(rsp) */
+@@ -595,7 +595,7 @@ asm(".private_extern _do_syscall_unix_WR
+     "        retq                     \n"  /* return 1st result word */
+     );
+ 
+-__private_extern__ UWord 
++__attribute__((visibility("hidden"))) UWord 
+ do_syscall_mach_WRK ( UWord a1, UWord a2, UWord a3, /* rdi, rsi, rdx */
+                       UWord a4, UWord a5, UWord a6, /* rcx, r8,  r9 */
+                       UWord a7, UWord a8,           /* 8(rsp), 16(rsp) */
+diff -rupN ../valgrind-orig/coregrind/m_syswrap/syswrap-darwin.c ./coregrind/m_syswrap/syswrap-darwin.c
+--- ../valgrind-orig/coregrind/m_syswrap/syswrap-darwin.c	2014-04-09 15:07:48.000000000 -0500
++++ ./coregrind/m_syswrap/syswrap-darwin.c	2014-04-09 15:09:28.000000000 -0500
+@@ -423,7 +423,7 @@ static OpenPort *info_for_port(mach_port
+ 
+ // Give a port a name, without changing its refcount
+ // GrP fixme don't override name if it already has a specific one
+-__private_extern__ void assign_port_name(mach_port_t port, const char *name)
++__attribute__((visibility("hidden"))) void assign_port_name(mach_port_t port, const char *name)
+ {
+    OpenPort *i;
+    if (!port) return;
+diff -rupN ../valgrind-orig/coregrind/vg_preloaded.c ./coregrind/vg_preloaded.c
+--- ../valgrind-orig/coregrind/vg_preloaded.c	2014-04-09 15:07:48.000000000 -0500
++++ ./coregrind/vg_preloaded.c	2014-04-09 15:08:49.000000000 -0500
+@@ -101,7 +101,7 @@ void * VG_NOTIFY_ON_LOAD(ifunc_wrapper) 
+ 
+ /* This string will be inserted into crash logs, so crashes while 
+    running under Valgrind can be distinguished from other crashes. */
+-__private_extern__ const char *__crashreporter_info__ = "Instrumented by Valgrind " VERSION;
++__attribute__((visibility("hidden"))) const char *__crashreporter_info__ = "Instrumented by Valgrind " VERSION;
+ 
+ /* ---------------------------------------------------------------------
+    Darwin environment cleanup
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/240fbf24/attachment.html>