diff options
-rw-r--r-- | kconfig/eglibc.kconfig | 2 | ||||
-rw-r--r-- | mk/binutils.mk | 2 | ||||
-rw-r--r-- | mk/eglibc.mk | 22 | ||||
-rw-r--r-- | mk/gcc.mk | 10 | ||||
-rw-r--r-- | mk/kernel-headers.mk | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/kconfig/eglibc.kconfig b/kconfig/eglibc.kconfig index 8eab608..0e7c369 100644 --- a/kconfig/eglibc.kconfig +++ b/kconfig/eglibc.kconfig @@ -24,7 +24,7 @@ ######################################################################################### choice prompt "EGLIBC version" - default EMBTK_EGLIBC_VERSION_2_10 + default EMBTK_EGLIBC_VERSION_2_9 help EGLIBC version to use. diff --git a/mk/binutils.mk b/mk/binutils.mk index b3f8610..218abff 100644 --- a/mk/binutils.mk +++ b/mk/binutils.mk @@ -46,6 +46,6 @@ $(BINUTILS_BUILD_DIR)/.decompressed: $(BINUTILS_BUILD_DIR)/.configured: @cd $(BINUTILS_BUILD_DIR); $(TOOLS_BUILD)/binutils-$(BINUTILS_VERSION)/configure \ --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --disable-werror --disable-nls \ - --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) --target=$(GNU_TARGET) \ + --with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) --target=$(STRICT_GNU_TARGET) \ --build=$(HOST_BUILD) --host=$(HOST_ARCH) @touch $@ diff --git a/mk/eglibc.mk b/mk/eglibc.mk index e350593..9198f79 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -46,7 +46,7 @@ $(EGLIBC_HEADERS_BUILD_DIR)/.installed: eglibc_download $(EGLIBC_HEADERS_BUILD_D @cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crt1.o $(SYSROOT)/usr/lib/ @cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crti.o $(SYSROOT)/usr/lib/ @cp $(EGLIBC_HEADERS_BUILD_DIR)/csu/crtn.o $(SYSROOT)/usr/lib/ - $(TOOLS)/bin/$(GNU_TARGET)-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o \ + $(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o \ $(SYSROOT)/usr/lib/libc.so @touch $@ @@ -65,13 +65,13 @@ $(EGLIBC_HEADERS_BUILD_DIR)/.decompressed: $(EGLIBC_HEADERS_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,eglibc-$(EGLIBC_VERSION)) @cd $(EGLIBC_HEADERS_BUILD_DIR); BUILD_CC=gcc \ - CC=$(TOOLS)/bin/$(GNU_TARGET)-gcc \ - CXX=$(TOOLS)/bin/$(GNU_TARGET)-g++ \ - AR=$(TOOLS)/bin/$(GNU_TARGET)-ar \ - RANLIB=$(TOOLS)/bin/$(GNU_TARGET)-ranlib \ + CC=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc \ + CXX=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-g++ \ + AR=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ar \ + RANLIB=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ranlib \ $(TOOLS_BUILD)/eglibc-$(EGLIBC_VERSION)/libc/configure --prefix=/usr \ --with-headers=$(SYSROOT)/usr/include \ - --host=$(GNU_TARGET) --build=$(HOST_BUILD) $(EGLIBC_FLOAT_TYPE) --disable-nls \ + --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) $(EGLIBC_FLOAT_TYPE) --disable-nls \ --disable-profile --without-gd --without-cvs --enable-add-ons @touch $@ @@ -85,12 +85,12 @@ $(EGLIBC_BUILD_DIR)/.installed: $(EGLIBC_BUILD_DIR)/.configured $(EGLIBC_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,eglibc-$(EGLIBC_VERSION)) @cd $(EGLIBC_BUILD_DIR); BUILD_CC=gcc \ - CC=$(TOOLS)/bin/$(GNU_TARGET)-gcc \ - CXX=$(TOOLS)/bin/$(GNU_TARGET)-g++ \ - AR=$(TOOLS)/bin/$(GNU_TARGET)-ar \ - RANLIB=$(TOOLS)/bin/$(GNU_TARGET)-ranlib \ + CC=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-gcc \ + CXX=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-g++ \ + AR=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ar \ + RANLIB=$(TOOLS)/bin/$(STRICT_GNU_TARGET)-ranlib \ $(TOOLS_BUILD)/eglibc-$(EGLIBC_VERSION)/libc/configure --prefix=/usr \ --with-headers=$(SYSROOT)/usr/include \ - --host=$(GNU_TARGET) --build=$(HOST_BUILD) $(EGLIBC_FLOAT_TYPE) --disable-nls \ + --host=$(STRICT_GNU_TARGET) --build=$(HOST_BUILD) $(EGLIBC_FLOAT_TYPE) --disable-nls \ --disable-profile --without-gd --without-cvs --enable-add-ons @touch $@ @@ -61,7 +61,7 @@ $(GCC1_BUILD_DIR)/.decompressed: $(GCC1_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,gcc-$(GCC_VERSION)) @cd $(GCC1_BUILD_DIR); $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ - --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(GNU_TARGET) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --without-headers --with-newlib --disable-shared --disable-threads \ @@ -79,7 +79,7 @@ $(GCC2_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,gcc-$(GCC_VERSION)) @mkdir -p $(GCC2_BUILD_DIR) @cd $(GCC2_BUILD_DIR); $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ - --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(GNU_TARGET) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) \ --disable-libssp --disable-libgomp --disable-libmudflap \ @@ -91,15 +91,15 @@ $(GCC2_BUILD_DIR)/.configured: $(GCC3_BUILD_DIR)/.installed: $(GCC3_BUILD_DIR)/.configured PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(GCC3_BUILD_DIR) && \ PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(GCC3_BUILD_DIR) install - cp -d $(TOOLS)/$(GNU_TARGET)/lib/libgcc_s.so* $(SYSROOT)/lib - cp -d $(TOOLS)/$(GNU_TARGET)/lib/libstdc++.so* $(SYSROOT)/lib + cp -d $(TOOLS)/$(STRICT_GNU_TARGET)/lib/libgcc_s.so* $(SYSROOT)/lib + cp -d $(TOOLS)/$(STRICT_GNU_TARGET)/lib/libstdc++.so* $(SYSROOT)/lib @touch $@ $(GCC3_BUILD_DIR)/.configured: $(call CONFIGURE_MESSAGE,gcc-$(GCC_VERSION)) @mkdir -p $(GCC3_BUILD_DIR) @cd $(GCC3_BUILD_DIR); $(TOOLS_BUILD)/gcc-$(GCC_VERSION)/configure \ - --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(GNU_TARGET) \ + --prefix=$(TOOLS) --with-sysroot=$(SYSROOT) --target=$(STRICT_GNU_TARGET) \ --with-arch=$(GNU_TARGET_ARCH) --with-float=$(GCC_FLOAT_TYPE) \ --host=$(HOST_ARCH) --build=$(HOST_BUILD) --enable-__cxa_atexit \ --disable-libssp --disable-libgomp --disable-libmudflap \ diff --git a/mk/kernel-headers.mk b/mk/kernel-headers.mk index fb2e14e..2bafc87 100644 --- a/mk/kernel-headers.mk +++ b/mk/kernel-headers.mk @@ -30,7 +30,7 @@ LINUX_BUILD_DIR := $(TOOLS_BUILD)/linux-$(LINUX_VERSION) kernel-headers_install: download_linux $(LINUX_BUILD_DIR)/.decompressed $(call INSTALL_MESSAGE,"headers linux-$(LINUX_VERSION)") PATH=$(PATH):$(TOOLS)/bin/ $(MAKE) -C $(LINUX_BUILD_DIR) \ - headers_install ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(GNU_TARGET)- \ + headers_install ARCH=$(LINUX_ARCH) CROSS_COMPILE=$(STRICT_GNU_TARGET)- \ INSTALL_HDR_PATH=$(SYSROOT)/usr download_linux: |