Re: CVS commit: pkgsrc/devel/nss

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

On Thu, Apr 12, 2018 at 03:59:36PM +0200, Manuel Bouyer wrote:
> The real error is probably above these lines.

I tried defining PATCH_DEBUG, but that didn't change anything...

> Do you find a .rej file in the work directory ?

Yes!

# more blinit.c.rej 
@@ -91,7 +91,7 @@
 }
 #endif /* NSS_X86_OR_X64 */
 
-#if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
+#if (defined(__aarch64__) || defined(__arm__)) && defined(__linux__)
 #if defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
 #include <sys/auxv.h>
 extern unsigned long getauxval(unsigned long type) __attribute__((weak));
@@ -100,9 +100,9 @@
 #define AT_HWCAP2
 #define AT_HWCAP
 #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
-#endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
+#endif /* (defined(__aarch64__) || defined(__arm__)) && defined(__linux__) */
 
-#if defined(__aarch64__) && !defined(__ANDROID__)
+#if defined(__aarch64__) && defined(__linux__)
 // Defines from hwcap.h in Linux kernel - ARM64
 #define HWCAP_AES (1 << 3)
 #define HWCAP_PMULL (1 << 4)



It looks as though I have an extra comment in line 94:

    91  }
    92  #endif /* NSS_X86_OR_X64 */
    93  
    94  /* clang-format off */
    95  #if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
    96  #ifndef __has_include
    97  #define __has_include(x) 0
    98  #endif
    99  #if (__has_include(<sys/auxv.h>) || defined(__linux__)) && \
   100      defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
   101  #include <sys/auxv.h>
   102  extern unsigned long getauxval(unsigned long type) __attribute__((weak));
   103  #else
   104  static unsigned long (*getauxval)(unsigned long) = NULL;
   105  #define AT_HWCAP2 0
   106  #define AT_HWCAP 0
   107  #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
   108  #endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
   109  /* clang-format on */
   110  
   111  #if defined(__aarch64__) && !defined(__ANDROID__)