Merge pull request #19524 from Deigue/openxl-assembly

Assembly fixes for Open XL compliance
eclipse-openj9 · Jun 25, 2024 · cdbfd11 · cdbfd11
2 parents 69cba86 + 44450ff
commit cdbfd11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/runtime/oti/zhelpers.m4 b/runtime/oti/zhelpers.m4
@@ -247,9 +247,7 @@ PPA2   DS    0D
         DC   XL3'000000'
 })
 
-define({FILE_END},{
-    END
-})
+define({FILE_END},{END})
 
 },{
 
@@ -297,8 +295,7 @@ LCALLDESC DS 0D
     DC BL.3'000',BL.5'00000'
     DC BL.6'001000',BL.6'000000',BL.6'000000',BL.6'000000'
 })
-    END
-})
+    END})
 
 })
 

diff --git a/runtime/port/zos390/j9gs_load_gscb.s b/runtime/port/zos390/j9gs_load_gscb.s
@@ -50,9 +50,6 @@ GSLDCB CELQPRLG BASEREG=6,DSASIZE=0
          LA    R3,1
          B     EXIT           Without this branch fails at runtime
 EXIT     DS    0F
-         DROP  R2
-         DROP  R1
-         DROP  R0
 
          AIF  ('&SYSPARM' EQ 'BIT64').JMP3
          EDCXEPLG

diff --git a/runtime/port/zos390/j9gs_store_gscb.s b/runtime/port/zos390/j9gs_store_gscb.s
@@ -50,9 +50,6 @@ GSSTCB CELQPRLG BASEREG=6,DSASIZE=0
          LA    R3,1
          B     EXIT           Without this branch fails at runtime
 EXIT     DS    0F
-         DROP  R2
-         DROP  R1
-         DROP  R0
 
          AIF  ('&SYSPARM' EQ 'BIT64').JMP3
          EDCXEPLG