From: Joseph C. <jos...@in...> - 2010-10-05 22:41:40
|
changeset 9d5dda270ac8 in /var/www/tboot.hg details: tboot.hg?cmd=changeset;node=9d5dda270ac8 description: Clean up build Removed some unused build flags and logic. Changed tboot compiler flags to be based on a new env var, $TBOOT_CFLAGS, instead of CFLAGS to reflect its unique build requirements and insulate it from system CFLAGS settings that would create build errors. Signed-off-by: Joseph Cihula <jos...@in...> diffstat: Config.mk | 6 ------ tboot/Config.mk | 12 ++++-------- tboot/Makefile | 4 ---- 3 files changed, 4 insertions(+), 18 deletions(-) diffs (65 lines): diff -r ae00dae16c04 -r 9d5dda270ac8 Config.mk --- a/Config.mk Wed Sep 29 15:39:56 2010 -0400 +++ b/Config.mk Tue Oct 05 15:52:05 2010 -0700 @@ -41,12 +41,6 @@ -Wno-missing-field-initializers \ -D_FORTIFY_SOURCE=2 -HOSTCC = gcc -HOSTCFLAGS = $(CFLAGS_WARN) -O2 -std=gnu99 -fno-strict-aliasing - -HOSTCFLAGS_x86_32 = -m32 -HOSTCFLAGS_x86_64 = -m64 - AS = as LD = ld CC = gcc diff -r ae00dae16c04 -r 9d5dda270ac8 tboot/Config.mk --- a/tboot/Config.mk Wed Sep 29 15:39:56 2010 -0400 +++ b/tboot/Config.mk Tue Oct 05 15:52:05 2010 -0700 @@ -9,9 +9,12 @@ ROOTDIR ?= $(CURDIR)/.. +# tboot needs too many customized compiler settings to use system CFLAGS, +# so if environment wants to set any compiler flags, it must use TBOOT_CFLAGS +CFLAGS := $(TBOOT_CFLAGS) + include $(ROOTDIR)/Config.mk - # if target arch is 64b, then convert -m64 to -m32 (tboot is always 32b) CFLAGS := $(shell echo $(CFLAGS) | sed -e s/-m64/-m32/) CFLAGS += -march=i686 @@ -27,17 +30,10 @@ CFLAGS += $(call cc-option,$(CC),-nopie,) CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) CFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) -ifeq ($(TARGET_ARCH),x86_64) -CFLAGS += -DTARGET_ARCH_x86_64 -endif # changeset variable for banner CFLAGS += -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)"\" -# uncomment to support logging to memory location -#CFLAGS += -DMEM_LOGGING - - AFLAGS += -D__ASSEMBLY__ diff -r ae00dae16c04 -r 9d5dda270ac8 tboot/Makefile --- a/tboot/Makefile Wed Sep 29 15:39:56 2010 -0400 +++ b/tboot/Makefile Tue Oct 05 15:52:05 2010 -0700 @@ -27,10 +27,6 @@ $(TARGET).gz : $(TARGET) gzip -f -9 < $< > $@ -ifeq ($(debug),n) -LDFLAGS_STRIP = -s -endif - $(TARGET) : $(OBJS) $(TARGET_LDS) $(LD) $(LDFLAGS) -T $(TARGET_LDS) -N $(OBJS) -o $(@D)/.$(@F).0 $(NM) -n $(@D)/.$(@F).0 >$(TARGET)-syms |