ARM: Add missing sfi_breg in LDR_GLOBAL macro.

diff --git a/ChangeLog b/ChangeLog
index 85e3010482610a4ad4d3f39ad1e6d720872aa2d1..b2a1a091098f58c634d508d1cf5dbe0f4b6913ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-06  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/arm/sysdep.h [!PROF] [ARCH_HAS_T2 && !PIC] (LDR_GLOBAL):
+       Use sfi_breg on ldr.
+       [!PROF] [ARCH_HAS_T2 && PIC && ARM_PCREL_MOVW_OK] (LDR_GLOBAL):
+       Likewise.
+
        * nptl/tst-cancel25.c (tf2): Test for SIGCANCEL being blocked only if
        it's defined.
        * nptl/tst-signal7.c (do_test): Test SIGCANCEL only if it's defined.

diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index eaa4b941202ed1b86e9389deafa52065624eb957..9bbd009b8e1c1956b85e88bcc8270388644a175e 100644 (file)
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -198,7 +198,7 @@
 #  define LDR_GLOBAL(R, T, SYMBOL, CONSTANT)                           \
        movw    T, #:lower16:SYMBOL;                                    \
        movt    T, #:upper16:SYMBOL;                                    \
-       ldr     R, [T, $CONSTANT]
+       sfi_breg T, ldr R, [\B, $CONSTANT]
 # elif defined (ARCH_HAS_T2) && defined (PIC) && ARM_PCREL_MOVW_OK
 #  define LDR_GLOBAL(R, T, SYMBOL, CONSTANT)                           \
        movw    R, #:lower16:_GLOBAL_OFFSET_TABLE_ - 97f - PC_OFS;      \
@@ -212,7 +212,7 @@
 97:    add     R, R, pc;                                               \
 98:    LDST_PC_INDEXED (ldr, T, T, T);                                 \
        LDST_INDEXED (ldr, R, T, R, T);                                 \
-       ldr     R, [R, $CONSTANT]
+       sfi_breg R, ldr R, [\B, $CONSTANT]
 # else
 #  define LDR_GLOBAL(R, T, SYMBOL, CONSTANT)           \
        ldr     T, 99f;                                 \