Updated HerculesCompiler submodule

 * Also updated some patches to still work with this version (more
   updates will come in next commits)

diff --git a/HerculesCompiler b/HerculesCompiler
index e60c2c4c8cbe873a3030a05d881dcfdd0f0acd8e..000cce909bf35794ab52dd9461f2dd01315cf27d 160000 (submodule)
--- a/HerculesCompiler
+++ b/HerculesCompiler
@@ -1 +1 @@
-Subproject commit e60c2c4c8cbe873a3030a05d881dcfdd0f0acd8e
+Subproject commit 000cce909bf35794ab52dd9461f2dd01315cf27d

diff --git a/debian/changelog b/debian/changelog
index d292ba075dfd9dd45e7ac7c0cc462a4a05db681c..e607a8cabd736f1d27a6d82ea1999c9579357e76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hercules-compiler (2018.11-1) unstable; urgency=medium
+
+  * Updated submodules HerculesCompiler and openmp
+
+ -- kreilfla <kreilfla@ritchie.ciirc.cvut.cz>  Tue, 06 Nov 2018 12:12:28 +0100
+
 hercules-compiler (2018.10-1) unstable; urgency=medium
 
   * Update to new HerculesCompiler version

diff --git a/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch b/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
index 5e6bdbb84ae759211a02fe6125b59a46fb333733..f8ff4d5ff6c2ef23e4733b35a472a61527d96a9d 100644 (file)
--- a/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
+++ b/debian/patches/Guard-architecture-dependent-code-with-#ifdefs.patch
@@ -15,27 +15,34 @@ 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-09-04
+Last-Update: 2018-11-06
 
---- hercules-compiler-2018.7.orig/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
-+++ hercules-compiler-2018.7/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
-@@ -44,13 +44,17 @@ void __hw_data_cache_flush_stub() {
+--- a/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
++++ b/HerculesCompiler/libpremnotify/libpremnotify-cpu.c
+@@ -141,16 +141,20 @@
  
- }
  
+ // 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) {
 +#if defined(__aarch64__)
-     if(isRead) 
-         __asm__ __volatile__("prfm pldl2keep, %a0\n" : : "p" (ptr)); 
-     else 
--        __asm__ __volatile__("prfm pstl2keep, %a0\n" : : "p" (ptr)); 
-+        __asm__ __volatile__("prfm pstl2keep, %a0\n" : : "p" (ptr));
++     if(isRead)
++         __asm__ __volatile__("prfm pldl2keep, %a0\n" : : "p" (ptr));
++     else
++         __asm__ __volatile__("prfm pstl2keep, %a0\n" : : "p" (ptr));
 +#endif
  }
  
+ 
+ // 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");
++     __asm__ __volatile__("dc civac, %0\n" : : "r" (ptr) : "memory");
 +#endif
  }
+

diff --git a/openmp b/openmp
index 37434a410491b8c247bbce6e2fc604beaf8e9eda..9180e09272d506a331bc010f72926a708a0d45ef 160000 (submodule)
--- a/openmp
+++ b/openmp
@@ -1 +1 @@
-Subproject commit 37434a410491b8c247bbce6e2fc604beaf8e9eda
+Subproject commit 9180e09272d506a331bc010f72926a708a0d45ef