Merge remote branch 'cros/upstream' into master

client/tests/unixbench/Makefile.patch

Index: client/tests/unixbench/Makefile.patch
diff --git a/client/tests/unixbench/Makefile.patch b/client/tests/unixbench/Makefile.patch
index 9d6228772269161881365bac45d88183be774bdb..ba672f912473063ec686ce3b69c0b6370aef4d10 100644
--- a/client/tests/unixbench/Makefile.patch
+++ b/client/tests/unixbench/Makefile.patch
@@ -1,6 +1,5 @@
-diff -c -r src/Makefile newsrc/Makefile
-*** src/Makefile	Wed Jul 28 15:05:02 1999
---- srcnew/Makefile	Tue Feb 16 19:43:54 2010
+*** unixbench-4.1.0/Makefile	Wed Jul 28 15:05:02 1999
+--- unixbench-4.1.0.patch/Makefile	Fri Jan 21 10:56:32 2011
 ***************
 *** 32,50 ****
   SHELL = /bin/sh
@@ -43,3 +42,26 @@ diff -c -r src/Makefile newsrc/Makefile
   
   ## Very generic
   #OPTON = -O
+***************
+*** 203,212 ****
+  	$(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o 
+  	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o 
+  $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h 
+! 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c
+! 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c
+! 	$(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o
+! 	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o
+  
+  
+  dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h 
+--- 204,213 ----
+  	$(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR)/dhry_2.o 
+  	cd $(SRCDIR); rm -f dhry_1.o dhry_2.o 
+  $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h 
+! 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_1.c -o dhry_1_reg.o
+! 	cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry_2.c -o dhry_2_reg.o
+! 	$(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1_reg.o $(SRCDIR)/dhry_2_reg.o
+! 	cd $(SRCDIR); rm -f dhry_1_reg.o dhry_2_reg.o
+  
+  
+  dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h