All arch: use rseq_unqual_scalar_typeof in load-acquire

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I08f8aedf09ac37fa9b06640a494f20cfbcfeb557

diff --git a/include/rseq/rseq-arm.h b/include/rseq/rseq-arm.h
index c97784bbced7bb172e2e8b01fbd60af81da9dbee..9a866a67a28dfd0b112dadb9da4baf63d7043bc5 100644 (file)
--- a/include/rseq/rseq-arm.h
+++ b/include/rseq/rseq-arm.h
@@ -66,7 +66,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_smp_mb();                                                  \
        ____p1;                                                         \
 })

diff --git a/include/rseq/rseq-mips.h b/include/rseq/rseq-mips.h
index 22f695d63c4f5f53ab89a46f0580e4f686f183d7..f0cc0720209b739868d8b743e16e4ab98f714fb4 100644 (file)
--- a/include/rseq/rseq-mips.h
+++ b/include/rseq/rseq-mips.h
@@ -46,7 +46,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_smp_mb();                                                  \
        ____p1;                                                         \
 })

diff --git a/include/rseq/rseq-ppc.h b/include/rseq/rseq-ppc.h
index 83182bbd6617624c0bd73f9e03acdcf14bac7dc5..81c8586b6af4d27ba57c7b15986f9dceb641fa3c 100644 (file)
--- a/include/rseq/rseq-ppc.h
+++ b/include/rseq/rseq-ppc.h
@@ -23,7 +23,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_smp_lwsync();                                              \
        ____p1;                                                         \
 })

diff --git a/include/rseq/rseq-riscv.h b/include/rseq/rseq-riscv.h
index f4e4b7da4722c5d30ef8265fd38595231ecda816..7c961cbeedb2daa0a3f82e074fb1cde22ba099db 100644 (file)
--- a/include/rseq/rseq-riscv.h
+++ b/include/rseq/rseq-riscv.h
@@ -38,7 +38,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        RISCV_FENCE(r, rw);                                             \
        ____p1;                                                         \
 })

diff --git a/include/rseq/rseq-s390.h b/include/rseq/rseq-s390.h
index cbda94b0a68ebf8eb70c6630a746d053322d6776..6a464f91ec7950bb31bcebe08f0a0e5f59fcf721 100644 (file)
--- a/include/rseq/rseq-s390.h
+++ b/include/rseq/rseq-s390.h
@@ -16,7 +16,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_barrier();                                                 \
        ____p1;                                                         \
 })

diff --git a/include/rseq/rseq-x86.h b/include/rseq/rseq-x86.h
index 2689aa1a4dd9b0c8916de7623a7459375e522260..a8cc0eff04523d33556746b02f94204c233f5222 100644 (file)
--- a/include/rseq/rseq-x86.h
+++ b/include/rseq/rseq-x86.h
@@ -31,7 +31,7 @@
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_barrier();                                                 \
        ____p1;                                                         \
 })
@@ -697,7 +697,7 @@ error1:
 
 #define rseq_smp_load_acquire(p)                                       \
 __extension__ ({                                                       \
-       __typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));                   \
+       rseq_unqual_scalar_typeof(*(p)) ____p1 = RSEQ_READ_ONCE(*(p));  \
        rseq_smp_mb();                                                  \
        ____p1;                                                         \
 })