sync-cache.c (__aarch64_sync_cache_range): Cast the results of (dcache_lsize - 1...

2013-01-17  Yufeng Zhang  <yufeng.zhang@arm.com>

	* config/aarch64/sync-cache.c (__aarch64_sync_cache_range): Cast the
	results of (dcache_lsize - 1) and (icache_lsize - 1) to the type
	__UINTPTR_TYPE__; also cast 'base' to the same type before the
	alignment operation.

From-SVN: r195266

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 775044944776676c2850e2fef52e8b4dbc327b64..d47f64ebb5fd2104325daa3104181049aefc0022 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-17  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+       * config/aarch64/sync-cache.c (__aarch64_sync_cache_range): Cast the
+       results of (dcache_lsize - 1) and (icache_lsize - 1) to the type
+       __UINTPTR_TYPE__; also cast 'base' to the same type before the
+       alignment operation.
+
 2013-01-15  Sofiane Naci  <sofiane.naci@arm.com>
 
        * config/aarch64/sync-cache.c (__aarch64_sync_cache_range): Update

diff --git a/libgcc/config/aarch64/sync-cache.c b/libgcc/config/aarch64/sync-cache.c
index 2512cb8e87ed07a39c3c2a1d8c5e68704dc926da..66b7afedc1f1a02c08d931e4a3753bb203b890c8 100644 (file)
--- a/libgcc/config/aarch64/sync-cache.c
+++ b/libgcc/config/aarch64/sync-cache.c
@@ -40,7 +40,8 @@ __aarch64_sync_cache_range (const void *base, const void *end)
      as per the GNU definition of __clear_cache.  */
 
   /* Make the start address of the loop cache aligned.  */
-  address = (const char*) ((unsigned long) base & ~ (dcache_lsize - 1));
+  address = (const char*) ((__UINTPTR_TYPE__) base
+                          & ~ (__UINTPTR_TYPE__) (dcache_lsize - 1));
 
   for (address; address < (const char *) end; address += dcache_lsize)
     asm volatile ("dc\tcvau, %0"
@@ -51,7 +52,8 @@ __aarch64_sync_cache_range (const void *base, const void *end)
   asm volatile ("dsb\tish" : : : "memory");
 
   /* Make the start address of the loop cache aligned.  */
-  address = (const char*) ((unsigned long) base & ~ (icache_lsize - 1));
+  address = (const char*) ((__UINTPTR_TYPE__) base
+                          & ~ (__UINTPTR_TYPE__) (icache_lsize - 1));
 
   for (address; address < (const char *) end; address += icache_lsize)
     asm volatile ("ic\tivau, %0"