summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-09 19:47:38 +0000
committerDenis Vlasenko2006-10-09 19:47:38 +0000
commitda8f43fd34d59a83ee8314dae5850db95ac1bdad (patch)
treefb6e0cd8e8b8fd7341b9a3ceb3970580eed0867c
parentca3c981c07ade7f8fd50ba4bb452a2fadaddc326 (diff)
downloadbusybox-da8f43fd34d59a83ee8314dae5850db95ac1bdad.zip
busybox-da8f43fd34d59a83ee8314dae5850db95ac1bdad.tar.gz
build system: fix for non-i386 builds
-rw-r--r--Makefile2
-rw-r--r--Makefile.custom30
-rw-r--r--Makefile.flags4
-rw-r--r--Makefile.help52
-rw-r--r--arch/i386/Makefile5
5 files changed, 14 insertions, 79 deletions
diff --git a/Makefile b/Makefile
index 16fcfeb..c1103cf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION = 1
PATCHLEVEL = 2
SUBLEVEL = 1
EXTRAVERSION = .svn
-NAME=Unnamed
+NAME = Unnamed
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
diff --git a/Makefile.custom b/Makefile.custom
index c0984e1..1733232 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -1,30 +1,6 @@
-### # defconfig is allyesconfig minus any features that are specialized enough
-### # or cause enough behavior change that the user really should switch them on
-### # manually if that's what they want. Sort of "maximum sane config".
-
-### defconfig: scripts/config/conf
-### @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-### @$(SED) -i -r -e "s/^(CONFIG_(DEBUG.*|STATIC|SELINUX|NITPICK|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
-### @./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
-
-### allbareconfig: scripts/config/conf
-### @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
-### @$(SED) -i -r -e "s/^(CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE|BUILD_AT_ONCE)).*/# \1 is not set/" .config
-### @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config
-### @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config
-### @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
-
-### hosttools:
-### $(Q)cp .config .config.bak || noold=yea
-### $(Q)$(MAKE) CC="$(HOSTCC)" CFLAGS="$(HOSTCFLAGS) $(INCS)" allnoconfig
-### $(Q)mv .config .config.in
-### $(Q)(grep -v CONFIG_SED .config.in ; \
-### echo "CONFIG_SED=y" ; ) > .config
-### $(Q)$(MAKE) CC="$(HOSTCC)" CFLAGS="$(HOSTCFLAGS) $(INCS)" oldconfig include/bb_config.h
-### $(Q)$(MAKE) CC="$(HOSTCC)" CFLAGS="$(HOSTCFLAGS) $(INCS)" busybox
-### $(Q)[ -f .config.bak ] && mv .config.bak .config || rm .config
-### mv busybox sed
-### @echo "Now do: $(MAKE) SED=$(objtree)/sed <target>"
+# ==========================================================================
+# Build system
+# ==========================================================================
%.bflt: %_unstripped
$(CROSS_COMPILE)elf2flt $(ELF2FLTFLAGS) $< -o $@
diff --git a/Makefile.flags b/Makefile.flags
index f5eb65f..a6ad10b 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -1,5 +1,5 @@
# ==========================================================================
-# Building
+# Build system
# ==========================================================================
BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -13,7 +13,7 @@ CPPFLAGS += \
-D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP \
-Wall -Wstrict-prototypes -Wshadow -Werror \
-funsigned-char -fno-builtin-strlen -finline-limit=0 -static-libgcc \
- -Os -march=i386 -mpreferred-stack-boundary=2 \
+ -Os -mpreferred-stack-boundary=2 \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-fomit-frame-pointer -ffunction-sections -fdata-sections \
-funsigned-char -fno-builtin-strlen \
diff --git a/Makefile.help b/Makefile.help
index 3ba68d1..a1ff4fc 100644
--- a/Makefile.help
+++ b/Makefile.help
@@ -1,52 +1,6 @@
-### Kernel's one:
-### help:
-### @echo 'Cleaning targets:'
-### @echo ' clean - remove most generated files but keep the config'
-### @echo ' mrproper - remove all generated files + config + various backup files'
-### @echo ''
-### @echo 'Configuration targets:'
-### @$(MAKE) -f $(srctree)/scripts/kconfig/Makefile help
-### @echo ''
-### @echo 'Other generic targets:'
-### @echo ' all - Build all targets marked with [*]'
-### @echo '* busybox - Build the bare kernel'
-### @echo '* modules - Build all modules'
-### @echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'
-### @echo ' dir/ - Build all files in dir and below'
-### @echo ' dir/file.[ois] - Build specified target only'
-### @echo ' dir/file.ko - Build module including final link'
-### @echo ' rpm - Build a kernel as an RPM package'
-### @echo ' tags/TAGS - Generate tags file for editors'
-### @echo ' cscope - Generate cscope index'
-### @echo ' kernelrelease - Output the release version string'
-### @echo ' kernelversion - Output the version stored in Makefile'
-### @echo ''
-### @echo 'Static analysers'
-### @echo ' checkstack - Generate a list of stack hogs'
-### @echo ' namespacecheck - Name space analysis on compiled kernel'
-### @echo ''
-### @echo 'Kernel packaging:'
-### @$(MAKE) $(build)=$(package-dir) help
-### @echo ''
-### @echo 'Documentation targets:'
-### @$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
-### @echo ''
-### @echo 'Architecture specific targets ($(ARCH)):'
-### @$(if $(archhelp),$(archhelp),\
-### echo ' No architecture specific help defined for $(ARCH)')
-### @echo ''
-### @$(if $(boards), \
-### $(foreach b, $(boards), \
-### printf " %-24s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
-### echo '')
-###
-### @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
-### @echo ' make O=dir [targets] Locate all output files in "dir", including .config'
-### @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse)'
-### @echo ' make C=2 [targets] Force check of all c source with $$CHECK (sparse)'
-### @echo ''
-### @echo 'Execute "make" or "make all" to build all targets marked with [*] '
-### @echo 'For further info see the ./README file'
+# ==========================================================================
+# Build system
+# ==========================================================================
help:
@echo 'Cleaning:'
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
new file mode 100644
index 0000000..b9af293
--- /dev/null
+++ b/arch/i386/Makefile
@@ -0,0 +1,5 @@
+# ==========================================================================
+# Build system
+# ==========================================================================
+
+CPPFLAGS += -march=i386