diff --git a/gcc/ada/libgnat/s-pack03.adb b/gcc/ada/libgnat/s-pack03.adb
index c9fb9380abc..85e18a2ee76 100644
--- a/gcc/ada/libgnat/s-pack03.adb
+++ b/gcc/ada/libgnat/s-pack03.adb
@@ -89,30 +89,29 @@ package body System.Pack_03 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_03;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack05.adb b/gcc/ada/libgnat/s-pack05.adb
index e899a5d329c..6ed9f98ded5 100644
--- a/gcc/ada/libgnat/s-pack05.adb
+++ b/gcc/ada/libgnat/s-pack05.adb
@@ -89,30 +89,29 @@ package body System.Pack_05 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_05;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack06.adb b/gcc/ada/libgnat/s-pack06.adb
index 83602ca9f01..9e5b5948bae 100644
--- a/gcc/ada/libgnat/s-pack06.adb
+++ b/gcc/ada/libgnat/s-pack06.adb
@@ -104,30 +104,29 @@ package body System.Pack_06 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_06;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_06 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_06;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack07.adb b/gcc/ada/libgnat/s-pack07.adb
index 0a59dd24de7..222d864d9a5 100644
--- a/gcc/ada/libgnat/s-pack07.adb
+++ b/gcc/ada/libgnat/s-pack07.adb
@@ -89,30 +89,29 @@ package body System.Pack_07 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_07;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack09.adb b/gcc/ada/libgnat/s-pack09.adb
index 06cf6690e73..7643e8a6d4c 100644
--- a/gcc/ada/libgnat/s-pack09.adb
+++ b/gcc/ada/libgnat/s-pack09.adb
@@ -89,30 +89,29 @@ package body System.Pack_09 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_09;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack10.adb b/gcc/ada/libgnat/s-pack10.adb
index 864fec03398..1b42cfd2496 100644
--- a/gcc/ada/libgnat/s-pack10.adb
+++ b/gcc/ada/libgnat/s-pack10.adb
@@ -104,30 +104,29 @@ package body System.Pack_10 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_10;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_10 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_10;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack100.adb b/gcc/ada/libgnat/s-pack100.adb
index cf856d7f3f4..3318f2ec542 100644
--- a/gcc/ada/libgnat/s-pack100.adb
+++ b/gcc/ada/libgnat/s-pack100.adb
@@ -104,30 +104,29 @@ package body System.Pack_100 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_100;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_100 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_100;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack101.adb b/gcc/ada/libgnat/s-pack101.adb
index c416d0c6865..947ace2d78f 100644
--- a/gcc/ada/libgnat/s-pack101.adb
+++ b/gcc/ada/libgnat/s-pack101.adb
@@ -89,30 +89,29 @@ package body System.Pack_101 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_101;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack102.adb b/gcc/ada/libgnat/s-pack102.adb
index 5409c7d144d..6f91469a380 100644
--- a/gcc/ada/libgnat/s-pack102.adb
+++ b/gcc/ada/libgnat/s-pack102.adb
@@ -104,30 +104,29 @@ package body System.Pack_102 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_102;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_102 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_102;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack103.adb b/gcc/ada/libgnat/s-pack103.adb
index 8d70ae6b8a0..fa014b336f5 100644
--- a/gcc/ada/libgnat/s-pack103.adb
+++ b/gcc/ada/libgnat/s-pack103.adb
@@ -89,30 +89,29 @@ package body System.Pack_103 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_103;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack104.adb b/gcc/ada/libgnat/s-pack104.adb
index 137127e1409..d699ae23aa5 100644
--- a/gcc/ada/libgnat/s-pack104.adb
+++ b/gcc/ada/libgnat/s-pack104.adb
@@ -104,30 +104,29 @@ package body System.Pack_104 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_104;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_104 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_104;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack105.adb b/gcc/ada/libgnat/s-pack105.adb
index 0685c9519da..694315e4ae6 100644
--- a/gcc/ada/libgnat/s-pack105.adb
+++ b/gcc/ada/libgnat/s-pack105.adb
@@ -89,30 +89,29 @@ package body System.Pack_105 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_105;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack106.adb b/gcc/ada/libgnat/s-pack106.adb
index 21436c19a54..5d50459e565 100644
--- a/gcc/ada/libgnat/s-pack106.adb
+++ b/gcc/ada/libgnat/s-pack106.adb
@@ -104,30 +104,29 @@ package body System.Pack_106 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_106;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_106 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_106;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack107.adb b/gcc/ada/libgnat/s-pack107.adb
index 255c53684aa..d3f3aa18b54 100644
--- a/gcc/ada/libgnat/s-pack107.adb
+++ b/gcc/ada/libgnat/s-pack107.adb
@@ -89,30 +89,29 @@ package body System.Pack_107 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_107;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack108.adb b/gcc/ada/libgnat/s-pack108.adb
index 8ba37dbd56e..711442d9ae7 100644
--- a/gcc/ada/libgnat/s-pack108.adb
+++ b/gcc/ada/libgnat/s-pack108.adb
@@ -104,30 +104,29 @@ package body System.Pack_108 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_108;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_108 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_108;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack109.adb b/gcc/ada/libgnat/s-pack109.adb
index a719b1edb13..5751a62987b 100644
--- a/gcc/ada/libgnat/s-pack109.adb
+++ b/gcc/ada/libgnat/s-pack109.adb
@@ -89,30 +89,29 @@ package body System.Pack_109 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_109;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack11.adb b/gcc/ada/libgnat/s-pack11.adb
index c4903b470ea..d16fe8e126a 100644
--- a/gcc/ada/libgnat/s-pack11.adb
+++ b/gcc/ada/libgnat/s-pack11.adb
@@ -89,30 +89,29 @@ package body System.Pack_11 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_11;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack110.adb b/gcc/ada/libgnat/s-pack110.adb
index 0642474ee7f..2d70d48b9f6 100644
--- a/gcc/ada/libgnat/s-pack110.adb
+++ b/gcc/ada/libgnat/s-pack110.adb
@@ -104,30 +104,29 @@ package body System.Pack_110 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_110;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_110 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_110;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack111.adb b/gcc/ada/libgnat/s-pack111.adb
index 04faca42809..7ee38037aec 100644
--- a/gcc/ada/libgnat/s-pack111.adb
+++ b/gcc/ada/libgnat/s-pack111.adb
@@ -89,30 +89,29 @@ package body System.Pack_111 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_111;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack112.adb b/gcc/ada/libgnat/s-pack112.adb
index c12ee83d063..56447c1d055 100644
--- a/gcc/ada/libgnat/s-pack112.adb
+++ b/gcc/ada/libgnat/s-pack112.adb
@@ -104,30 +104,29 @@ package body System.Pack_112 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_112;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_112 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_112;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack113.adb b/gcc/ada/libgnat/s-pack113.adb
index 60d7f88a5a4..e456f81e372 100644
--- a/gcc/ada/libgnat/s-pack113.adb
+++ b/gcc/ada/libgnat/s-pack113.adb
@@ -89,30 +89,29 @@ package body System.Pack_113 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_113;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack114.adb b/gcc/ada/libgnat/s-pack114.adb
index 26821e1c24d..9f48f4b5e00 100644
--- a/gcc/ada/libgnat/s-pack114.adb
+++ b/gcc/ada/libgnat/s-pack114.adb
@@ -104,30 +104,29 @@ package body System.Pack_114 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_114;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_114 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_114;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack115.adb b/gcc/ada/libgnat/s-pack115.adb
index ff03f1c84f0..0cf3318ed97 100644
--- a/gcc/ada/libgnat/s-pack115.adb
+++ b/gcc/ada/libgnat/s-pack115.adb
@@ -89,30 +89,29 @@ package body System.Pack_115 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_115;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack116.adb b/gcc/ada/libgnat/s-pack116.adb
index 26b1420f7ed..8bfc5b994fd 100644
--- a/gcc/ada/libgnat/s-pack116.adb
+++ b/gcc/ada/libgnat/s-pack116.adb
@@ -104,30 +104,29 @@ package body System.Pack_116 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_116;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_116 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_116;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack117.adb b/gcc/ada/libgnat/s-pack117.adb
index b748b097910..b4afc61c1d6 100644
--- a/gcc/ada/libgnat/s-pack117.adb
+++ b/gcc/ada/libgnat/s-pack117.adb
@@ -89,30 +89,29 @@ package body System.Pack_117 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_117;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack118.adb b/gcc/ada/libgnat/s-pack118.adb
index f7bb29de3d5..4e0fd5e6869 100644
--- a/gcc/ada/libgnat/s-pack118.adb
+++ b/gcc/ada/libgnat/s-pack118.adb
@@ -104,30 +104,29 @@ package body System.Pack_118 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_118;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_118 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_118;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack119.adb b/gcc/ada/libgnat/s-pack119.adb
index b871f9e2694..0e42d1495e5 100644
--- a/gcc/ada/libgnat/s-pack119.adb
+++ b/gcc/ada/libgnat/s-pack119.adb
@@ -89,30 +89,29 @@ package body System.Pack_119 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_119;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack12.adb b/gcc/ada/libgnat/s-pack12.adb
index 9a60be78987..41d36a64b3b 100644
--- a/gcc/ada/libgnat/s-pack12.adb
+++ b/gcc/ada/libgnat/s-pack12.adb
@@ -104,30 +104,29 @@ package body System.Pack_12 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_12;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_12 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_12;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack120.adb b/gcc/ada/libgnat/s-pack120.adb
index 16491a264a9..5fdde24fa5d 100644
--- a/gcc/ada/libgnat/s-pack120.adb
+++ b/gcc/ada/libgnat/s-pack120.adb
@@ -104,30 +104,29 @@ package body System.Pack_120 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_120;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_120 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_120;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack121.adb b/gcc/ada/libgnat/s-pack121.adb
index 5092db345c6..4c7ad22bca1 100644
--- a/gcc/ada/libgnat/s-pack121.adb
+++ b/gcc/ada/libgnat/s-pack121.adb
@@ -89,30 +89,29 @@ package body System.Pack_121 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_121;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack122.adb b/gcc/ada/libgnat/s-pack122.adb
index 1ebe18b014a..45cb06bd8a3 100644
--- a/gcc/ada/libgnat/s-pack122.adb
+++ b/gcc/ada/libgnat/s-pack122.adb
@@ -104,30 +104,29 @@ package body System.Pack_122 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_122;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_122 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_122;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack123.adb b/gcc/ada/libgnat/s-pack123.adb
index 0ea7d62ed33..b524cac6ebf 100644
--- a/gcc/ada/libgnat/s-pack123.adb
+++ b/gcc/ada/libgnat/s-pack123.adb
@@ -89,30 +89,29 @@ package body System.Pack_123 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_123;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack124.adb b/gcc/ada/libgnat/s-pack124.adb
index abf42d82278..328d7dccc7b 100644
--- a/gcc/ada/libgnat/s-pack124.adb
+++ b/gcc/ada/libgnat/s-pack124.adb
@@ -104,30 +104,29 @@ package body System.Pack_124 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_124;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_124 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_124;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack125.adb b/gcc/ada/libgnat/s-pack125.adb
index 6e7fd5b32e5..93fb70f9364 100644
--- a/gcc/ada/libgnat/s-pack125.adb
+++ b/gcc/ada/libgnat/s-pack125.adb
@@ -89,30 +89,29 @@ package body System.Pack_125 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_125;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack126.adb b/gcc/ada/libgnat/s-pack126.adb
index 606ab952a3a..abaab528f4f 100644
--- a/gcc/ada/libgnat/s-pack126.adb
+++ b/gcc/ada/libgnat/s-pack126.adb
@@ -104,30 +104,29 @@ package body System.Pack_126 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_126;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_126 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_126;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack127.adb b/gcc/ada/libgnat/s-pack127.adb
index c5ca67b1a0d..f45d8b353f8 100644
--- a/gcc/ada/libgnat/s-pack127.adb
+++ b/gcc/ada/libgnat/s-pack127.adb
@@ -89,30 +89,29 @@ package body System.Pack_127 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_127;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack13.adb b/gcc/ada/libgnat/s-pack13.adb
index 894faa40372..aa40ef96d48 100644
--- a/gcc/ada/libgnat/s-pack13.adb
+++ b/gcc/ada/libgnat/s-pack13.adb
@@ -89,30 +89,29 @@ package body System.Pack_13 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_13;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack14.adb b/gcc/ada/libgnat/s-pack14.adb
index 731b56446e5..c458e411ee6 100644
--- a/gcc/ada/libgnat/s-pack14.adb
+++ b/gcc/ada/libgnat/s-pack14.adb
@@ -104,30 +104,29 @@ package body System.Pack_14 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_14;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_14 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_14;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack15.adb b/gcc/ada/libgnat/s-pack15.adb
index 530c2051fdd..e08cb960fcd 100644
--- a/gcc/ada/libgnat/s-pack15.adb
+++ b/gcc/ada/libgnat/s-pack15.adb
@@ -89,30 +89,29 @@ package body System.Pack_15 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_15;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack17.adb b/gcc/ada/libgnat/s-pack17.adb
index 95454bff9e0..db109ef87b8 100644
--- a/gcc/ada/libgnat/s-pack17.adb
+++ b/gcc/ada/libgnat/s-pack17.adb
@@ -89,30 +89,29 @@ package body System.Pack_17 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_17;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack18.adb b/gcc/ada/libgnat/s-pack18.adb
index cfc05ff1b13..4c04564de46 100644
--- a/gcc/ada/libgnat/s-pack18.adb
+++ b/gcc/ada/libgnat/s-pack18.adb
@@ -104,30 +104,29 @@ package body System.Pack_18 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_18;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_18 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_18;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack19.adb b/gcc/ada/libgnat/s-pack19.adb
index b3895bf7c26..9a0b3e52728 100644
--- a/gcc/ada/libgnat/s-pack19.adb
+++ b/gcc/ada/libgnat/s-pack19.adb
@@ -89,30 +89,29 @@ package body System.Pack_19 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_19;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack20.adb b/gcc/ada/libgnat/s-pack20.adb
index e6f1cc7ac0b..c11b04371a1 100644
--- a/gcc/ada/libgnat/s-pack20.adb
+++ b/gcc/ada/libgnat/s-pack20.adb
@@ -104,30 +104,29 @@ package body System.Pack_20 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_20;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_20 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_20;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack21.adb b/gcc/ada/libgnat/s-pack21.adb
index 6adafc82444..429aa13d1e4 100644
--- a/gcc/ada/libgnat/s-pack21.adb
+++ b/gcc/ada/libgnat/s-pack21.adb
@@ -89,30 +89,29 @@ package body System.Pack_21 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_21;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack22.adb b/gcc/ada/libgnat/s-pack22.adb
index bf9fdfa34e4..f50fa152544 100644
--- a/gcc/ada/libgnat/s-pack22.adb
+++ b/gcc/ada/libgnat/s-pack22.adb
@@ -104,30 +104,29 @@ package body System.Pack_22 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_22;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_22 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_22;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack23.adb b/gcc/ada/libgnat/s-pack23.adb
index 5ef5e25fbca..8f5cf547cab 100644
--- a/gcc/ada/libgnat/s-pack23.adb
+++ b/gcc/ada/libgnat/s-pack23.adb
@@ -89,30 +89,29 @@ package body System.Pack_23 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_23;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack24.adb b/gcc/ada/libgnat/s-pack24.adb
index aa69a87c2f7..504e1ce6524 100644
--- a/gcc/ada/libgnat/s-pack24.adb
+++ b/gcc/ada/libgnat/s-pack24.adb
@@ -104,30 +104,29 @@ package body System.Pack_24 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_24;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_24 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_24;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack25.adb b/gcc/ada/libgnat/s-pack25.adb
index 71a1589ef44..ee12a4bbe8b 100644
--- a/gcc/ada/libgnat/s-pack25.adb
+++ b/gcc/ada/libgnat/s-pack25.adb
@@ -89,30 +89,29 @@ package body System.Pack_25 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_25;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack26.adb b/gcc/ada/libgnat/s-pack26.adb
index 82ce3ee3061..9d54c92e711 100644
--- a/gcc/ada/libgnat/s-pack26.adb
+++ b/gcc/ada/libgnat/s-pack26.adb
@@ -104,30 +104,29 @@ package body System.Pack_26 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_26;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_26 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_26;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack27.adb b/gcc/ada/libgnat/s-pack27.adb
index 6d75a6e5012..9609a2b48ff 100644
--- a/gcc/ada/libgnat/s-pack27.adb
+++ b/gcc/ada/libgnat/s-pack27.adb
@@ -89,30 +89,29 @@ package body System.Pack_27 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_27;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack28.adb b/gcc/ada/libgnat/s-pack28.adb
index 5ad408655f9..883932fa3b0 100644
--- a/gcc/ada/libgnat/s-pack28.adb
+++ b/gcc/ada/libgnat/s-pack28.adb
@@ -104,30 +104,29 @@ package body System.Pack_28 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_28;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_28 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_28;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack29.adb b/gcc/ada/libgnat/s-pack29.adb
index 0d8e60757ce..c531f1a0ae0 100644
--- a/gcc/ada/libgnat/s-pack29.adb
+++ b/gcc/ada/libgnat/s-pack29.adb
@@ -89,30 +89,29 @@ package body System.Pack_29 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_29;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack30.adb b/gcc/ada/libgnat/s-pack30.adb
index 9fac8b97086..ca5ead71c3c 100644
--- a/gcc/ada/libgnat/s-pack30.adb
+++ b/gcc/ada/libgnat/s-pack30.adb
@@ -104,30 +104,29 @@ package body System.Pack_30 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_30;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_30 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_30;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack31.adb b/gcc/ada/libgnat/s-pack31.adb
index 4c300e5470b..537b5d293d7 100644
--- a/gcc/ada/libgnat/s-pack31.adb
+++ b/gcc/ada/libgnat/s-pack31.adb
@@ -89,30 +89,29 @@ package body System.Pack_31 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_31;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack33.adb b/gcc/ada/libgnat/s-pack33.adb
index 333b5339cf0..815b5bba7d9 100644
--- a/gcc/ada/libgnat/s-pack33.adb
+++ b/gcc/ada/libgnat/s-pack33.adb
@@ -89,30 +89,29 @@ package body System.Pack_33 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_33;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack34.adb b/gcc/ada/libgnat/s-pack34.adb
index 44366aae521..8a8ceeab01c 100644
--- a/gcc/ada/libgnat/s-pack34.adb
+++ b/gcc/ada/libgnat/s-pack34.adb
@@ -104,30 +104,29 @@ package body System.Pack_34 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_34;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_34 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_34;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack35.adb b/gcc/ada/libgnat/s-pack35.adb
index e65da9a3dd4..7f3ce98b674 100644
--- a/gcc/ada/libgnat/s-pack35.adb
+++ b/gcc/ada/libgnat/s-pack35.adb
@@ -89,30 +89,29 @@ package body System.Pack_35 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_35;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack36.adb b/gcc/ada/libgnat/s-pack36.adb
index 84f39411699..75963d19590 100644
--- a/gcc/ada/libgnat/s-pack36.adb
+++ b/gcc/ada/libgnat/s-pack36.adb
@@ -104,30 +104,29 @@ package body System.Pack_36 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_36;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_36 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_36;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack37.adb b/gcc/ada/libgnat/s-pack37.adb
index d9d48cdcba3..2fe4d7ca834 100644
--- a/gcc/ada/libgnat/s-pack37.adb
+++ b/gcc/ada/libgnat/s-pack37.adb
@@ -89,30 +89,29 @@ package body System.Pack_37 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_37;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack38.adb b/gcc/ada/libgnat/s-pack38.adb
index 9d6e4897942..5aa4d076b91 100644
--- a/gcc/ada/libgnat/s-pack38.adb
+++ b/gcc/ada/libgnat/s-pack38.adb
@@ -104,30 +104,29 @@ package body System.Pack_38 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_38;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_38 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_38;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack39.adb b/gcc/ada/libgnat/s-pack39.adb
index bd0b481b9b9..47772675f5d 100644
--- a/gcc/ada/libgnat/s-pack39.adb
+++ b/gcc/ada/libgnat/s-pack39.adb
@@ -89,30 +89,29 @@ package body System.Pack_39 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_39;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack40.adb b/gcc/ada/libgnat/s-pack40.adb
index da3addebfca..35281d4563e 100644
--- a/gcc/ada/libgnat/s-pack40.adb
+++ b/gcc/ada/libgnat/s-pack40.adb
@@ -104,30 +104,29 @@ package body System.Pack_40 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_40;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_40 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_40;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack41.adb b/gcc/ada/libgnat/s-pack41.adb
index 7a79f8b5fba..7fe45687627 100644
--- a/gcc/ada/libgnat/s-pack41.adb
+++ b/gcc/ada/libgnat/s-pack41.adb
@@ -89,30 +89,29 @@ package body System.Pack_41 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_41;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack42.adb b/gcc/ada/libgnat/s-pack42.adb
index 09159b2394c..ee099e43629 100644
--- a/gcc/ada/libgnat/s-pack42.adb
+++ b/gcc/ada/libgnat/s-pack42.adb
@@ -104,30 +104,29 @@ package body System.Pack_42 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_42;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_42 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_42;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack43.adb b/gcc/ada/libgnat/s-pack43.adb
index 5921d3e92a5..bd46efb2743 100644
--- a/gcc/ada/libgnat/s-pack43.adb
+++ b/gcc/ada/libgnat/s-pack43.adb
@@ -89,30 +89,29 @@ package body System.Pack_43 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_43;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack44.adb b/gcc/ada/libgnat/s-pack44.adb
index 57420fec5e8..fa6390e8ace 100644
--- a/gcc/ada/libgnat/s-pack44.adb
+++ b/gcc/ada/libgnat/s-pack44.adb
@@ -104,30 +104,29 @@ package body System.Pack_44 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_44;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_44 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_44;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack45.adb b/gcc/ada/libgnat/s-pack45.adb
index 13753bc6fa5..798c1eaa995 100644
--- a/gcc/ada/libgnat/s-pack45.adb
+++ b/gcc/ada/libgnat/s-pack45.adb
@@ -89,30 +89,29 @@ package body System.Pack_45 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_45;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack46.adb b/gcc/ada/libgnat/s-pack46.adb
index 3911743bfdd..a3e637f5eb5 100644
--- a/gcc/ada/libgnat/s-pack46.adb
+++ b/gcc/ada/libgnat/s-pack46.adb
@@ -104,30 +104,29 @@ package body System.Pack_46 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_46;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_46 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_46;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack47.adb b/gcc/ada/libgnat/s-pack47.adb
index ffe4edd7d48..14b8efd5de4 100644
--- a/gcc/ada/libgnat/s-pack47.adb
+++ b/gcc/ada/libgnat/s-pack47.adb
@@ -89,30 +89,29 @@ package body System.Pack_47 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_47;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack48.adb b/gcc/ada/libgnat/s-pack48.adb
index 6ab83292068..4ae6cff6ca9 100644
--- a/gcc/ada/libgnat/s-pack48.adb
+++ b/gcc/ada/libgnat/s-pack48.adb
@@ -104,30 +104,29 @@ package body System.Pack_48 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_48;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_48 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_48;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack49.adb b/gcc/ada/libgnat/s-pack49.adb
index 745d774f86a..a3df22a7cbd 100644
--- a/gcc/ada/libgnat/s-pack49.adb
+++ b/gcc/ada/libgnat/s-pack49.adb
@@ -89,30 +89,29 @@ package body System.Pack_49 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_49;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack50.adb b/gcc/ada/libgnat/s-pack50.adb
index 674b61f8e36..b0910b78a95 100644
--- a/gcc/ada/libgnat/s-pack50.adb
+++ b/gcc/ada/libgnat/s-pack50.adb
@@ -104,30 +104,29 @@ package body System.Pack_50 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_50;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_50 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_50;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack51.adb b/gcc/ada/libgnat/s-pack51.adb
index 12ec499032c..3f65265656a 100644
--- a/gcc/ada/libgnat/s-pack51.adb
+++ b/gcc/ada/libgnat/s-pack51.adb
@@ -89,30 +89,29 @@ package body System.Pack_51 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_51;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack52.adb b/gcc/ada/libgnat/s-pack52.adb
index 2a515134ab9..0fb5d41be2d 100644
--- a/gcc/ada/libgnat/s-pack52.adb
+++ b/gcc/ada/libgnat/s-pack52.adb
@@ -104,30 +104,29 @@ package body System.Pack_52 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_52;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_52 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_52;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack53.adb b/gcc/ada/libgnat/s-pack53.adb
index 87f8ce4e35a..8fbbb2834fb 100644
--- a/gcc/ada/libgnat/s-pack53.adb
+++ b/gcc/ada/libgnat/s-pack53.adb
@@ -89,30 +89,29 @@ package body System.Pack_53 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_53;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack54.adb b/gcc/ada/libgnat/s-pack54.adb
index 87da1cb5157..06fe56a2109 100644
--- a/gcc/ada/libgnat/s-pack54.adb
+++ b/gcc/ada/libgnat/s-pack54.adb
@@ -104,30 +104,29 @@ package body System.Pack_54 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_54;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_54 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_54;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack55.adb b/gcc/ada/libgnat/s-pack55.adb
index 0ca2b10534c..85e0114fc0f 100644
--- a/gcc/ada/libgnat/s-pack55.adb
+++ b/gcc/ada/libgnat/s-pack55.adb
@@ -89,30 +89,29 @@ package body System.Pack_55 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_55;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack56.adb b/gcc/ada/libgnat/s-pack56.adb
index c49841e2d5b..9346f9f3ec4 100644
--- a/gcc/ada/libgnat/s-pack56.adb
+++ b/gcc/ada/libgnat/s-pack56.adb
@@ -104,30 +104,29 @@ package body System.Pack_56 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_56;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_56 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_56;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack57.adb b/gcc/ada/libgnat/s-pack57.adb
index 8bcb56ec967..1ff0cd8e57b 100644
--- a/gcc/ada/libgnat/s-pack57.adb
+++ b/gcc/ada/libgnat/s-pack57.adb
@@ -89,30 +89,29 @@ package body System.Pack_57 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_57;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack58.adb b/gcc/ada/libgnat/s-pack58.adb
index ebbc4710fb9..c8fd96717cf 100644
--- a/gcc/ada/libgnat/s-pack58.adb
+++ b/gcc/ada/libgnat/s-pack58.adb
@@ -104,30 +104,29 @@ package body System.Pack_58 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_58;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_58 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_58;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack59.adb b/gcc/ada/libgnat/s-pack59.adb
index 373a856ebc3..970b7ed12e3 100644
--- a/gcc/ada/libgnat/s-pack59.adb
+++ b/gcc/ada/libgnat/s-pack59.adb
@@ -89,30 +89,29 @@ package body System.Pack_59 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_59;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack60.adb b/gcc/ada/libgnat/s-pack60.adb
index eab65752e0c..1b7bb6bb7db 100644
--- a/gcc/ada/libgnat/s-pack60.adb
+++ b/gcc/ada/libgnat/s-pack60.adb
@@ -104,30 +104,29 @@ package body System.Pack_60 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_60;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_60 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_60;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack61.adb b/gcc/ada/libgnat/s-pack61.adb
index 1b17fbcd484..1a431691f0c 100644
--- a/gcc/ada/libgnat/s-pack61.adb
+++ b/gcc/ada/libgnat/s-pack61.adb
@@ -89,30 +89,29 @@ package body System.Pack_61 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_61;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack62.adb b/gcc/ada/libgnat/s-pack62.adb
index 98725faede5..1d8e62b973c 100644
--- a/gcc/ada/libgnat/s-pack62.adb
+++ b/gcc/ada/libgnat/s-pack62.adb
@@ -104,30 +104,29 @@ package body System.Pack_62 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_62;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_62 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_62;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack63.adb b/gcc/ada/libgnat/s-pack63.adb
index 8795fdc3671..905cacf6524 100644
--- a/gcc/ada/libgnat/s-pack63.adb
+++ b/gcc/ada/libgnat/s-pack63.adb
@@ -89,30 +89,29 @@ package body System.Pack_63 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_63;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack65.adb b/gcc/ada/libgnat/s-pack65.adb
index ee92a1278bb..c9a3b5a3bdb 100644
--- a/gcc/ada/libgnat/s-pack65.adb
+++ b/gcc/ada/libgnat/s-pack65.adb
@@ -89,30 +89,29 @@ package body System.Pack_65 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_65;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack66.adb b/gcc/ada/libgnat/s-pack66.adb
index abc08b57bbf..86551919d10 100644
--- a/gcc/ada/libgnat/s-pack66.adb
+++ b/gcc/ada/libgnat/s-pack66.adb
@@ -104,30 +104,29 @@ package body System.Pack_66 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_66;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_66 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_66;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack67.adb b/gcc/ada/libgnat/s-pack67.adb
index 1d2ac946027..d8db3b5c91c 100644
--- a/gcc/ada/libgnat/s-pack67.adb
+++ b/gcc/ada/libgnat/s-pack67.adb
@@ -89,30 +89,29 @@ package body System.Pack_67 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_67;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack68.adb b/gcc/ada/libgnat/s-pack68.adb
index 8174c3d939e..46fb4c22175 100644
--- a/gcc/ada/libgnat/s-pack68.adb
+++ b/gcc/ada/libgnat/s-pack68.adb
@@ -104,30 +104,29 @@ package body System.Pack_68 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_68;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_68 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_68;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack69.adb b/gcc/ada/libgnat/s-pack69.adb
index 681022a4e24..f9edfeb61bb 100644
--- a/gcc/ada/libgnat/s-pack69.adb
+++ b/gcc/ada/libgnat/s-pack69.adb
@@ -89,30 +89,29 @@ package body System.Pack_69 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_69;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack70.adb b/gcc/ada/libgnat/s-pack70.adb
index bd4362e6b33..284d4318732 100644
--- a/gcc/ada/libgnat/s-pack70.adb
+++ b/gcc/ada/libgnat/s-pack70.adb
@@ -104,30 +104,29 @@ package body System.Pack_70 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_70;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_70 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_70;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack71.adb b/gcc/ada/libgnat/s-pack71.adb
index 7bcec8ae48d..5e2a2d0ec84 100644
--- a/gcc/ada/libgnat/s-pack71.adb
+++ b/gcc/ada/libgnat/s-pack71.adb
@@ -89,30 +89,29 @@ package body System.Pack_71 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_71;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack72.adb b/gcc/ada/libgnat/s-pack72.adb
index a4562802caf..968dcf6e7b7 100644
--- a/gcc/ada/libgnat/s-pack72.adb
+++ b/gcc/ada/libgnat/s-pack72.adb
@@ -104,30 +104,29 @@ package body System.Pack_72 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_72;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_72 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_72;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack73.adb b/gcc/ada/libgnat/s-pack73.adb
index a3c61b53bc5..a775196bddf 100644
--- a/gcc/ada/libgnat/s-pack73.adb
+++ b/gcc/ada/libgnat/s-pack73.adb
@@ -89,30 +89,29 @@ package body System.Pack_73 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_73;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack74.adb b/gcc/ada/libgnat/s-pack74.adb
index 566a697e864..b7af4221791 100644
--- a/gcc/ada/libgnat/s-pack74.adb
+++ b/gcc/ada/libgnat/s-pack74.adb
@@ -104,30 +104,29 @@ package body System.Pack_74 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_74;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_74 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_74;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack75.adb b/gcc/ada/libgnat/s-pack75.adb
index 4c46cf82ffb..9990b257b67 100644
--- a/gcc/ada/libgnat/s-pack75.adb
+++ b/gcc/ada/libgnat/s-pack75.adb
@@ -89,30 +89,29 @@ package body System.Pack_75 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_75;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack76.adb b/gcc/ada/libgnat/s-pack76.adb
index 3839d153632..5f66fe3843e 100644
--- a/gcc/ada/libgnat/s-pack76.adb
+++ b/gcc/ada/libgnat/s-pack76.adb
@@ -104,30 +104,29 @@ package body System.Pack_76 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_76;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_76 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_76;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack77.adb b/gcc/ada/libgnat/s-pack77.adb
index ca51862d5fd..1b0971aa1ea 100644
--- a/gcc/ada/libgnat/s-pack77.adb
+++ b/gcc/ada/libgnat/s-pack77.adb
@@ -89,30 +89,29 @@ package body System.Pack_77 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_77;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack78.adb b/gcc/ada/libgnat/s-pack78.adb
index 0c302d5bbcf..7859a0fba7e 100644
--- a/gcc/ada/libgnat/s-pack78.adb
+++ b/gcc/ada/libgnat/s-pack78.adb
@@ -104,30 +104,29 @@ package body System.Pack_78 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_78;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_78 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_78;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack79.adb b/gcc/ada/libgnat/s-pack79.adb
index 0d2a21da70b..6f002e1f983 100644
--- a/gcc/ada/libgnat/s-pack79.adb
+++ b/gcc/ada/libgnat/s-pack79.adb
@@ -89,30 +89,29 @@ package body System.Pack_79 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_79;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack80.adb b/gcc/ada/libgnat/s-pack80.adb
index 107175df781..2b5a8a64068 100644
--- a/gcc/ada/libgnat/s-pack80.adb
+++ b/gcc/ada/libgnat/s-pack80.adb
@@ -104,30 +104,29 @@ package body System.Pack_80 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_80;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_80 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_80;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack81.adb b/gcc/ada/libgnat/s-pack81.adb
index 8a64906987a..bc7420ae910 100644
--- a/gcc/ada/libgnat/s-pack81.adb
+++ b/gcc/ada/libgnat/s-pack81.adb
@@ -89,30 +89,29 @@ package body System.Pack_81 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_81;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack82.adb b/gcc/ada/libgnat/s-pack82.adb
index d3cc6d1a793..8883d05641f 100644
--- a/gcc/ada/libgnat/s-pack82.adb
+++ b/gcc/ada/libgnat/s-pack82.adb
@@ -104,30 +104,29 @@ package body System.Pack_82 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_82;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_82 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_82;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack83.adb b/gcc/ada/libgnat/s-pack83.adb
index a030eee383f..2eb74e7c507 100644
--- a/gcc/ada/libgnat/s-pack83.adb
+++ b/gcc/ada/libgnat/s-pack83.adb
@@ -89,30 +89,29 @@ package body System.Pack_83 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_83;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack84.adb b/gcc/ada/libgnat/s-pack84.adb
index 017bb758eff..4518402f078 100644
--- a/gcc/ada/libgnat/s-pack84.adb
+++ b/gcc/ada/libgnat/s-pack84.adb
@@ -104,30 +104,29 @@ package body System.Pack_84 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_84;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_84 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_84;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack85.adb b/gcc/ada/libgnat/s-pack85.adb
index 45a35b60490..b383072923e 100644
--- a/gcc/ada/libgnat/s-pack85.adb
+++ b/gcc/ada/libgnat/s-pack85.adb
@@ -89,30 +89,29 @@ package body System.Pack_85 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_85;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack86.adb b/gcc/ada/libgnat/s-pack86.adb
index 487407b5cac..d302c182d30 100644
--- a/gcc/ada/libgnat/s-pack86.adb
+++ b/gcc/ada/libgnat/s-pack86.adb
@@ -104,30 +104,29 @@ package body System.Pack_86 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_86;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_86 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_86;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack87.adb b/gcc/ada/libgnat/s-pack87.adb
index 7f75617e66f..0a40c2fbbb5 100644
--- a/gcc/ada/libgnat/s-pack87.adb
+++ b/gcc/ada/libgnat/s-pack87.adb
@@ -89,30 +89,29 @@ package body System.Pack_87 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_87;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack88.adb b/gcc/ada/libgnat/s-pack88.adb
index 7a4f2a92030..936dc64a4b8 100644
--- a/gcc/ada/libgnat/s-pack88.adb
+++ b/gcc/ada/libgnat/s-pack88.adb
@@ -104,30 +104,29 @@ package body System.Pack_88 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_88;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_88 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_88;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack89.adb b/gcc/ada/libgnat/s-pack89.adb
index babbaa03373..f1da5b910cc 100644
--- a/gcc/ada/libgnat/s-pack89.adb
+++ b/gcc/ada/libgnat/s-pack89.adb
@@ -89,30 +89,29 @@ package body System.Pack_89 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_89;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack90.adb b/gcc/ada/libgnat/s-pack90.adb
index 51cf2d2b875..d808da83bdc 100644
--- a/gcc/ada/libgnat/s-pack90.adb
+++ b/gcc/ada/libgnat/s-pack90.adb
@@ -104,30 +104,29 @@ package body System.Pack_90 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_90;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_90 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_90;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack91.adb b/gcc/ada/libgnat/s-pack91.adb
index 9dbbc1baaca..6bf3bc72442 100644
--- a/gcc/ada/libgnat/s-pack91.adb
+++ b/gcc/ada/libgnat/s-pack91.adb
@@ -89,30 +89,29 @@ package body System.Pack_91 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_91;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack92.adb b/gcc/ada/libgnat/s-pack92.adb
index d9c88ea8116..1b0d97d87d4 100644
--- a/gcc/ada/libgnat/s-pack92.adb
+++ b/gcc/ada/libgnat/s-pack92.adb
@@ -104,30 +104,29 @@ package body System.Pack_92 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_92;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_92 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_92;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack93.adb b/gcc/ada/libgnat/s-pack93.adb
index eef512af32d..23ed5636780 100644
--- a/gcc/ada/libgnat/s-pack93.adb
+++ b/gcc/ada/libgnat/s-pack93.adb
@@ -89,30 +89,29 @@ package body System.Pack_93 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_93;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack94.adb b/gcc/ada/libgnat/s-pack94.adb
index 5cc01ebfcae..cb5bc1c9ef5 100644
--- a/gcc/ada/libgnat/s-pack94.adb
+++ b/gcc/ada/libgnat/s-pack94.adb
@@ -104,30 +104,29 @@ package body System.Pack_94 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_94;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_94 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_94;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack95.adb b/gcc/ada/libgnat/s-pack95.adb
index 5eb5b864d71..824adf10ebe 100644
--- a/gcc/ada/libgnat/s-pack95.adb
+++ b/gcc/ada/libgnat/s-pack95.adb
@@ -89,30 +89,29 @@ package body System.Pack_95 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_95;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack96.adb b/gcc/ada/libgnat/s-pack96.adb
index dcd1d68c0c1..531fb97c78e 100644
--- a/gcc/ada/libgnat/s-pack96.adb
+++ b/gcc/ada/libgnat/s-pack96.adb
@@ -104,30 +104,29 @@ package body System.Pack_96 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_96;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_96 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_96;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack97.adb b/gcc/ada/libgnat/s-pack97.adb
index d428f01e90a..b6c766be8de 100644
--- a/gcc/ada/libgnat/s-pack97.adb
+++ b/gcc/ada/libgnat/s-pack97.adb
@@ -89,30 +89,29 @@ package body System.Pack_97 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_97;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack98.adb b/gcc/ada/libgnat/s-pack98.adb
index 97a65288d4d..981411990c4 100644
--- a/gcc/ada/libgnat/s-pack98.adb
+++ b/gcc/ada/libgnat/s-pack98.adb
@@ -104,30 +104,29 @@ package body System.Pack_98 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_98;
 
    -------------
