summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build-config.mk.template4
-rw-r--r--constants.mk38
-rw-r--r--target-setup.mk4
3 files changed, 23 insertions, 23 deletions
diff --git a/build-config.mk.template b/build-config.mk.template
index 4eac0cc..1e6429a 100644
--- a/build-config.mk.template
+++ b/build-config.mk.template
@@ -2,13 +2,13 @@
# ENABLE NOARCH, and HOST: {x86_64|i686}-pc-linux-gnu: is always true.
#
-# TARGET: i486-radix-linux-gnu:
+# TARGET: i686-radix-linux-gnu:
ENABLE_PC32 = true
# TARGET: x86_64-radix-linux-gnu:
ENABLE_PC64 = true
-# TARGET: i486-radix-linux-gnu:
+# TARGET: i686-radix-linux-gnu:
ENABLE_PC32M = true
# TARGET: x86_64-radix-linux-gnu:
diff --git a/constants.mk b/constants.mk
index 1b5cb4f..3692af4 100644
--- a/constants.mk
+++ b/constants.mk
@@ -5,7 +5,7 @@ ifndef CONSTANTS_MK
####### Constants:
#######
-SYSTEM_VERSION = 1.2.2
+SYSTEM_VERSION = 1.2.3
#
# Distribution:
@@ -376,14 +376,14 @@ BUILD_MACHINE_HARDWARE_VARIANTS := $(HARDWARE_BUILD)
TOOLCHAIN_I686_GLIBC = i686-glibc
-I686_GLIBC_ARCH = i486-radix-linux-gnu
-I686_GLIBC_VERSION = 1.1.2
-I686_GLIBC_DIR = i486-PC-linux-glibc
+I686_GLIBC_ARCH = i686-radix-linux-gnu
+I686_GLIBC_VERSION = 1.1.4
+I686_GLIBC_DIR = i686-PC-linux-glibc
I686_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(I686_GLIBC_DIR)
I686_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(I686_GLIBC_VERSION)/$(I686_GLIBC_DIR)-$(I686_GLIBC_VERSION).$(TARBALL_SUFFIX)
I686_GLIBC_ARCH_DEFS = -D__I686_GLIBC__=1
-I686_GLIBC_ARCH_FLAGS = -m32 -march=i486 -mtune=i686
+I686_GLIBC_ARCH_FLAGS = -m32 -march=i686 -mtune=i686
I686_GLIBC_SYSROOT = sys-root
I686_GLIBC_DEST_SYSROOT = yes
@@ -399,7 +399,7 @@ I686_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_PC32) $(HARDWARE_PC32M)
TOOLCHAIN_X86_64_GLIBC = x86_64-glibc
X86_64_GLIBC_ARCH = x86_64-radix-linux-gnu
-X86_64_GLIBC_VERSION = 1.1.2
+X86_64_GLIBC_VERSION = 1.1.4
X86_64_GLIBC_DIR = x86_64-PC-linux-glibc
X86_64_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(X86_64_GLIBC_DIR)
X86_64_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(X86_64_GLIBC_VERSION)/$(X86_64_GLIBC_DIR)-$(X86_64_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -420,7 +420,7 @@ X86_64_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_PC64) $(HARDWARE_PC64M)
TOOLCHAIN_A1X_NEWLIB = a1x-newlib
A1X_NEWLIB_ARCH = arm-a1x-eabi
-A1X_NEWLIB_VERSION = 1.1.2
+A1X_NEWLIB_VERSION = 1.1.4
A1X_NEWLIB_DIR = arm-A1X-eabi-newlib
A1X_NEWLIB_PATH = $(TOOLCHAINS_BASE_PATH)/$(A1X_NEWLIB_DIR)
A1X_NEWLIB_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(A1X_NEWLIB_VERSION)/$(A1X_NEWLIB_DIR)-$(A1X_NEWLIB_VERSION).$(TARBALL_SUFFIX)
@@ -436,7 +436,7 @@ A1X_NEWLIB_HARDWARE_VARIANTS := $(HARDWARE_CB1N)
TOOLCHAIN_A1X_GLIBC = a1x-glibc
A1X_GLIBC_ARCH = arm-a1x-linux-gnueabihf
-A1X_GLIBC_VERSION = 1.1.2
+A1X_GLIBC_VERSION = 1.1.4
A1X_GLIBC_DIR = arm-A1X-linux-glibc
A1X_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(A1X_GLIBC_DIR)
A1X_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(A1X_GLIBC_VERSION)/$(A1X_GLIBC_DIR)-$(A1X_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -458,7 +458,7 @@ A1X_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_CB1X)
TOOLCHAIN_A2X_NEWLIB = a2x-newlib
A2X_NEWLIB_ARCH = arm-a2x-eabi
-A2X_NEWLIB_VERSION = 1.1.2
+A2X_NEWLIB_VERSION = 1.1.4
A2X_NEWLIB_DIR = arm-A2X-eabi-newlib
A2X_NEWLIB_PATH = $(TOOLCHAINS_BASE_PATH)/$(A2X_NEWLIB_DIR)
A2X_NEWLIB_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(A2X_NEWLIB_VERSION)/$(A2X_NEWLIB_DIR)-$(A2X_NEWLIB_VERSION).$(TARBALL_SUFFIX)
@@ -474,7 +474,7 @@ A2X_NEWLIB_HARDWARE_VARIANTS := $(HARDWARE_CB2N) $(HARDWARE_CB3N)
TOOLCHAIN_A2X_GLIBC = a2x-glibc
A2X_GLIBC_ARCH = arm-a2x-linux-gnueabihf
-A2X_GLIBC_VERSION = 1.1.2
+A2X_GLIBC_VERSION = 1.1.4
A2X_GLIBC_DIR = arm-A2X-linux-glibc
A2X_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(A2X_GLIBC_DIR)
A2X_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(A2X_GLIBC_VERSION)/$(A2X_GLIBC_DIR)-$(A2X_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -496,7 +496,7 @@ A2X_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_CB2X) $(HARDWARE_CB3X)
TOOLCHAIN_RK328X_GLIBC = rk328x-glibc
RK328X_GLIBC_ARCH = arm-rk328x-linux-gnueabihf
-RK328X_GLIBC_VERSION = 1.1.2
+RK328X_GLIBC_VERSION = 1.1.4
RK328X_GLIBC_DIR = arm-RK328X-linux-glibc
RK328X_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(RK328X_GLIBC_DIR)
RK328X_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(RK328X_GLIBC_VERSION)/$(RK328X_GLIBC_DIR)-$(RK328X_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -518,7 +518,7 @@ RK328X_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_FFRK3288)
TOOLCHAIN_S8XX_GLIBC = s8xx-glibc
S8XX_GLIBC_ARCH = arm-s8xx-linux-gnueabihf
-S8XX_GLIBC_VERSION = 1.1.2
+S8XX_GLIBC_VERSION = 1.1.4
S8XX_GLIBC_DIR = arm-S8XX-linux-glibc
S8XX_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(S8XX_GLIBC_DIR)
S8XX_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(S8XX_GLIBC_VERSION)/$(S8XX_GLIBC_DIR)-$(S8XX_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -540,7 +540,7 @@ S8XX_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_M201) $(HARDWARE_MXV)
TOOLCHAIN_S9XX_GLIBC = s9xx-glibc
S9XX_GLIBC_ARCH = aarch64-s9xx-linux-gnu
-S9XX_GLIBC_VERSION = 1.1.2
+S9XX_GLIBC_VERSION = 1.1.4
S9XX_GLIBC_DIR = aarch64-S9XX-linux-glibc
S9XX_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(S9XX_GLIBC_DIR)
S9XX_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(S9XX_GLIBC_VERSION)/$(S9XX_GLIBC_DIR)-$(S9XX_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -565,7 +565,7 @@ S9XX_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_P201) $(HARDWARE_NEXBOX_A95X) \
TOOLCHAIN_AT91SAM7S_NEWLIB = at91sam7s-newlib
AT91SAM7S_NEWLIB_ARCH = arm-at91sam7s-eabi
-AT91SAM7S_NEWLIB_VERSION = 1.1.2
+AT91SAM7S_NEWLIB_VERSION = 1.1.4
AT91SAM7S_NEWLIB_DIR = arm-AT91SAM7S-eabi-newlib
AT91SAM7S_NEWLIB_PATH = $(TOOLCHAINS_BASE_PATH)/$(AT91SAM7S_NEWLIB_DIR)
AT91SAM7S_NEWLIB_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(AT91SAM7S_NEWLIB_VERSION)/$(AT91SAM7S_NEWLIB_DIR)-$(AT91SAM7S_NEWLIB_VERSION).$(TARBALL_SUFFIX)
@@ -581,7 +581,7 @@ AT91SAM7S_NEWLIB_HARDWARE_VARIANTS := $(HARDWARE_AT91S)
TOOLCHAIN_LPC17XX_UCLIBC = lpc17xx-uclibc
LPC17XX_UCLIBC_ARCH = arm-lpc17xx-uclinuxeabi
-LPC17XX_UCLIBC_VERSION = 1.1.2
+LPC17XX_UCLIBC_VERSION = 1.1.4
LPC17XX_UCLIBC_DIR = arm-LPC17XX-uclinuxeabi
LPC17XX_UCLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(LPC17XX_UCLIBC_DIR)
LPC17XX_UCLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(LPC17XX_UCLIBC_VERSION)/$(LPC17XX_UCLIBC_DIR)-$(LPC17XX_UCLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -599,7 +599,7 @@ LPC17XX_UCLIBC_HARDWARE_VARIANTS := $(HARDWARE_L17UC)
TOOLCHAIN_IMX6_GLIBC = imx6-glibc
IMX6_GLIBC_ARCH = arm-imx6-linux-gnueabihf
-IMX6_GLIBC_VERSION = 1.1.2
+IMX6_GLIBC_VERSION = 1.1.4
IMX6_GLIBC_DIR = arm-IMX6-linux-glibc
IMX6_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(IMX6_GLIBC_DIR)
IMX6_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(IMX6_GLIBC_VERSION)/$(IMX6_GLIBC_DIR)-$(IMX6_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -621,7 +621,7 @@ IMX6_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_NIT6Q)
TOOLCHAIN_OMAP543X_GLIBC = omap543x-glibc
OMAP543X_GLIBC_ARCH = arm-omap543x-linux-gnueabihf
-OMAP543X_GLIBC_VERSION = 1.1.2
+OMAP543X_GLIBC_VERSION = 1.1.4
OMAP543X_GLIBC_DIR = arm-OMAP543X-linux-glibc
OMAP543X_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(OMAP543X_GLIBC_DIR)
OMAP543X_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(OMAP543X_GLIBC_VERSION)/$(OMAP543X_GLIBC_DIR)-$(OMAP543X_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -643,7 +643,7 @@ OMAP543X_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_OMAP5UEVM) $(HARDWARE_DRA7XXEVM)
TOOLCHAIN_JZ47XX_GLIBC = jz47xx-glibc
JZ47XX_GLIBC_ARCH = mipsel-jz47xx-linux-gnu
-JZ47XX_GLIBC_VERSION = 1.1.2
+JZ47XX_GLIBC_VERSION = 1.1.4
JZ47XX_GLIBC_DIR = mipsel-JZ47XX-linux-glibc
JZ47XX_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(JZ47XX_GLIBC_DIR)
JZ47XX_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(JZ47XX_GLIBC_VERSION)/$(JZ47XX_GLIBC_DIR)-$(JZ47XX_GLIBC_VERSION).$(TARBALL_SUFFIX)
@@ -666,7 +666,7 @@ JZ47XX_GLIBC_HARDWARE_VARIANTS := $(HARDWARE_CI20)
TOOLCHAIN_P5600_GLIBC = p5600-glibc
P5600_GLIBC_ARCH = mipsel-p5600-linux-gnu
-P5600_GLIBC_VERSION = 1.1.2
+P5600_GLIBC_VERSION = 1.1.4
P5600_GLIBC_DIR = mipsel-P5600-linux-glibc
P5600_GLIBC_PATH = $(TOOLCHAINS_BASE_PATH)/$(P5600_GLIBC_DIR)
P5600_GLIBC_TARBALL = $(TOOLCHAINS_FTP_BASE)/$(P5600_GLIBC_VERSION)/$(P5600_GLIBC_DIR)-$(P5600_GLIBC_VERSION).$(TARBALL_SUFFIX)
diff --git a/target-setup.mk b/target-setup.mk
index 41f5199..b7c8d25 100644
--- a/target-setup.mk
+++ b/target-setup.mk
@@ -460,9 +460,9 @@ endif
PKG_CONFIG_PATH = $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig:$(TARGET_DEST_DIR)/usr/share/pkgconfig
PKG_CONFIG_LIBDIR = $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig:$(TARGET_DEST_DIR)/usr/share/pkgconfig
-ARCH_FLAGS = -m32 -march=i486 -mtune=i686
+ARCH_FLAGS = -m32 -march=i686 -mtune=i686
-TARGET32 = $(shell echo $(TARGET) | sed 's/x86_64/i486/')
+TARGET32 = $(shell echo $(TARGET) | sed 's/x86_64/i686/')
endif
endif