diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-10-16 07:22:36 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-10-16 07:22:36 +0000 |
commit | 844cfae2c664df523d7a0debff8a7e5b1182d73c (patch) | |
tree | f654ad28f73b00afbeed329614cbc1d25851d038 | |
parent | d86554b5ba588fe9d9910be1058c66b8ec68328e (diff) | |
download | OSELAS.Toolchain-844cfae2c664df523d7a0debff8a7e5b1182d73c.tar.gz OSELAS.Toolchain-844cfae2c664df523d7a0debff8a7e5b1182d73c.tar.xz |
* rules/cross-gcc.in, rules/cross-binutils.make, rules/cross-gdb.make, rules/glibc.make, rules/cross-gcc.make, rules/libc.in:
use clean namespace
use new TOOLCHAIN_ instead of GENERIC_
fix urls
git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7845 f8d472c7-5700-0410-ac5a-87979cec3adf
-rw-r--r-- | rules/cross-binutils.make | 11 | ||||
-rw-r--r-- | rules/cross-gcc.in | 6 | ||||
-rw-r--r-- | rules/cross-gcc.make | 15 | ||||
-rw-r--r-- | rules/cross-gdb.make | 17 | ||||
-rw-r--r-- | rules/glibc.make | 2 | ||||
-rw-r--r-- | rules/libc.in | 32 |
6 files changed, 44 insertions, 39 deletions
diff --git a/rules/cross-binutils.make b/rules/cross-binutils.make index f229186..25eeec8 100644 --- a/rules/cross-binutils.make +++ b/rules/cross-binutils.make @@ -53,18 +53,17 @@ $(STATEDIR)/cross-binutils.extract: # ---------------------------------------------------------------------------- CROSS_BINUTILS_PATH := PATH=$(CROSS_PATH) -CROSS_BINUTILS_ENV := $(HOST_ENV) +CROSS_BINUTILS_ENV := $(PTX_HOST_CROSS_ENV) # # autoconf # CROSS_BINUTILS_AUTOCONF := \ - --prefix=$(PTXCONF_SYSROOT_CROSS) \ - --target=$(PTXCONF_GNU_TARGET) \ - --disable-werror \ - --disable-nls \ + $(PTX_HOST_CROSS_AUTOCONF) \ + $(PTXCONF_TOOLCHAIN_CONFIG_SYSROOT) \ \ - $(PTXCONF_GENERIC_CONFIG_SYSROOT) + --disable-werror \ + --disable-nls $(STATEDIR)/cross-binutils.prepare: @$(call targetinfo) diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in index e29f776..edd23ef 100644 --- a/rules/cross-gcc.in +++ b/rules/cross-gcc.in @@ -138,9 +138,9 @@ config CROSS_GCC_DISABLE_SHARED bool config CROSS_GCC_CONFIG_SHARED - string - default "--enable-shared" if CROSS_GCC_ENABLE_SHARED - default "--disable-shared" if CROSS_GCC_DISABLE_SHARED + string + default "--enable-shared" if CROSS_GCC_ENABLE_SHARED + default "--disable-shared" if CROSS_GCC_DISABLE_SHARED ### diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make index 8cb8a8b..2953e39 100644 --- a/rules/cross-gcc.make +++ b/rules/cross-gcc.make @@ -27,7 +27,8 @@ CROSS_GCC_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_GCC)-build CROSS_GCC_URL := \ $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ - ftp://gcc.gnu.org/pub/gcc/snapshots/$(CROSS_GCC_VERSION)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) + ftp://sourceware.org/pub/gcc/snapshots/$(CROSS_GCC_VERSION)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) \ + ftp://sourceware.org/pub/gcc/releases/$(CROSS_GCC)/$(CROSS_GCC).$(CROSS_GCC_SUFFIX) # ---------------------------------------------------------------------------- # Get @@ -56,16 +57,18 @@ endif # ---------------------------------------------------------------------------- CROSS_GCC_PATH := PATH=$(CROSS_PATH) -CROSS_GCC_ENV := $(HOSTCC_ENV) +CROSS_GCC_ENV := $(PTX_HOST_ENV) # # autoconf # CROSS_GCC_AUTOCONF_COMMON := \ - --target=$(PTXCONF_GNU_TARGET) \ + $(PTX_HOST_CROSS_AUTOCONF_HOST) \ + $(PTX_HOST_CROSS_AUTOCONF_TARGET) \ + \ + $(PTXCONF_TOOLCHAIN_CONFIG_SYSROOT) \ + $(PTXCONF_TOOLCHAIN_CONFIG_MULTILIB) \ \ - $(PTXCONF_GENERIC_CONFIG_SYSROOT) \ - $(PTXCONF_GENERIC_CONFIG_MULTILIB) \ $(PTXCONF_CROSS_GCC_CONFIG_EXTRA) \ $(PTXCONF_CROSS_GCC_CONFIG_LIBC) \ $(PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT) \ @@ -107,7 +110,7 @@ CROSS_GCC_LANG-$(PTXCONF_CROSS_GCC_LANG_FORTRAN) += fortran CROSS_GCC_AUTOCONF := \ $(CROSS_GCC_AUTOCONF_COMMON) \ - --prefix=$(PTXCONF_SYSROOT_CROSS) \ + $(PTX_HOST_CROSS_AUTOCONF_PREFIX) \ \ --enable-languages=$(subst $(space),$(comma),$(CROSS_GCC_LANG-y)) \ --enable-threads=$(PTXCONF_CROSS_GCC_THREADS) \ diff --git a/rules/cross-gdb.make b/rules/cross-gdb.make index 023ab12..6046ca3 100644 --- a/rules/cross-gdb.make +++ b/rules/cross-gdb.make @@ -2,7 +2,7 @@ # $Id$ # # Copyright (C) 2006, 2007, 2008 by Marc Kleine-Budde <mkl@pengutronix.de> -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -20,10 +20,13 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GDB) += cross-gdb CROSS_GDB_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GDB_VERSION)) CROSS_GDB := gdb-$(CROSS_GDB_VERSION) CROSS_GDB_SUFFIX := tar.bz2 -CROSS_GDB_URL := $(PTXCONF_SETUP_GNUMIRROR)/gdb/$(CROSS_GDB).$(CROSS_GDB_SUFFIX) CROSS_GDB_SOURCE := $(SRCDIR)/$(CROSS_GDB).$(CROSS_GDB_SUFFIX) CROSS_GDB_DIR := $(CROSS_BUILDDIR)/$(CROSS_GDB) +CROSS_GDB_URL := \ + $(PTXCONF_SETUP_GNUMIRROR)/gdb/$(CROSS_GDB).$(CROSS_GDB_SUFFIX) \ + ftp://sourceware.org/pub/gdb/snapshots/current/$(CROSS_GDB).$(CROSS_GDB_SUFFIX) + # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -48,21 +51,17 @@ $(STATEDIR)/cross-gdb.extract: # ---------------------------------------------------------------------------- CROSS_GDB_PATH := PATH=$(CROSS_PATH) -CROSS_GDB_ENV := $(HOST_ENV) +CROSS_GDB_ENV := $(PTX_HOST_ENV) # # autoconf # CROSS_GDB_AUTOCONF := \ - --prefix=$(PTXCONF_SYSROOT_CROSS) \ - --build=$(GNU_HOST) \ - --host=$(GNU_HOST) \ - --target=$(PTXCONF_GNU_TARGET) \ - $(PTXCONF_GENERIC_CONFIG_SYSROOT) \ + $(PTX_HOST_CROSS_AUTOCONF) \ + $(PTXCONF_TOOLCHAIN_CONFIG_SYSROOT) \ \ --disable-werror \ --enable-tui -# --enable-gdbtk $(STATEDIR)/cross-gdb.prepare: @$(call targetinfo) diff --git a/rules/glibc.make b/rules/glibc.make index 42ba581..45dfbbe 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -33,7 +33,7 @@ GLIBC_BUILDDIR := $(BUILDDIR)/$(GLIBC)-build GLIBC_URL := \ $(PTXCONF_SETUP_GNUMIRROR)/glibc/$(GLIBC).$(GLIBC_SUFFIX) \ - ftp://sources.redhat.com/pub/glibc/snapshots/$(GLIBC).$(GLIBC_SUFFIX) \ + ftp://sourceware.org/pub/glibc/snapshots/$(GLIBC).$(GLIBC_SUFFIX) \ http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC).$(GLIBC_SUFFIX) # ---------------------------------------------------------------------------- diff --git a/rules/libc.in b/rules/libc.in index f084b65..85f0258 100644 --- a/rules/libc.in +++ b/rules/libc.in @@ -55,27 +55,31 @@ endchoice # # sysroot support # -config GENERIC_SYSROOT - bool +config TOOLCHAIN_ENABLE_SYSROOT + bool + default !TOOLCHAIN_DISABLE_SYSROOT + +config TOOLCHAIN_DISABLE_SYSROOT + bool -config GENERIC_CONFIG_SYSROOT - string - default "--with-sysroot=${SYSROOT}" if GENERIC_SYSROOT +config TOOLCHAIN_CONFIG_SYSROOT + string + default "--with-sysroot=${SYSROOT}" if TOOLCHAIN_ENABLE_SYSROOT # # multilib support # -config GENERIC_ENABLE_MULTILIB - bool +config TOOLCHAIN_ENABLE_MULTILIB + bool -config GENERIC_DISABLE_MULTILIB - bool - default !GENERIC_ENABLE_MULTILIB +config TOOLCHAIN_DISABLE_MULTILIB + bool + default !TOOLCHAIN_ENABLE_MULTILIB -config GENERIC_CONFIG_MULTILIB - string - default "--enable-multilib" if GENERIC_ENABLE_MULTILIB - default "--disable-multilib" if GENERIC_DISABLE_MULTILIB +config TOOLCHAIN_CONFIG_MULTILIB + string + default "--enable-multilib" if TOOLCHAIN_ENABLE_MULTILIB + default "--disable-multilib" if TOOLCHAIN_DISABLE_MULTILIB |