summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Schlote <c.schlote@konzeptpark.de>2008-03-12 16:30:33 +0000
committerCarsten Schlote <c.schlote@konzeptpark.de>2008-03-12 16:30:33 +0000
commitf0af0ff722ca860bbd4eae74b367efb2350d7c8e (patch)
treef7167e5331e87f9e0d90dcd2ede15994a5504548
parent91c7a505880a678b9d38ee0ccb2934b1d90dac73 (diff)
downloadOSELAS.Toolchain-f0af0ff722ca860bbd4eae74b367efb2350d7c8e.tar.gz
OSELAS.Toolchain-f0af0ff722ca860bbd4eae74b367efb2350d7c8e.tar.xz
- Updated configs for official 4.3 GCC tarball (not RC or snapshot)
- Added fix for broken kernel-header install, name changed for x86 arch from i386 to x86. Added special case for GCC 4.3 and i386 arch, so PTXCONF_ARCH is set to the new arch name. - WIP commit (compile tests done on much faster host at office) git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@5730 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat
-rw-r--r--Kconfig6
-rw-r--r--patches/gcc-4.3.0/generic/dummy (renamed from patches/gcc-4.3.0-RC-20080301/generic/dummy)0
-rw-r--r--patches/gcc-4.3.0/generic/series (renamed from patches/gcc-4.3.0-RC-20080301/generic/series)0
-rw-r--r--ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.22.5.ptxconfig2
-rw-r--r--ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig8
-rw-r--r--ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.3.6_linux-2.6.18.ptxconfig2
-rw-r--r--ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.5_linux-2.6.18.ptxconfig2
-rw-r--r--ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.18.ptxconfig2
-rw-r--r--ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig2
-rw-r--r--rules/cross-gcc-first.make4
-rw-r--r--rules/host-gmp.make2
11 files changed, 17 insertions, 13 deletions
diff --git a/Kconfig b/Kconfig
index 3331d38..44e49e8 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,3 +1,4 @@
+
#
# Kconfig: Main menu structure definition
# Copyright (C) Robert Schwebel <r.schwebel@pengutronix.de> 2005, 2006
@@ -87,11 +88,12 @@ endchoice
config ARCH
string
default "arm" if ARCH_ARM
+ default "avr" if ARCH_AVR
default "m68k" if ARCH_M68K
+ default "x86" if CROSS_GCC_43 && ARCH_I386
+ default "i386" if ARCH_I386
default "mips" if ARCH_MIPS
default "powerpc" if ARCH_POWERPC
- default "i386" if ARCH_I386
- default "avr" if ARCH_AVR
config GNU_TARGET
string
diff --git a/patches/gcc-4.3.0-RC-20080301/generic/dummy b/patches/gcc-4.3.0/generic/dummy
index 2012ae0..2012ae0 100644
--- a/patches/gcc-4.3.0-RC-20080301/generic/dummy
+++ b/patches/gcc-4.3.0/generic/dummy
diff --git a/patches/gcc-4.3.0-RC-20080301/generic/series b/patches/gcc-4.3.0/generic/series
index 4140aab..4140aab 100644
--- a/patches/gcc-4.3.0-RC-20080301/generic/series
+++ b/patches/gcc-4.3.0/generic/series
diff --git a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.22.5.ptxconfig b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.22.5.ptxconfig
index 6fb9533..36af90b 100644
--- a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.22.5.ptxconfig
+++ b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.22.5.ptxconfig
@@ -35,7 +35,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.22.5"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES="series"
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
diff --git a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
index d6a07e8..5cf694a 100644
--- a/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
+++ b/ptxconfigs/i686-unknown-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# PTXdist version: 1.99.svn
-# Mon Mar 10 20:45:02 2008
+# Wed Mar 12 17:23:35 2008
#
PTXCONF_BUILD_TOOLCHAIN=y
PTXCONF_PROJECT="OSELAS.Toolchain-trunk"
@@ -35,7 +35,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.24.3"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES="series"
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
@@ -62,8 +62,8 @@ PTXCONF_HOST_MPFR=y
# PTXCONF_ARCH_POWERPC is not set
PTXCONF_ARCH_I386=y
# PTXCONF_ARCH_AVR is not set
-PTXCONF_ARCH="i386"
-PTXCONF_GNU_TARGET="i686-unknown-linux-gnu"
+PTXCONF_ARCH="x86"
+PTXCONF_GNU_TARGET="x86-unknown-linux-gnu"
PTXCONF_COMPILER_PREFIX="${PTXCONF_GNU_TARGET}-"
PTXCONF_TOOLCHAIN_DEBUG=y
diff --git a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.3.6_linux-2.6.18.ptxconfig b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.3.6_linux-2.6.18.ptxconfig
index fc44961..470ae6d 100644
--- a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.3.6_linux-2.6.18.ptxconfig
+++ b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.3.6_linux-2.6.18.ptxconfig
@@ -37,7 +37,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.18"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES=""
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
diff --git a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.5_linux-2.6.18.ptxconfig b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.5_linux-2.6.18.ptxconfig
index 73bc684..389893a 100644
--- a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.5_linux-2.6.18.ptxconfig
+++ b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.5_linux-2.6.18.ptxconfig
@@ -37,7 +37,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.18"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES=""
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
diff --git a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.18.ptxconfig b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.18.ptxconfig
index c438c12..af43974 100644
--- a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.18.ptxconfig
+++ b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.18.ptxconfig
@@ -35,7 +35,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.18"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES="series"
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
diff --git a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
index 63d6264..5956458 100644
--- a/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
+++ b/ptxconfigs/m68k-linux-gnu_gcc-4.3_glibc-2.7_linux-2.6.24.3.ptxconfig
@@ -35,7 +35,7 @@ PTXCONF_KERNEL_HEADERS_VERSION="2.6.24.3"
# PTXCONF_KERNEL_HEADERS_SANIZIZED is not set
PTXCONF_KERNEL_HEADERS_CONFIG="kernelconfigs/kernelconfig-${PTXCONF_KERNEL_HEADERS_VERSION}.${PTXCONF_ARCH}"
PTXCONF_CROSS_GCC_FIRST=y
-PTXCONF_CROSS_GCC_VERSION="4.3.0-RC-20080301"
+PTXCONF_CROSS_GCC_VERSION="4.3.0"
PTXCONF_CROSS_GCC_43=y
PTXCONF_CROSS_GCC_SERIES="series"
PTXCONF_CROSS_GCC_FIRST_SERIES="${PTXCONF_CROSS_GCC_SERIES}"
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make
index b06e862..387c1e0 100644
--- a/rules/cross-gcc-first.make
+++ b/rules/cross-gcc-first.make
@@ -20,7 +20,9 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_GCC_FIRST) += cross-gcc-first
CROSS_GCC_FIRST_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_GCC_VERSION))
CROSS_GCC_FIRST := gcc-$(CROSS_GCC_FIRST_VERSION)
CROSS_GCC_FIRST_SUFFIX := tar.bz2
-CROSS_GCC_FIRST_URL := $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC_FIRST)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
+#CROSS_GCC_FIRST_URL := $(PTXCONF_SETUP_GNUMIRROR)/gcc/$(CROSS_GCC_FIRST)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
+CROSS_GCC_FIRST_URL := ftp://ftp.gwdg.de/pub/misc/gnu/ftp/gnu/gcc/$(CROSS_GCC_FIRST)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
+
CROSS_GCC_FIRST_SOURCE := $(SRCDIR)/$(CROSS_GCC_FIRST).$(CROSS_GCC_FIRST_SUFFIX)
CROSS_GCC_FIRST_DIR := $(BUILDDIR_CROSS_DEBUG)/$(CROSS_GCC_FIRST)
CROSS_GCC_FIRST_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_GCC_FIRST)-first-build
diff --git a/rules/host-gmp.make b/rules/host-gmp.make
index db7e68d..12cd5a3 100644
--- a/rules/host-gmp.make
+++ b/rules/host-gmp.make
@@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_GMP) += host-gmp
#
# Paths and names
#
-HOST_GMP_VERSION := 4.2.1
+HOST_GMP_VERSION := 4.2.2
HOST_GMP := gmp-$(HOST_GMP_VERSION)
HOST_GMP_SUFFIX := tar.bz2
HOST_GMP_URL := $(PTXCONF_SETUP_GNUMIRROR)/gmp/$(HOST_GMP).$(HOST_GMP_SUFFIX)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 22:38:25 +0000