From f77b88d124ea1c900f9cf5e04046939aad48bbe1 Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:34:52 +0000 Subject: nbd's makefile/menuconfig rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/binutils/2.14.90.0.6/002-max-pagesize.patch | 12 ++++++++++++ toolchain/binutils/2.14.90.0.7/002-max-pagesize.patch | 12 ++++++++++++ toolchain/binutils/2.15/002-max-pagesize.patch | 12 ++++++++++++ toolchain/binutils/Makefile | 9 +++++++++ toolchain/binutils/Makefile.in | 1 - toolchain/binutils/binutils.mk | 10 ++++++---- 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 toolchain/binutils/2.14.90.0.6/002-max-pagesize.patch create mode 100644 toolchain/binutils/2.14.90.0.7/002-max-pagesize.patch create mode 100644 toolchain/binutils/2.15/002-max-pagesize.patch create mode 100644 toolchain/binutils/Makefile delete mode 100644 toolchain/binutils/Makefile.in (limited to 'toolchain/binutils') diff --git a/toolchain/binutils/2.14.90.0.6/002-max-pagesize.patch b/toolchain/binutils/2.14.90.0.6/002-max-pagesize.patch new file mode 100644 index 000000000..a8ae110e8 --- /dev/null +++ b/toolchain/binutils/2.14.90.0.6/002-max-pagesize.patch @@ -0,0 +1,12 @@ +diff -urN binutils-2.14.90.0.8.test/bfd/elf32-mips.c binutils-2.14.90.0.8/bfd/elf32-mips.c +--- binutils-2.14.90.0.8.test/bfd/elf32-mips.c 2004-01-14 22:07:43.000000000 +0100 ++++ binutils-2.14.90.0.8/bfd/elf32-mips.c 2005-03-03 23:44:00.000000000 +0100 +@@ -1611,7 +1611,7 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ diff --git a/toolchain/binutils/2.14.90.0.7/002-max-pagesize.patch b/toolchain/binutils/2.14.90.0.7/002-max-pagesize.patch new file mode 100644 index 000000000..a8ae110e8 --- /dev/null +++ b/toolchain/binutils/2.14.90.0.7/002-max-pagesize.patch @@ -0,0 +1,12 @@ +diff -urN binutils-2.14.90.0.8.test/bfd/elf32-mips.c binutils-2.14.90.0.8/bfd/elf32-mips.c +--- binutils-2.14.90.0.8.test/bfd/elf32-mips.c 2004-01-14 22:07:43.000000000 +0100 ++++ binutils-2.14.90.0.8/bfd/elf32-mips.c 2005-03-03 23:44:00.000000000 +0100 +@@ -1611,7 +1611,7 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ diff --git a/toolchain/binutils/2.15/002-max-pagesize.patch b/toolchain/binutils/2.15/002-max-pagesize.patch new file mode 100644 index 000000000..a8ae110e8 --- /dev/null +++ b/toolchain/binutils/2.15/002-max-pagesize.patch @@ -0,0 +1,12 @@ +diff -urN binutils-2.14.90.0.8.test/bfd/elf32-mips.c binutils-2.14.90.0.8/bfd/elf32-mips.c +--- binutils-2.14.90.0.8.test/bfd/elf32-mips.c 2004-01-14 22:07:43.000000000 +0100 ++++ binutils-2.14.90.0.8/bfd/elf32-mips.c 2005-03-03 23:44:00.000000000 +0100 +@@ -1611,7 +1611,7 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile new file mode 100644 index 000000000..2bbb48727 --- /dev/null +++ b/toolchain/binutils/Makefile @@ -0,0 +1,9 @@ +include $(TOPDIR)/rules.mk + +include ./binutils.mk + +source: binutils-source +prepare: $(BINUTILS_DIR)/.patched +compile: $(BINUTILS_DIR1)/binutils/objdump +install: binutils +clean: binutils-distclean binutils-toolclean diff --git a/toolchain/binutils/Makefile.in b/toolchain/binutils/Makefile.in deleted file mode 100644 index c6838bb05..000000000 --- a/toolchain/binutils/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION))) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 3097a4bf2..c0d504d6d 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -33,7 +33,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked # Apply appropriate binutils patches. - toolchain/patch-kernel.sh $(BINUTILS_DIR) toolchain/binutils/$(BINUTILS_VERSION) \*.patch + $(SCRIPT_DIR)/patch-kernel.sh $(BINUTILS_DIR) ./$(BINUTILS_VERSION) \*.patch touch $(BINUTILS_DIR)/.patched $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched @@ -54,10 +54,10 @@ $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured # Make install will put gettext data in staging_dir/share/locale. # Unfortunatey, it isn't configureable. -$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump +$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump $(MAKE) -C $(BINUTILS_DIR1) install -binutils-dependancies: +binutils-dependencies: @if ! which bison > /dev/null ; then \ echo -e "\n\nYou must install 'bison' on your build machine\n"; \ exit 1; \ @@ -71,7 +71,7 @@ binutils-dependancies: exit 1; \ fi; -binutils: binutils-dependancies $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld +binutils: binutils-dependencies $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-ld binutils-source: $(DL_DIR)/$(BINUTILS_SOURCE) @@ -82,6 +82,8 @@ binutils-clean: binutils-toolclean: rm -rf $(BINUTILS_DIR1) +binutils-distclean: + rm -rf $(BINUTILS_DIR) ############################################################# -- cgit v1.2.3