resolve conflicts

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/libcrypto/perlasm/cbc.pl b/src/lib/libcrypto/perlasm/cbc.pl
index 22149c680e..e43dc9ae15 100644
--- a/src/lib/libcrypto/perlasm/cbc.pl
+++ b/src/lib/libcrypto/perlasm/cbc.pl
@@ -322,7 +322,8 @@ sub cbc
 
         &function_end_A($name);
 
-        &set_label("cbc_enc_jmp_table",1);
+        &align(64);
+        &set_label("cbc_enc_jmp_table");
         &data_word("0");
         &data_word(&label("ej1")."-".&label("PIC_point"));
         &data_word(&label("ej2")."-".&label("PIC_point"));
@@ -341,6 +342,7 @@ sub cbc
         #&data_word(&label("dj5")."-".&label("PIC_point"));
         #&data_word(&label("dj6")."-".&label("PIC_point"));
         #&data_word(&label("dj7")."-".&label("PIC_point"));
+        &align(64);
 
         &function_end_B($name);