gwj / at91sam9263 · Commits

Commit c9e0df738918b1d5d39a283500abc3a3ac433f78

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 4f3a1d56

Rename LIBOBJS to libobj-y 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 24 additions and 25 deletions
Makefile.target
  View file @c9e0df7
... ... @@ -134,43 +134,42 @@ all: $(PROGS)
134 134  
135 135 #########################################################
136 136 # cpu emulator library
137   -LIBOBJS=exec.o translate-all.o cpu-exec.o\
138   - translate.o host-utils.o
  137 +libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o
139 138 ifdef CONFIG_KQEMU
140   -LIBOBJS+= kqemu.o
  139 +libobj-y += kqemu.o
141 140 endif
142 141 # TCG code generator
143   -LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o
  142 +libobj-y += tcg/tcg.o tcg/tcg-runtime.o
144 143 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
145 144 ifeq ($(ARCH),sparc64)
146 145 CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
147 146 endif
148 147 ifdef CONFIG_SOFTFLOAT
149   -LIBOBJS+=fpu/softfloat.o
  148 +libobj-y += fpu/softfloat.o
150 149 else
151   -LIBOBJS+=fpu/softfloat-native.o
  150 +libobj-y += fpu/softfloat-native.o
152 151 endif
153 152 CPPFLAGS+=-I$(SRC_PATH)/fpu
154   -LIBOBJS+= op_helper.o helper.o
  153 +libobj-y += op_helper.o helper.o
155 154  
156 155 ifeq ($(TARGET_BASE_ARCH), arm)
157   -LIBOBJS+= neon_helper.o iwmmxt_helper.o
  156 +libobj-y += neon_helper.o iwmmxt_helper.o
158 157 endif
159 158  
160 159 ifeq ($(TARGET_BASE_ARCH), alpha)
161   -LIBOBJS+= alpha_palcode.o
  160 +libobj-y += alpha_palcode.o
162 161 endif
163 162  
164 163 ifeq ($(TARGET_BASE_ARCH), cris)
165   -LIBOBJS+= cris-dis.o
  164 +libobj-y += cris-dis.o
166 165  
167 166 ifndef CONFIG_USER_ONLY
168   -LIBOBJS+= mmu.o
  167 +libobj-y += mmu.o
169 168 endif
170 169 endif
171 170  
172 171 # NOTE: the disassembler code is only needed for debugging
173   -LIBOBJS+=disas.o
  172 +libobj-y += disas.o
174 173 ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386)
175 174 USE_I386_DIS=y
176 175 endif
... ... @@ -178,45 +177,45 @@ ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64)
178 177 USE_I386_DIS=y
179 178 endif
180 179 ifdef USE_I386_DIS
181   -LIBOBJS+=i386-dis.o
  180 +libobj-y += i386-dis.o
182 181 endif
183 182 ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha)
184   -LIBOBJS+=alpha-dis.o
  183 +libobj-y += alpha-dis.o
185 184 endif
186 185 ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc)
187   -LIBOBJS+=ppc-dis.o
  186 +libobj-y += ppc-dis.o
188 187 endif
189 188 ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze)
190   -LIBOBJS+=microblaze-dis.o
  189 +libobj-y += microblaze-dis.o
191 190 ifndef CONFIG_USER_ONLY
192   -LIBOBJS+= mmu.o
  191 +libobj-y += mmu.o
193 192 endif
194 193 endif
195 194 ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
196   -LIBOBJS+=mips-dis.o
  195 +libobj-y += mips-dis.o
197 196 endif
198 197 ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc)
199   -LIBOBJS+=sparc-dis.o
  198 +libobj-y += sparc-dis.o
200 199 endif
201 200 ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm)
202   -LIBOBJS+=arm-dis.o
  201 +libobj-y += arm-dis.o
203 202 endif
204 203 ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k)
205   -LIBOBJS+=m68k-dis.o
  204 +libobj-y += m68k-dis.o
206 205 endif
207 206 ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)
208   -LIBOBJS+=sh4-dis.o
  207 +libobj-y += sh4-dis.o
209 208 endif
210 209 ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa)
211   -LIBOBJS+=hppa-dis.o
  210 +libobj-y += hppa-dis.o
212 211 endif
213 212 ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390)
214   -LIBOBJS+=s390-dis.o
  213 +libobj-y += s390-dis.o
215 214 endif
216 215  
217 216 # libqemu
218 217  
219   -libqemu.a: $(LIBOBJS)
  218 +libqemu.a: $(libobj-y)
220 219  
221 220 translate.o: translate.c cpu.h
222 221  
... ...