diff options
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 6 | ||||
| -rw-r--r-- | toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch | 22 | ||||
| -rw-r--r-- | toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch | 19 | ||||
| -rw-r--r-- | toolchain/gdb/gdb.mk | 7 | ||||
| -rw-r--r-- | toolchain/kernel-headers/Config.in | 8 | ||||
| -rw-r--r-- | toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch (renamed from toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch) | 0 | ||||
| -rw-r--r-- | toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 4 | ||||
| -rw-r--r-- | toolchain/toolchain-external/ext-tool.mk | 2 |
8 files changed, 57 insertions, 11 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 1710070ed..7a0b4caa0 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -251,9 +251,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) rm -rf $(GCC_DIR) $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - $(call CONFIG_UPDATE,$(@D)) -ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip,\ - $(BR2_xtensa_core_name)).tar -C $(@D) include +ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\ + $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc endif touch $@ diff --git a/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch new file mode 100644 index 000000000..3d1b07c99 --- /dev/null +++ b/toolchain/gdb/7.4.1/xtensa-asm-ptrace-h.patch @@ -0,0 +1,22 @@ +--- gdb-7.4.1/gdb/xtensa-linux-nat.c.orig 2012-10-19 16:23:06.908165323 -0700 ++++ gdb-7.4.1/gdb/xtensa-linux-nat.c 2012-10-19 16:35:30.792134876 -0700 +@@ -36,7 +36,7 @@ + #include "gdb_wait.h" + #include <fcntl.h> + #include <sys/procfs.h> +-#include <sys/ptrace.h> ++#include <asm/ptrace.h> + + #include "gregset.h" + #include "xtensa-tdep.h" +--- gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c.orig 2012-10-19 16:24:06.260162894 -0700 ++++ gdb-7.4.1/gdb/gdbserver/linux-xtensa-low.c 2012-10-19 16:36:07.920133357 -0700 +@@ -23,7 +23,7 @@ + /* Defined in auto-generated file reg-xtensa.c. */ + void init_registers_xtensa (void); + +-#include <sys/ptrace.h> ++#include <asm/ptrace.h> + #include <xtensa-config.h> + + #include "xtensa-xtregs.c" diff --git a/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch new file mode 100644 index 000000000..e10bb8f3e --- /dev/null +++ b/toolchain/gdb/7.4.1/xtensa-gdb-regsize.patch @@ -0,0 +1,19 @@ +--- gdb-7.4.1/gdb/xtensa-tdep.h.orig 2012-10-30 11:40:23.546448594 -0700 ++++ gdb-7.4.1/gdb/xtensa-tdep.h 2012-10-30 11:41:43.078445337 -0700 +@@ -17,6 +17,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + ++#include <stdint.h> + + /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION + whenever the "tdep" structure changes in an incompatible way. */ +@@ -84,7 +85,7 @@ + /* Xtensa ELF core file register set representation ('.reg' section). + Copied from target-side ELF header <xtensa/elf.h>. */ + +-typedef unsigned long xtensa_elf_greg_t; ++typedef uint32_t xtensa_elf_greg_t; + + typedef struct + { diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index dc305a63b..4b8fe3a3d 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -25,9 +25,9 @@ gdb-unpacked: $(GDB_DIR)/.unpacked $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) mkdir -p $(GDB_DIR) $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) - -ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \ - $(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb +ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \ + $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb endif ifneq ($(wildcard $(GDB_PATCH_DIR)),) support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch @@ -196,6 +196,7 @@ $(GDB_HOST_DIR)/.configured: $(GDB_DIR)/.unpacked $(GDB_HOST_DIR)/gdb/gdb: $(GDB_HOST_DIR)/.configured # force ELF support since it fails due to BFD linking problems + $(HOST_MAKE_ENV) \ gdb_cv_var_elf=yes \ $(MAKE) -C $(GDB_HOST_DIR) strip $(GDB_HOST_DIR)/gdb/gdb diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index e195def19..12b3956af 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -67,12 +67,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37 default "2.6.38.8" if BR2_KERNEL_HEADERS_2_6_38 default "2.6.39.4" if BR2_KERNEL_HEADERS_2_6_39 - default "3.0.51" if BR2_KERNEL_HEADERS_3_0 + default "3.0.53" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 - default "3.2.33" if BR2_KERNEL_HEADERS_3_2 + default "3.2.34" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.18" if BR2_KERNEL_HEADERS_3_4 + default "3.4.20" if BR2_KERNEL_HEADERS_3_4 default "3.5.7" if BR2_KERNEL_HEADERS_3_5 - default "3.6.6" if BR2_KERNEL_HEADERS_3_6 + default "3.6.8" if BR2_KERNEL_HEADERS_3_6 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b7163..8777b7163 100644 --- a/toolchain/kernel-headers/linux-3.0.51-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/toolchain/kernel-headers/linux-3.0.53-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk index 5f9119d57..6f81e30cd 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk @@ -41,6 +41,10 @@ uclibc-source: $(CTNG_DIR)/.config CTNG_LIBS_LIB := ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so \ libnsl.so libpthread.so libresolv.so librt.so libutil.so +ifeq ($(BR2_PACKAGE_GDB_SERVER),y) +CTNG_LIBS_LIB += libthread_db.so +endif + #-------------- # The libc-specific system libraries (in /lib) # Note: it may be needed to tweak the NSS libs in the glibc and eglibc cases... diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 4429480af..beba49fff 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -61,7 +61,7 @@ endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIB_EXTERNAL_LIBS+=libpthread.so -ifeq ($(BR2_PACKAGE_GDB_SERVER),y) +ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) LIB_EXTERNAL_LIBS+=libthread_db.so endif # gdbserver endif # ! no threads |