client/tests/unixbench/Makefile.patch - Issue 6246035: Merge remote branch 'cros/upstream' into master

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: client/tests/unixbench/Makefile.patch

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff -c -r src/Makefile newsrc/Makefile	1 *** unixbench-4.1.0/Makefile» Wed Jul 28 15:05:02 1999

2 *** src/Makefile» Wed Jul 28 15:05:02 1999	2 --- unixbench-4.1.0.patch/Makefile» Fri Jan 21 10:56:32 2011

3 --- srcnew/Makefile» Tue Feb 16 19:43:54 2010

4 ***************	3 ***************

5 * 32,50 **	4 * 32,50 **

6 SHELL = /bin/sh	5 SHELL = /bin/sh

7 #HZ = ???? #(read from environment)	6 #HZ = ???? #(read from environment)

8 CFLAGS = -DTIME	7 CFLAGS = -DTIME

9 ! CC=gcc	8 ! CC=gcc

10	9

11 ## For Linux 486/Pentium, GCC 2.7.x and 2.8.x	10 ## For Linux 486/Pentium, GCC 2.7.x and 2.8.x

12 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math \	11 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math \

13 # -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2	12 # -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2

(...skipping 22 matching lines...) Expand all Loading...
36 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -m486	35 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -m486

37	36

38 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math \	37 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math \

39 # -m386 -malign-loops=1 -malign-jumps=1 -malign-functions=1	38 # -m386 -malign-loops=1 -malign-jumps=1 -malign-functions=1

40	39

41 ## For Solaris 2, or general-purpose GCC 2.7.x	40 ## For Solaris 2, or general-purpose GCC 2.7.x

42 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math -Wall	41 ! #OPTON = -O2 -fomit-frame-pointer -fforce-addr -fforce-mem -ffast-math -Wall

43	42

44 ## Very generic	43 ## Very generic

45 #OPTON = -O	44 #OPTON = -O

	45 ***************

	46 * 203,212 **

	47 $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR )/dhry_2.o

	48 cd $(SRCDIR); rm -f dhry_1.o dhry_2.o

	49 $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h

	50 ! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry _1.c

	51 ! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry _2.c

	52 ! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRC DIR)/dhry_2.o

	53 ! cd $(SRCDIR); rm -f dhry_1.o dhry_2.o

	54

	55

	56 dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h

	57 --- 204,213 ----

	58 $(CC) -o $(PROGDIR)/dhry2 ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1.o $(SRCDIR )/dhry_2.o

	59 cd $(SRCDIR); rm -f dhry_1.o dhry_2.o

	60 $(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h

	61 ! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry _1.c -o dhry_1_reg.o

	62 ! cd $(SRCDIR); $(CC) -c ${CFLAGS} -DREG=register -DHZ=${HZ} ${OPTON} dhry _2.c -o dhry_2_reg.o

	63 ! $(CC) -o $(PROGDIR)/dhry2reg ${CFLAGS} ${OPTON} $(SRCDIR)/dhry_1_reg.o $ (SRCDIR)/dhry_2_reg.o

	64 ! cd $(SRCDIR); rm -f dhry_1_reg.o dhry_2_reg.o

	65

	66

	67 dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(SRCDIR)/dhry.h

OLD	NEW

« cli/job.py ('K') | « client/tests/tracing_microbenchmark/tracers.py ('k') | client/tests/unixbench/unixbench.py » ('j') | no next file with comments »