Merge branch 'master'

nmps/exe/rs_nmps_bck/src/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_eobjs) \
-	$(pwr_eobj)/rt_io_user.o \
-        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
 
 endif

nmps/exe/rs_nmps_mirror/src/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_eobjs) \
-	$(pwr_eobj)/rt_io_user.o\
-        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
 
 endif

nmps/exe/rs_nmps_trans/src/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_eobjs) \
-	$(pwr_eobj)/rt_io_user.o -lpwr_nmps\
-        $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o -lpwr_nmps $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
 
 endif

sev/lib/sev/src/sev_dbms.cpp

@@ -4790,7 +4790,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid,
     return 0;
   }
 
-  char query[700];
+  char query[1300];
   char starttimstr[40];
   char endtimstr[40];
   pwr_tTime stime, etime;
@@ -5108,7 +5108,7 @@ int sev_dbms::get_events(pwr_tStatus *sts, void *thread, pwr_tOid oid,
     e.eventstatus = strtoul(row[j++], 0, 10);
     list.push_back(e);
   }
-  printf("ecnt %d\n", list.size());
+  printf("ecnt %ld\n", list.size());
 
   mysql_free_result(result);
   *sts = SEV__SUCCESS;

src/exe/rt_elog/src/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
 
 endif

src/exe/rt_elog_dump/src/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
 
 endif

src/exe/rt_ini/src/link_rule.mk

@@ -2,14 +2,12 @@ ifndef link_rule_mk
 link_rule_mk := 1
 
 ifeq ($(export_type),exp)
-  link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
-	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+  link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	$(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(explinkflags)
 else
-   link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
-	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)	
+   link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
+	 $(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
+	 $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
 endif
 endif

src/tools/bld/src/link_rule_generic.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
-	$(export_obj) $(objects) $(rt_msg_objs) \
-	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) $(rt_msg_objs) \
+	$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
 
 endif