SOCIS/2015/CoverageAnalysis: couverture-qemu_patch.diff

configure

@@ -2046 +2046 @@
 else
     glib_req_ver=2.12
 fi
-if $pkg_config --atleast-version=$glib_req_ver gthread-2.0 > /dev/null 2>&1
+if $pkg_config --atleast-version=$glib_req_ver glib-2.0 > /dev/null 2>&1
 then
-    glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`
-    glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`
+    glib_cflags=`$pkg_config --cflags glib-2.0 2>/dev/null`
+    glib_libs=`$pkg_config --libs glib-2.0 2>/dev/null`
     LIBS="$glib_libs $LIBS"
-    libs_qga="$glib_libs $libs_qga"
+    libs_qga="$glib_libs $libs_qga -lpthread -lrt"
 else
     echo "glib-$glib_req_ver required to compile QEMU"
     exit 1
@@ -2598 +2598 @@
   clock_gettime=yes
 fi
 
+##########################################
+# Do we need timer_gettime + librt
+timer_gettime=no
+cat > $TMPC <<EOF
+#include <time.h>
+int main(void) { return timer_gettime(CLOCK_REALTIME, 0, NULL, NULL); }
+EOF
+
+if compile_prog "" "" ; then
+  timer_gettime=yes
+elif compile_prog "" "-lrt" ; then
+  LIBS="-lrt $LIBS"
+  timer_gettime=yes
+fi
+
 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
         "$aix" != "yes" -a "$haiku" != "yes" ; then
     libs_softmmu="-lutil $libs_softmmu"

rules.mak

@@ -31 +31 @@
 %.o: %.m
         $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
 
-LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(sort $(1)) $(LIBS),"  LINK  $(TARGET_DIR)$@")
+LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(sort $(1)) $(LIBS) -lpthread -lrt,"  LINK  $(TARGET_DIR)$@")
 
 %$(EXESUF): %.o
         $(call LINK,$^)
@@ -39 +39 @@
 %.a:
         $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"  AR    $(TARGET_DIR)$@")
 
+V=1
 quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1))
 
 # cc-option