Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ChangeLog: https://github.com/robertdavidgraham/masscan/releases/tag/1.3.2 PR: 257931
- Loading branch information
1 parent
4b1cd54
commit 75a79fd
Showing
3 changed files
with
26 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1497024027 | ||
SHA256 (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 51de345f677f46595fc3bd747bfb61bc9ff130adcbec48f3401f8057c8702af9 | ||
SIZE (robertdavidgraham-masscan-1.0.4_GH0.tar.gz) = 343513 | ||
TIMESTAMP = 1629557968 | ||
SHA256 (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 0363e82c07e6ceee68a2da48acd0b2807391ead9a396cf9c70b53a2a901e3d5f | ||
SIZE (robertdavidgraham-masscan-1.3.2_GH0.tar.gz) = 463449 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,23 @@ | ||
--- src/smack1.c.orig 2017-06-06 03:59:39 UTC | ||
--- src/smack1.c.orig 2021-01-31 09:13:30 UTC | ||
+++ src/smack1.c | ||
@@ -115,6 +115,8 @@ | ||
#include "pixie-timer.h" | ||
#if defined(_MSC_VER) | ||
#include <intrin.h> | ||
+#elif defined(__llvm__) && (defined(__amd64__) || defined(__i386__)) | ||
+#include <x86intrin.h> | ||
#elif defined(__GNUC__) | ||
static __inline__ unsigned long long __rdtsc(void) | ||
@@ -119,8 +119,7 @@ | ||
#elif defined(__FreeBSD__) | ||
#include <sys/types.h> | ||
#include <machine/cpufunc.h> | ||
-#define __rdtsc rdtsc | ||
-#if (__ARM_ARCH >= 6) // V6 is the earliest arch that has a standard cyclecount | ||
+#if (__ARM_ARCH >= 6 && __ARM_ARCH <= 7) // V6 is the earliest arch that has a standard cyclecount | ||
unsigned long long rdtsc(void) | ||
{ | ||
uint32_t pmccntr; | ||
@@ -138,6 +137,10 @@ unsigned long long rdtsc(void) | ||
} | ||
return 0; | ||
} | ||
+#elif defined(__aarch64__) | ||
+#define __rdtsc() 0 | ||
+#else | ||
+#define __rdtsc rdtsc | ||
#endif | ||
#elif defined (__llvm__) | ||
#if defined(i386) || defined(__i386__) |