mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

security/masscan: fix build on powerpc*

Browse Source 
Implement rdtsc, similar to ARM. Builds fine with clang.
This commit is contained in:
Piotr Kubaj 2021-09-12 21:06:06 +00:00
parent 127ab8c824
commit ff9319692d
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/masscan/Makefile
View File

@ -17,12 +17,6 @@ CFLAGS+= -Wno-format
PLIST_FILES= bin/masscan man/man8/masscan.8.gz
.include <bsd.port.options.mk>
.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
USE_GCC= yes
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/masscan ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/masscan.8 ${STAGEDIR}${MANPREFIX}/man/man8

27
security/masscan/files/patch-src_smack1.c
View File

@ -1,6 +1,6 @@
--- src/smack1.c.orig 2021-01-31 09:13:30 UTC
+++ src/smack1.c
@@ -119,8 +119,7 @@
@@ -119,9 +119,8 @@
#elif defined(__FreeBSD__)
#include <sys/types.h>
#include <machine/cpufunc.h>
@ -10,12 +10,35 @@
unsigned long long rdtsc(void)
{
uint32_t pmccntr;
@@ -138,6 +137,10 @@ unsigned long long rdtsc(void)
uint32_t pmuseren;
@@ -138,6 +137,32 @@ unsigned long long rdtsc(void)
}
return 0;
}
+#elif defined(__aarch64__)
+#define __rdtsc() 0
+#elif defined(__powerpc64__)
+unsigned long long __rdtsc(void)
+{
+ unsigned long long rval;
+ __asm__ __volatile__("mfspr %%r3, 268": "=r" (rval));
+ return rval;
+}
+#elif defined(__powerpc__)
+unsigned long long __rdtsc(void)
+{
+ unsigned int tmp;
+ union { unsigned long long complete; unsigned int part[2]; } ticks;
+ __asm__ ("0:"
+ "mftbu %[hi32]\n"
+ "mftb %[lo32]\n"
+ "mftbu %[tmp]\n"
+ "cmpw %[tmp],%[hi32]\n"
+ "bne 0b\n"
+ : [hi32] "=r"(ticks.part[0]), [lo32] "=r"(ticks.part[1]),
+ [tmp] "=r"(tmp));
+ return ticks.complete;
+}
+#else
+#define __rdtsc rdtsc
#endif