(CLEAR_CACHE): System calls clobber R0.

(dl_platform_init): Allow _dl_platform to be NULL.

diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 4fb93f7f83480f8d6a1740593dad5c6355a09b2e..d4d968387848963c0e9e338b9b14cc8bc750ec22 100644 (file)
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -40,7 +40,10 @@
   register unsigned long _beg __asm ("a1") = (unsigned long)(BEG);     \
   register unsigned long _end __asm ("a2") = (unsigned long)(END);     \
   register unsigned long _flg __asm ("a3") = 0;                                \
-  __asm __volatile ("swi 0x9f0002");                                   \
+  __asm __volatile ("swi 0x9f0002              @ sys_cacheflush"       \
+                   : /* no outputs */                                  \
+                   : /* no inputs */                                   \
+                   : "a1");                                            \
 }
 
 /* Return nonzero iff E_MACHINE is compatible with the running host.  */
@@ -353,10 +356,9 @@ extern const char *_dl_platform;
 static inline void __attribute__ ((unused))
 dl_platform_init (void)
 {
-  if (_dl_platform == NULL)
-    /* We default to ARM
-    This is where processors could be distinguished arm2, arm6, sa110, etc */
-    _dl_platform = "ARM";
+  if (_dl_platform != NULL && *_dl_platform == '\0')
+    /* Avoid an empty string which would disturb us.  */
+    _dl_platform = NULL;
 }
 
 static inline void