fixes for dlsim compilation for aarch64

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c

@@ -2118,6 +2118,9 @@ void dlsch_channel_compensation_TM56(int **rxdataF_ext,
   //printf("eNB_id %d, symbol %d: precoded CQI %d dB\n",eNB_id,symbol,
   //   measurements->precoded_cqi_dB[eNB_id][0]);
 
+  _mm_empty();
+  _m_empty();
+
 #elif defined(__arm__) || defined(__aarch64__)
 
   uint32_t rb,Nre;
@@ -2296,8 +2299,6 @@ void dlsch_channel_compensation_TM56(int **rxdataF_ext,
   //     measurements->precoded_cqi_dB[eNB_id][0]);
 
 #endif
-  _mm_empty();
-  _m_empty();
 }
 
 void dlsch_channel_compensation_TM34(LTE_DL_FRAME_PARMS *frame_parms,
@@ -6038,8 +6039,6 @@ unsigned short dlsch_extract_rbs_TM7(int **rxdataF,
     }
   }
 
-  _mm_empty();
-  _m_empty();
 
   return(nb_rb/frame_parms->nb_antennas_rx);
 }

openair1/PHY/TOOLS/cmult_vv.c

@@ -21,6 +21,7 @@
 
 #include "defs.h"
 #include <stdio.h>
+#include "assertions.h"
 
 #if defined(__x86_64__) || defined(__i386__)
 int16_t conjug[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1} ;

openair1/PHY/TOOLS/signal_energy.c

@@ -173,7 +173,7 @@ int32_t signal_energy_nodc(int32_t *input,uint32_t length)
   return((temp>0)?temp:1);
 }
 
-#elif defined(__arm__)
+#elif defined(__arm__) || defined(__aarch64__)
 
 int32_t signal_energy(int32_t *input,uint32_t length)
 {

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -303,7 +303,7 @@ extern void eNB_fep_full_2thread(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc);
 int main(int argc, char **argv)
 {
 
-  char c;
+  int c;
   int i,j,aa,u;
   PHY_VARS_eNB *eNB;
   PHY_VARS_UE *UE;