[toolchain/avr32]: add avr32 support for binutils 2.19.1 based on the Atmel 1.2.0...

[openwrt/svn-archive/archive.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 536f8cff7fc26bbc0692a670e1daec1b8e8d8237..3473b212de4b6b4c1e054e435517c50b88117694 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -45,7 +45,7 @@ else
 endif
 
 DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)
-BIN_DIR:=$(TOPDIR)/bin
+BIN_DIR:=$(TOPDIR)/bin/$(BOARD)
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
 BUILD_DIR_BASE:=$(TOPDIR)/build_dir
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV)
   BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
   TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
-  PACKAGE_DIR:=$(BIN_DIR)/packages/$(BOARD)_$(LIBC)-$(LIBCV)
+  PACKAGE_DIR:=$(BIN_DIR)/packages
 else
   ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
     GNU_TARGET_NAME=$(call qstrip,$(CONFIG_TARGET_NAME))
@@ -73,7 +73,7 @@ else
   STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)
   BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(GNU_TARGET_NAME)
   TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(GNU_TARGET_NAME)
-  PACKAGE_DIR:=$(BIN_DIR)/packages/$(BOARD)_$(GNU_TARGET_NAME)
+  PACKAGE_DIR:=$(BIN_DIR)/packages
 endif
 STAMP_DIR:=$(BUILD_DIR)/stamp
 STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
@@ -174,7 +174,7 @@ ifneq ($(CONFIG_NO_STRIP),)
   STRIP:=:
 else
   ifneq ($(CONFIG_USE_STRIP),)
-    STRIP:=$(TARGET_CROSS)strip
+    STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS))
   else
     ifneq ($(CONFIG_USE_SSTRIP),)
       STRIP:=$(STAGING_DIR_HOST)/bin/sstrip
@@ -183,7 +183,7 @@ else
   RSTRIP:= \
     NM="$(TARGET_CROSS)nm" \
     STRIP="$(STRIP)" \
-    STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment --remove-section=.pdr --remove-section=mdebug.abi32" \
+    STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment --remove-section=.pdr --remove-section=.mdebug.abi32" \
     $(SCRIPT_DIR)/rstrip.sh
 endif