@@ -143,30 +142,29 @@ package body System.Pack_98 is
       C  : ClusterU_Ref     with Address => A'Address, Import;
       RC : Rev_ClusterU_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end GetU_98;
 
    ------------
diff --git a/gcc/ada/libgnat/s-pack99.adb b/gcc/ada/libgnat/s-pack99.adb
index b2850533bec..2c89be8c303 100644
--- a/gcc/ada/libgnat/s-pack99.adb
+++ b/gcc/ada/libgnat/s-pack99.adb
@@ -89,30 +89,29 @@ package body System.Pack_99 is
       C  : Cluster_Ref     with Address => A'Address, Import;
       RC : Rev_Cluster_Ref with Address => A'Address, Import;
    begin
-      if Rev_SSO then
-         case N07 (Uns (N) mod 8) is
-            when 0 => return RC.E0;
-            when 1 => return RC.E1;
-            when 2 => return RC.E2;
-            when 3 => return RC.E3;
-            when 4 => return RC.E4;
-            when 5 => return RC.E5;
-            when 6 => return RC.E6;
-            when 7 => return RC.E7;
-         end case;
-
-      else
-         case N07 (Uns (N) mod 8) is
-            when 0 => return C.E0;
-            when 1 => return C.E1;
-            when 2 => return C.E2;
-            when 3 => return C.E3;
-            when 4 => return C.E4;
-            when 5 => return C.E5;
-            when 6 => return C.E6;
-            when 7 => return C.E7;
-         end case;
-      end if;
+      return
+         (if Rev_SSO then
+            (case N07 (Uns (N) mod 8) is
+               when 0 => RC.E0,
+               when 1 => RC.E1,
+               when 2 => RC.E2,
+               when 3 => RC.E3,
+               when 4 => RC.E4,
+               when 5 => RC.E5,
+               when 6 => RC.E6,
+               when 7 => RC.E7)
+
+         else
+            (case N07 (Uns (N) mod 8) is
+               when 0 => C.E0,
+               when 1 => C.E1,
+               when 2 => C.E2,
+               when 3 => C.E3,
+               when 4 => C.E4,
+               when 5 => C.E5,
+               when 6 => C.E6,
+               when 7 => C.E7)
+         );
    end Get_99;
 
    ------------
