Commit d632d42b authored by Manuel Novoa III 's avatar Manuel Novoa III
Browse files

Enable building soft float buildroot for gcc 3.3. Currently works for 

  i386 (limited to 64 bit long double... same as double), arm (libfloat),
  mips, and mipsel.
Enable cross compiling a native gcc 3.3 toolchain to run on the target.
Misc rootfs cleanups... strip some things that weren't, eliminate duplicate
  libs, move openssl shared libs out of /lib, reduce size of libssl.so
  by dynamicly linking with libcrypto.so, fix dropbear compile on mips.
parent b5f7712c

Makefile

+39 −12
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
# What sortof target system shall we compile this for?

ARCH:=i386

#ARCH:=arm

#ARCH:=mipsel

#ARCH:=mips

#ARCH:=powerpc

#ARCH:=whatever
@@ -64,9 +66,27 @@ OPTIMIZE_FOR_CPU=$(ARCH) 
#OPTIMIZE_FOR_CPU=strongarm

#OPTIMIZE_FOR_CPU=whatever



# Soft floating point options.

# Notes:

#   Currently builds with gcc 3.3 for i386, arm, mips, mipsel.

#   Only tested with multilib enabled.

#   For i386, long double is the same as double (64 bits).  While this

#      is unusual for x86, it seemed the best approach considering the

#      limitations in the gcc floating point emulation library.

#   For arm, soft float uses the usual libfloat routines.

#   The uClibc built will support _only_ applications compiled with the

#      -msoft-float flag.  To avoid CFLAGS problems, you may want to use

#      scripts similar to those in the build*/staging_dir/bin directory.

# Uncomment the next 2 lines to build a soft-float toolchain and rootfs.

# SOFT_FLOAT_CONFIG_OPTION=--without-float

# TARGET_SOFT_FLOAT=-msoft-float



TARGET_OPTIMIZATION=-Os

TARGET_DEBUGGING= #-g

TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_SOFT_FLOAT)



# Any additional gcc options you may want to include....

EXTRA_GCC_CONFIG_OPTIONS=

#EXTRA_GCC_CONFIG_OPTIONS=--without-float



# Enable the following if you want locale/gettext/i18n support.

#ENABLE_LOCALE:=true
@@ -172,23 +192,32 @@ TARGETS+=ext2root 
# what you are doing.

#

#############################################################

ifeq ("$(strip $(TARGET_SOFT_FLOAT))","")

ARCH_FPU_SUFFIX:=

else

ARCH_FPU_SUFFIX:=_nofpu

endif





HOSTCC:=gcc

BASE_DIR:=${shell pwd}

SOURCE_DIR:=$(BASE_DIR)/sources

DL_DIR:=$(SOURCE_DIR)/dl

PATCH_DIR=$(SOURCE_DIR)/patches

BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)

BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX)

TARGET_DIR:=$(BUILD_DIR)/root

STAGING_DIR=$(BUILD_DIR)/staging_dir

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)

TARGET_PATH=$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin

TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-

TARGET_CC=$(TARGET_CROSS)gcc

#TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-

TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-

TARGET_CC=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT)

STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note

#STRIP:=/bin/true

IMAGE:=$(BASE_DIR)/root_fs_$(ARCH)

IMAGE:=$(BASE_DIR)/root_fs_$(ARCH)$(ARCH_FPU_SUFFIX)

GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux

KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-

#KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-

KERNEL_CROSS=$(STAGING_DIR)/bin/$(ARCH)-linux-

HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \

	-e 's/sparc.*/sparc/' \

	-e 's/arm.*/arm/g' \
@@ -207,12 +236,10 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ 
		AS=$(TARGET_CROSS)as \

		LD=$(TARGET_CROSS)ld \

		NM=$(TARGET_CROSS)nm \

		CC=$(TARGET_CROSS)gcc \

		GCC=$(TARGET_CROSS)gcc \

		CXX=$(TARGET_CROSS)g++ \

		CC=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		GCC=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		CXX=$(TARGET_CROSS)g++$(TARGET_SOFT_FLOAT) \

		RANLIB=$(TARGET_CROSS)ranlib

#Directory in which to build the toolchain

TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build_$(ARCH)

ifeq ($(ENABLE_LOCALE),true)

DISABLE_NLS:=

