pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-netbsd: Fix build



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jun 5 22:44:24 2018 +0200
Changeset:	d82013fcb3309b5e981e02eccd34363634812c62

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc

Log Message:
compiler-rt-netbsd: Fix build

Remove leftover from local patches after the merge of CheckASLR().

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d82013fcb3309b5e981e02eccd34363634812c62

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/distinfo                        |  2 +-
 ...patch-lib_sanitizer__common_sanitizer__linux.cc | 31 ----------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 77236d566f..dd8fe86e5f 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -9,7 +9,7 @@ SHA1 (patch-lib_msan_msan__interceptors.cc) = 4c036592c9c5a3b0f658f22b004b30813a
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = e1d8ad46afc9bec97b7f0e00d0edf5ee377772b7
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = f641782a88248bb43ef0fbfa244a403935086004
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = da916c2d72f726c3bd1438568d3e90cb952148b0
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = c1ce6657580cc0865808dd713d1f28afc3baaaa7
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = dbe5aee67312a9042299cd3bd14d25fa68860fb2
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = f242e307950755010305b004b4c2e21c528114fb
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
index fc73bdc5ba..6142aa036b 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
@@ -10,34 +10,3 @@ $NetBSD$
  #include <sys/sysctl.h>
  #include <sys/exec.h>
  extern struct ps_strings *__ps_strings;
-@@ -1954,6 +1955,30 @@ void MaybeReexec() {
-   // No need to re-exec on Linux.
- }
- 
-+void CheckASLR() {
-+#if SANITIZER_NETBSD
-+  int mib[3];
-+  int paxflags;
-+  size_t len = sizeof(int);
-+
-+  mib[0] = CTL_PROC;
-+  mib[1] = internal_getpid();
-+  mib[2] = PROC_PID_PAXFLAGS;
-+
-+  if (UNLIKELY(sysctl(mib, 3, &paxflags, &len, NULL, 0) == -1)) {
-+    Printf("sysctl failed\n");
-+    Die();
-+  }
-+
-+  if (UNLIKELY(paxflags & CTL_PROC_PAXFLAGS_ASLR)) {
-+    Printf("This sanitizer is not compatible with enabled ASLR\n");
-+    Die();
-+  }
-+#else
-+  // Do nothing
-+#endif
-+}
-+
- void PrintModuleMap() { }
- 
- void CheckNoDeepBind(const char *filename, int flag) {


Home | Main Index | Thread Index | Old Index