Refresh libpremnotify patch

diff --git a/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch b/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
index f8ff4d5ff6c2ef23e4733b35a472a61527d96a9d..be769851958b23df36afb029dea473dcdbcdd223 100644 (file)
--- a/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
+++ b/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
@@ -1,34 +1,10 @@
-Description: libpremnotify-cpu: Guard architecture dependent code with #ifdefs
- This allows compiling "placeholder" version of the library for other
- architecures.
- .
-Author: Michal Sojka <michal.sojka@cvut.cz>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2018-11-06
-
 --- a/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
 +++ b/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
-@@ -141,16 +141,20 @@
- 
+@@ -109,12 +109,19 @@
  
  // This function should prefetch the provided pointer.
--void __prem_prefetch(void * ptr, int isRead) { 
--    //if(isRead) 
--        //__asm__ __volatile__("prfm pldl2keep, %a0\n" : : "p" (ptr)); 
--    //else 
--        //__asm__ __volatile__("prfm pstl2keep, %a0\n" : : "p" (ptr)); 
-+void __prem_prefetch(void * ptr, int isRead) {
+ void __prem_prefetch(void * ptr, int isRead) { 
+-
 +#if defined(__aarch64__)
 +     if(isRead)
 +         __asm__ __volatile__("prfm pldl2keep, %a0\n" : : "p" (ptr));
@@ -40,9 +16,9 @@ Last-Update: 2018-11-06
  
  // This function should evict the provided pointer from the cache.
  void __prem_evict(void * ptr) {
--    //__asm__ __volatile__("dc civac, %0\n" : : "r" (ptr) : "memory");
+-
 +#if defined(__aarch64__)
 +     __asm__ __volatile__("dc civac, %0\n" : : "r" (ptr) : "memory");
 +#endif
  }
-
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 8488637ea08d1474a50989adef257f6533110ba2..fd95367a2e806ea2d354528164d41fd3008b9425 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 libpremnotify-makefile.patch
-Guard-architecture-dependent-code-with-#ifdefs.patch
 require-cuda.patch
 configure-herculescompiler-via-cmake.patch
 default-pass-root.patch
+Guard-architecture-dependent-code-with-#ifdefs.patch