Changeset 5186

Timestamp:

Mar 5, 2010 11:20:28 AM (3 years ago)

Author:

stepan

Message:

This patch fixes two things:

• -m32 is already defined by xcompile if the compiler is a 64bit compiler so drop it from the Makefile.
• allow "obj-.. += foo.o" for util/, too. Otherwise the source files in util/x86emu/ put their objects in util/ instead of $(obj)/util

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

• trunk/Makefile (modified) (8 diffs)

trunk/Makefile

@@ -120 +120 @@
 ldscripts:=
 types:=obj initobj driver smmobj
-includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval -include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y)))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
+includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval -include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst util/%,$(obj)/util/%,$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y))))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
 evaluate_subdirs=$(eval cursubdirs:=$(subdirs)) $(eval subdirs:=) $(foreach dir,$(cursubdirs),$(eval $(call includemakefiles,$(dir)/Makefile.inc,$(types),$(1)))) $(if $(subdirs),$(eval $(call evaluate_subdirs, $(1))))
 
@@ -149 +149 @@
         iasl -p $$(basename $$@) -tc $$(basename $$@).asl
         mv $$(basename $$@).hex $$(basename $$@).c
-        $(CC) -m32 $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$@).c
+        $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$@).c
 endef
 
 define objs_c_template
+$(obj)/$(1)%.o: $(1)%.c $(obj)/config.h
+        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
+
 $(obj)/$(1)%.o: src/$(1)%.c $(obj)/config.h
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
 endef
 
 define objs_S_template
+$(obj)/$(1)%.o: $(1)%.S $(obj)/config.h
+        @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
+        $(CC) -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
+
 $(obj)/$(1)%.o: src/$(1)%.S $(obj)/config.h
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
+        $(CC) -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -167 +175 @@
 $(obj)/$(1)%.initobj.o: src/$(1)%.c $(obj)/config.h
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -173 +181 @@
 $(obj)/$(1)%.initobj.o: src/$(1)%.S $(obj)/config.h
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
+        $(CC) -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -179 +187 @@
 $(obj)/$(1)%.driver.o: src/$(1)%.c $(obj)/config.h
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -185 +193 @@
 $(obj)/$(1)%.driver.o: src/$(1)%.S
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
+        $(CC) -DASSEMBLY $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -191 +199 @@
 $(obj)/$(1)%.smmobj.o: src/$(1)%.c
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
 endef
 
@@ -197 +205 @@
 $(obj)/$(1)%.smmobj.o: src/$(1)%.S
         @printf "    CC         $$(subst $$(obj)/,,$$(@))\n"
-        $(CC) -m32 $$(CFLAGS) -c -o $$@ $$<
+        $(CC) $$(CFLAGS) -c -o $$@ $$<
 endef