gwj / at91sam9263 · Commits

Commit c7328801d8c6c845c115b3f8099dba80038a3ea3

Authored by aliguori
1 parent 055479fe

Drop OP_CFLAGS (Avi Kivity) 

OP_CFLAGS is no longer used, except for machine.c, where it is not needed.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6376 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 5 additions and 47 deletions
Makefile.target
  View file @c732880
@@ -71,90 +71,49 @@ endif @@ -71,90 +71,49 @@ endif
71 71
72 PROGS=$(QEMU_PROG) 72 PROGS=$(QEMU_PROG)
73 73
74 -# We require -O2 to avoid the stack setup prologue in EXIT_TB  
75 -OP_CFLAGS := -O2 -g -fno-strict-aliasing  
76 -OP_CFLAGS += -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls  
77 -  
78 # cc-option 74 # cc-option
79 -# Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)  
80 -  
81 -cc-option = $(shell if $(CC) $(OP_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \  
82 - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) 75 +# Usage: CFLAGS+=$(call cc-option, $(CFLAGS), -falign-functions=0, -malign-functions=0)
83 76
84 -OP_CFLAGS+=$(call cc-option, -fno-reorder-blocks, "")  
85 -OP_CFLAGS+=$(call cc-option, -fno-gcse, "")  
86 -OP_CFLAGS+=$(call cc-option, -fno-tree-ch, "")  
87 -OP_CFLAGS+=$(call cc-option, -fno-optimize-sibling-calls, "")  
88 -OP_CFLAGS+=$(call cc-option, -fno-crossjumping, "")  
89 -OP_CFLAGS+=$(call cc-option, -fno-align-labels, "")  
90 -OP_CFLAGS+=$(call cc-option, -fno-align-jumps, "")  
91 -OP_CFLAGS+=$(call cc-option, -fno-align-functions, $(call cc-option, -malign-functions=0, ""))  
92 -OP_CFLAGS+=$(call cc-option, -fno-section-anchors, "") 77 +cc-option = $(shell if $(CC) $(1) $(2) -S -o /dev/null -xc /dev/null \
  78 + > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi ;)
93 79
94 HELPER_CFLAGS= 80 HELPER_CFLAGS=
95 81
96 ifeq ($(ARCH),i386) 82 ifeq ($(ARCH),i386)
97 HELPER_CFLAGS+=-fomit-frame-pointer 83 HELPER_CFLAGS+=-fomit-frame-pointer
98 -OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer  
99 endif 84 endif
100 85
101 ifeq ($(ARCH),sparc) 86 ifeq ($(ARCH),sparc)
102 CFLAGS+=-ffixed-g2 -ffixed-g3 87 CFLAGS+=-ffixed-g2 -ffixed-g3
103 - OP_CFLAGS+=-fno-delayed-branch -ffixed-i0  
104 - ifeq ($(CONFIG_SOLARIS),yes)  
105 - OP_CFLAGS+=-fno-omit-frame-pointer  
106 - else 88 + ifneq ($(CONFIG_SOLARIS),yes)
107 CFLAGS+=-ffixed-g1 -ffixed-g6 89 CFLAGS+=-ffixed-g1 -ffixed-g6
108 HELPER_CFLAGS+=-ffixed-i0 90 HELPER_CFLAGS+=-ffixed-i0
109 endif 91 endif
110 endif 92 endif
111 93
112 ifeq ($(ARCH),sparc64) 94 ifeq ($(ARCH),sparc64)
113 - OP_CFLAGS+=-mcpu=ultrasparc -m64 -fno-delayed-branch -ffixed-i0  
114 ifneq ($(CONFIG_SOLARIS),yes) 95 ifneq ($(CONFIG_SOLARIS),yes)
115 CFLAGS+=-ffixed-g5 -ffixed-g6 -ffixed-g7 96 CFLAGS+=-ffixed-g5 -ffixed-g6 -ffixed-g7
116 - OP_CFLAGS+=-ffixed-g5 -ffixed-g6 -ffixed-g7  
117 else 97 else
118 CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7 98 CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7
119 endif 99 endif
120 endif 100 endif
121 101
122 ifeq ($(ARCH),alpha) 102 ifeq ($(ARCH),alpha)
123 -# -msmall-data is not used for OP_CFLAGS because we want two-instruction  
124 -# relocations for the constant constructions  
125 # Ensure there's only a single GP 103 # Ensure there's only a single GP
126 CFLAGS+=-msmall-data 104 CFLAGS+=-msmall-data
127 endif 105 endif
128 106
129 ifeq ($(ARCH),hppa) 107 ifeq ($(ARCH),hppa)
130 -OP_CFLAGS=-O1 -fno-delayed-branch  
131 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld 108 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
132 endif 109 endif
133 110
134 ifeq ($(ARCH),ia64) 111 ifeq ($(ARCH),ia64)
135 CFLAGS+=-mno-sdata 112 CFLAGS+=-mno-sdata
136 -OP_CFLAGS+=-mno-sdata  
137 -endif  
138 -  
139 -ifeq ($(ARCH),arm)  
140 -OP_CFLAGS+=-mno-sched-prolog -fno-omit-frame-pointer  
141 -endif  
142 -  
143 -ifeq ($(ARCH),m68k)  
144 -OP_CFLAGS+=-fomit-frame-pointer  
145 -endif  
146 -  
147 -ifeq ($(ARCH),mips)  
148 -OP_CFLAGS+=-mabi=32 -G0 -fno-PIC -mno-abicalls -fomit-frame-pointer -fno-delayed-branch -Wa,-O0  
149 -endif  
150 -  
151 -ifeq ($(ARCH),mips64)  
152 -OP_CFLAGS+=-mabi=n32 -G0 -fno-PIC -mno-abicalls -fomit-frame-pointer -fno-delayed-branch -Wa,-O0  
153 endif 113 endif
154 114
155 CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS) 115 CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)
156 LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS) 116 LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)
157 -OP_CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)  
158 117
159 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 118 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
160 LIBS+=-lm 119 LIBS+=-lm
@@ -166,7 +125,6 @@ LIBS+=-lsocket -lnsl -lresolv @@ -166,7 +125,6 @@ LIBS+=-lsocket -lnsl -lresolv
166 ifdef NEEDS_LIBSUNMATH 125 ifdef NEEDS_LIBSUNMATH
167 LIBS+=-lsunmath 126 LIBS+=-lsunmath
168 LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib 127 LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
169 -OP_CFLAGS+=-I/opt/SUNWspro/prod/include/cc  
170 CFLAGS+=-I/opt/SUNWspro/prod/include/cc 128 CFLAGS+=-I/opt/SUNWspro/prod/include/cc
171 endif 129 endif
172 endif 130 endif
@@ -262,7 +220,7 @@ translate-all.o: translate-all.c cpu.h @@ -262,7 +220,7 @@ translate-all.o: translate-all.c cpu.h
262 tcg/tcg.o: cpu.h 220 tcg/tcg.o: cpu.h
263 221
264 machine.o: machine.c 222 machine.o: machine.c
265 - $(CC) $(OP_CFLAGS) $(CPPFLAGS) -c -o $@ $< 223 + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
266 224
267 # HELPER_CFLAGS is used for all the code compiled with static register 225 # HELPER_CFLAGS is used for all the code compiled with static register
268 # variables 226 # variables