Commit b1a66dd6 authored by Paul Mundt's avatar Paul Mundt
Browse files

Update for ARCH_WANTS_{LITTLE,BIG}_ENDIAN and HAS_FPU -> UCLIBC_HAS_FPU. 

Also update the uClibc config for some of the recent target and CPU
variant additions.
parent d56e2b34

toolchain/uClibc/uClibc.config

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
# TARGET_hppa is not set

# TARGET_i386 is not set

# TARGET_i960 is not set

# TARGET_ia64 is not set

# TARGET_m68k is not set

# TARGET_microblaze is not set

# TARGET_mips is not set
@@ -21,6 +22,7 @@ 
# TARGET_sh64 is not set

# TARGET_sparc is not set

# TARGET_v850 is not set

# TARGET_vax is not set

# TARGET_x86_64 is not set



#
@@ -30,9 +32,11 @@ HAVE_ELF=y 
TARGET_ARCH="none"

# ARCH_LITTLE_ENDIAN is not set

# ARCH_BIG_ENDIAN is not set

# ARCH_WANTS_LITTLE_ENDIAN is not set

# ARCH_WANTS_BIG_ENDIAN is not set

# ARCH_HAS_NO_MMU is not set

UCLIBC_HAS_FLOATS=y

HAS_FPU=y

UCLIBC_HAS_FPU=y

DO_C99_MATH=y

WARNINGS="-Wall"

KERNEL_SOURCE="/usr/src/linux"
@@ -40,6 +44,7 @@ HAVE_DOT_CONFIG=y 
# CONFIG_GENERIC_ARM is not set

# CONFIG_ARM610 is not set

# CONFIG_ARM710 is not set

# CONFIG_ARM7TDMI is not set

# CONFIG_ARM720T is not set

# CONFIG_ARM920T is not set

# CONFIG_ARM922T is not set

toolchain/uClibc/uClibc.config-locale

+6 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
# TARGET_hppa is not set

# TARGET_i386 is not set

# TARGET_i960 is not set

# TARGET_ia64 is not set

# TARGET_m68k is not set

# TARGET_microblaze is not set

# TARGET_mips is not set
@@ -21,6 +22,7 @@ 
# TARGET_sh64 is not set

# TARGET_sparc is not set

# TARGET_v850 is not set

# TARGET_vax is not set

# TARGET_x86_64 is not set



#
@@ -30,9 +32,11 @@ HAVE_ELF=y 
TARGET_ARCH="none"

# ARCH_LITTLE_ENDIAN is not set

# ARCH_BIG_ENDIAN is not set

# ARCH_WANTS_LITTLE_ENDIAN is not set

# ARCH_WANTS_BIG_ENDIAN is not set

# ARCH_HAS_NO_MMU is not set

UCLIBC_HAS_FLOATS=y

HAS_FPU=y

UCLIBC_HAS_FPU=y

DO_C99_MATH=y

WARNINGS="-Wall"

KERNEL_SOURCE="/usr/src/linux"
@@ -40,6 +44,7 @@ HAVE_DOT_CONFIG=y 
# CONFIG_GENERIC_ARM is not set

# CONFIG_ARM610 is not set

# CONFIG_ARM710 is not set

# CONFIG_ARM7TDMI is not set

# CONFIG_ARM720T is not set

# CONFIG_ARM920T is not set

# CONFIG_ARM922T is not set

toolchain/uClibc/uclibc.mk

+5 −1
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ ifneq ($(UCLIBC_TARGET_ENDIAN),) 
	$(SED) '/^# ARCH_$(UCLIBC_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=y,g}' \

		-e '/^# ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=n,g}' \

		$(UCLIBC_DIR)/.config



	$(SED) '/^# ARCH_WANTS_$(UCLIBC_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=y,g}' \

		-e '/^# ARCH_WANTS_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN /{s,# ,,;s, is not set,=n,g}' \

		$(UCLIBC_DIR)/.config

endif

ifeq ($(BR2_LARGEFILE),y)

	$(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config
@@ -94,7 +98,7 @@ else 
endif

	$(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config

ifeq ($(BR2_SOFT_FLOAT),y)

	$(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config

	$(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config

endif

ifneq ($(BR2_PTHREADS_NONE),y)

	$(SED) 's,# UCLIBC_HAS_THREADS is not set,UCLIBC_HAS_THREADS=y,g' $(UCLIBC_DIR)/.config