diff options
3 files changed, 9 insertions, 33 deletions
diff --git a/devel/android-tools-adb-devel/files/patch-base_logging.cpp b/devel/android-tools-adb-devel/files/patch-base_logging.cpp index 7ace8ede711e..a59e7eef0ae0 100644 --- a/devel/android-tools-adb-devel/files/patch-base_logging.cpp +++ b/devel/android-tools-adb-devel/files/patch-base_logging.cpp @@ -1,14 +1,12 @@ --- base/logging.cpp.orig 2015-12-14 21:12:52 UTC +++ base/logging.cpp -@@ -66,6 +68,16 @@ +@@ -66,6 +68,14 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> @@ -17,7 +15,7 @@ #endif static pid_t GetThreadId() { -@@ -77,6 +89,20 @@ static pid_t GetThreadId() { +@@ -77,6 +89,14 @@ static pid_t GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -26,13 +24,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif diff --git a/devel/android-tools-adb/files/patch-libcutils_threads.c b/devel/android-tools-adb/files/patch-libcutils_threads.c index bdacbd2ca7a9..f8f92e5267a7 100644 --- a/devel/android-tools-adb/files/patch-libcutils_threads.c +++ b/devel/android-tools-adb/files/patch-libcutils_threads.c @@ -1,14 +1,12 @@ --- libcutils/threads.c.orig 2015-06-17 22:20:38 UTC +++ libcutils/threads.c -@@ -29,6 +29,16 @@ +@@ -29,6 +29,14 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> @@ -17,7 +15,7 @@ #endif // No definition needed for Android because we'll just pick up bionic's copy. -@@ -40,6 +48,20 @@ pid_t gettid() { +@@ -40,6 +48,14 @@ pid_t gettid() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -26,13 +24,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif diff --git a/devel/android-tools-simpleperf/files/patch-libcutils_threads.c b/devel/android-tools-simpleperf/files/patch-libcutils_threads.c index 83c53fd60224..eca025017eda 100644 --- a/devel/android-tools-simpleperf/files/patch-libcutils_threads.c +++ b/devel/android-tools-simpleperf/files/patch-libcutils_threads.c @@ -1,21 +1,19 @@ --- libcutils/threads.c.orig 2015-08-12 23:28:08 UTC +++ libcutils/threads.c -@@ -29,6 +29,14 @@ +@@ -29,6 +29,12 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> #endif // No definition needed for Android because we'll just pick up bionic's copy. -@@ -40,6 +48,20 @@ pid_t gettid() { +@@ -40,6 +48,14 @@ pid_t gettid() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -24,13 +22,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif |