svn commit: r553570 - head/devel/llvm10/files

Kyle Evans kevans at FreeBSD.org
Wed Oct 28 23:58:57 UTC 2020


Author: kevans
Date: Wed Oct 28 23:58:56 2020
New Revision: 553570
URL: https://svnweb.freebsd.org/changeset/ports/553570

Log:
  devel/llvm10: really fix the AT_EXECPATH fallback =(
  
  It turns out that I made not one but *two* mistakes in applying this patch
  from the version that I had sent upstream. This one is not an extra
  semicolon, but rather not dereferencing p... p may never hit AT_NULL, but *p
  certainly will.
  
  The problem was isolated and the fix identified + tested by Andrew Gierth.
  
  Reported by:	Andrew Gierth <andrew_tao173 riddles org uk>
  MFH:		2020Q4 (blanket: build fix)

Modified:
  head/devel/llvm10/files/patch-lib_Support_Unix_Path.inc

Modified: head/devel/llvm10/files/patch-lib_Support_Unix_Path.inc
==============================================================================
--- head/devel/llvm10/files/patch-lib_Support_Unix_Path.inc	Wed Oct 28 21:35:22 2020	(r553569)
+++ head/devel/llvm10/files/patch-lib_Support_Unix_Path.inc	Wed Oct 28 23:58:56 2020	(r553570)
@@ -7,7 +7,7 @@
 -  for (;;) {
 -    switch (*(uintptr_t *)p++) {
 -    case AT_EXECPATH:
-+  for (; (uintptr_t *)p != AT_NULL; p++) {
++  for (; *(uintptr_t *)p != AT_NULL; p++) {
 +    if (*(uintptr_t *)p++ == AT_EXECPATH)
        return *p;
 -    case AT_NULL:


More information about the svn-ports-head mailing list