Merge pull request #683 from ksco/tls

Author: rui314

test/elf/tls-gd2.sh

@@ -13,17 +13,17 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
 echo '{ global: bar; local: *; };' > $t/a.ver
 
-cat <<EOF | $GCC -mtls-dialect=$dialect -fPIC -c -o $t/b.o -xc -
+cat <<EOF | $GCC $mtls -fPIC -c -o $t/b.o -xc -
 _Thread_local int foo;
 
 int bar() {

test/elf/tls-ie.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -ftls-model=initial-exec -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc -
+cat <<EOF | $GCC -ftls-model=initial-exec $mtls -fPIC -c -o $t/a.o -xc -
 #include <stdio.h>
 
 static _Thread_local int foo;

test/elf/tls-large-tbss.sh

@@ -12,7 +12,7 @@ echo -n "Testing $testname ... "
 t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
-[ $MACHINE = x86_64 ] || { echo skipped; exit; }
+[ $MACHINE = x86_64 -o $MACHINE = riscv64 -o $MACHINE = riscv32 ] || { echo skipped; exit; }
 
 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .globl x, y

test/elf/tls-ld-noplt.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -ftls-model=local-dynamic -mtls-dialect=$dialect -fPIC -fno-plt -c -o $t/a.o -xc -
+cat <<EOF | $GCC -ftls-model=local-dynamic $mtls -fPIC -fno-plt -c -o $t/a.o -xc -
 #include <stdio.h>
 
 extern _Thread_local int foo;
@@ -38,7 +38,7 @@ int main() {
 }
 EOF
 
-cat <<EOF | $GCC -ftls-model=local-dynamic -mtls-dialect=$dialect  -fPIC -fno-plt -c -o $t/b.o -xc -
+cat <<EOF | $GCC -ftls-model=local-dynamic $mtls -fPIC -fno-plt -c -o $t/b.o -xc -
 _Thread_local int foo = 3;
 EOF
 

test/elf/tls-ld.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -ftls-model=local-dynamic -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc -
+cat <<EOF | $GCC -ftls-model=local-dynamic $mtls -fPIC -c -o $t/a.o -xc -
 #include <stdio.h>
 
 extern _Thread_local int foo;
@@ -38,7 +38,7 @@ int main() {
 }
 EOF
 
-cat <<EOF | $GCC -ftls-model=local-dynamic -mtls-dialect=$dialect  -fPIC -c -o $t/b.o -xc -
+cat <<EOF | $GCC -ftls-model=local-dynamic $mtls -fPIC -c -o $t/b.o -xc -
 _Thread_local int foo = 3;
 EOF
 

test/elf/tls-le.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -ftls-model=local-exec -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc -
+cat <<EOF | $GCC -ftls-model=local-exec $mtls -fPIC -c -o $t/a.o -xc -
 #include <stdio.h>
 
 extern _Thread_local int foo;
@@ -38,7 +38,7 @@ int main() {
 }
 EOF
 
-cat <<EOF | $GCC -ftls-model=local-exec -mtls-dialect=$dialect -fPIC -c -o $t/b.o -xc -
+cat <<EOF | $GCC -ftls-model=local-exec $mtls -fPIC -c -o $t/b.o -xc -
 _Thread_local int foo = 3;
 EOF
 

test/elf/tls-nopic.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -mtls-dialect=$dialect -c -o $t/a.o -xc -
+cat <<EOF | $GCC $mtls -c -o $t/a.o -xc -
 #include <stdio.h>
 
 extern _Thread_local int foo;

test/elf/tls-pic.sh

@@ -13,15 +13,15 @@ t=out/test/elf/$MACHINE/$testname
 mkdir -p $t
 
 if [ $MACHINE = x86_64 ]; then
-  dialect=gnu
+  mtls=-mtls-dialect=gnu
 elif [ $MACHINE = aarch64 ]; then
-  dialect=trad
-else
+  mtls=-mtls-dialect=trad
+elif [ $MACHINE '!=' riscv64 -a $MACHINE '!=' riscv32 ]; then
   echo skipped
   exit
 fi
 
-cat <<EOF | $GCC -mtls-dialect=$dialect -fPIC -c -o $t/a.o -xc -
+cat <<EOF | $GCC $mtls -fPIC -c -o $t/a.o -xc -
 #include <stdio.h>
 
 extern _Thread_local int foo;