else

make/autoconf.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ $(AUTOCONF_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE) 
$(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked

	(cd $(AUTOCONF_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) EMACS="no" \

		CFLAGS="$(TARGET_CFLAGS)" \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

make/automake.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ $(AUTOMAKE_DIR)/.unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE) 
$(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked

	(cd $(AUTOMAKE_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		CFLAGS="$(TARGET_CFLAGS)" \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

make/bash.mk

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE) 
$(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked

	(cd $(BASH_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \

		CFLAGS="$(TARGET_CFLAGS)" \

		ac_cv_func_setvbuf_reversed=no \

		bash_cv_have_mbstate_t=yes \

		./configure \

make/binutils.mk

+16 −13
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched 
		--with-sysroot=$(STAGING_DIR) \

		--with-lib-path="$(STAGING_DIR)/usr/lib:$(STAGING_DIR)/lib" \

		$(MULTILIB) \

		--program-prefix=$(ARCH)-uclibc-);

		$(SOFT_FLOAT_CONFIG_OPTION) \

		--program-prefix=$(ARCH)-linux-);

	touch $(BINUTILS_DIR1)/.configured



$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
@@ -74,12 +75,12 @@ $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump 
	for app in addr2line ar as c++filt gprof ld nm objcopy \

		    objdump ranlib readelf size strings strip ; \

	do \

		if [ -x $(STAGING_DIR)/bin/$(ARCH)-uclibc-$${app} ] ; then \

		if [ -x $(STAGING_DIR)/bin/$(ARCH)-linux-$${app} ] ; then \

		    (cd $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin; \

			ln -fs ../../bin/$(ARCH)-uclibc-$${app} $${app}; \

			ln -fs ../../bin/$(ARCH)-linux-$${app} $${app}; \

		    ); \

		    (cd $(STAGING_DIR)/usr/bin; \

			ln -fs ../../bin/$(ARCH)-uclibc-$${app} $${app}; \

			ln -fs ../../bin/$(ARCH)-linux-$${app} $${app}; \

		    ); \

		fi; \

	done;
@@ -122,15 +123,16 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched 
	mkdir -p $(TARGET_DIR)/usr/$(GNU_TARGET_NAME)/

	(cd $(BINUTILS_DIR2); \

		$(TARGET_CONFIGURE_OPTS) \

		CFLAGS="$(TARGET_CFLAGS)" \

		CC_FOR_BUILD=$(HOSTCC) \

		CXX_FOR_BUILD=$(HOSTCC) \

		AR_FOR_TARGET=$(TARGET_CROSS)ar \

		AS_FOR_TARGET=$(TARGET_CROSS)as \

		LD_FOR_TARGET=$(TARGET_CROSS)ld \

		NM_FOR_TARGET=$(TARGET_CROSS)nm \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++ \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++$(TARGET_SOFT_FLOAT) \

		RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \

		$(BINUTILS_DIR)/configure \

		--target=$(GNU_TARGET_NAME) \
@@ -140,6 +142,7 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched 
		--mandir=/usr/man \

		--infodir=/usr/info \

		$(MULTILIB) \

		$(SOFT_FLOAT_CONFIG_OPTION) \

	);

	touch $(BINUTILS_DIR2)/.configured
@@ -151,9 +154,9 @@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured 
		AS_FOR_TARGET=$(TARGET_CROSS)as \

		LD_FOR_TARGET=$(TARGET_CROSS)ld \

		NM_FOR_TARGET=$(TARGET_CROSS)nm \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++ \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++$(TARGET_SOFT_FLOAT) \

		RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib

	touch -c $(BINUTILS_DIR2)/binutils/objdump
@@ -165,9 +168,9 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump 
		AS_FOR_TARGET=$(TARGET_CROSS)as \

		LD_FOR_TARGET=$(TARGET_CROSS)ld \

		NM_FOR_TARGET=$(TARGET_CROSS)nm \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++ \

		CC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		GCC_FOR_TARGET=$(TARGET_CROSS)gcc$(TARGET_SOFT_FLOAT) \

		CXX_FOR_TARGET=$(TARGET_CROSS)g++$(TARGET_SOFT_FLOAT) \

		RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \

		prefix=/usr \

		infodir=/usr/info \