summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-11-10 11:23:47 +0000
committerEric Andersen <andersen@codepoet.org>2001-11-10 11:23:47 +0000
commit30fcef430c59e5884f6765d16fc201c303b2e92c (patch)
treec36e2f86cfdd7612c6fe4f792c8fa7f6175ce2cb /Makefile
parentcd8c436d811a5a077a0b61a6616c900173e2dcfb (diff)
downloadbusybox-w32-30fcef430c59e5884f6765d16fc201c303b2e92c.tar.gz
busybox-w32-30fcef430c59e5884f6765d16fc201c303b2e92c.tar.bz2
busybox-w32-30fcef430c59e5884f6765d16fc201c303b2e92c.zip
Only use -mpreferred-stack-boundary with gcc versions that support it
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7dbf6575f..0fbe91b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -111,9 +111,11 @@ export VERSION BUILDTIME TOPDIR HOSTCC HOSTCFLAGS CROSS CC AR AS LD NM STRIP CPP
111# use '-Os' optimization if available, else use -O2 111# use '-Os' optimization if available, else use -O2
112OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null \ 112OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null \
113 >/dev/null 2>&1; then echo "-Os"; else echo "-O2" ; fi} 113 >/dev/null 2>&1; then echo "-Os"; else echo "-O2" ; fi}
114 114GCC_STACK_BOUNDRY := ${shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc /dev/null \
115 >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; else echo "" ; fi}
116OPTIMIZATIONS=$(OPTIMIZATION) -fomit-frame-pointer $(GCC_STACK_BOUNDRY)
115WARNINGS=-Wall -Wstrict-prototypes -Wshadow 117WARNINGS=-Wall -Wstrict-prototypes -Wshadow
116CFLAGS = -I $(TOPDIR)/include 118CFLAGS = -I$(TOPDIR)/include
117ARFLAGS = -r 119ARFLAGS = -r
118 120
119# 121#
@@ -147,7 +149,7 @@ ifeq ($(strip $(DODEBUG)),true)
147 LDFLAGS += -Wl,-warn-common 149 LDFLAGS += -Wl,-warn-common
148 STRIPCMD = 150 STRIPCMD =
149else 151else
150 CFLAGS += $(WARNINGS) $(OPTIMIZATION) -fomit-frame-pointer -mpreferred-stack-boundary=2 -D_GNU_SOURCE 152 CFLAGS += $(WARNINGS) $(OPTIMIZATIONS) -D_GNU_SOURCE
151 LDFLAGS += -s -Wl,-warn-common 153 LDFLAGS += -s -Wl,-warn-common
152 STRIPCMD = $(STRIP) --remove-section=.note --remove-section=.comment $(PROG) 154 STRIPCMD = $(STRIP) --remove-section=.note --remove-section=.comment $(PROG)
153endif 155endif