diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-19 19:53:30 +0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-19 19:53:30 +0400 |
commit | 63c45c7c049f978b0c155e7f00504d3d513b4070 (patch) | |
tree | d0614b3a6f7702d610b07f1f3c67677ca2435403 /recipes | |
parent | b743ae7f047b7a4dbd2c38c7c8cd3e3a8a792580 (diff) | |
download | openembedded-63c45c7c049f978b0c155e7f00504d3d513b4070.tar.gz |
uclibc: rework configuration for bfin
Use common uclibc.distro instead of blackfin-specific ones, reduce bfin-related uClibc.machine
to being really machine-only. Instead of storing huge uClibc.distro for blackfin, patch merged
config after concatenation.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.config | 0 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.distro | 0 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.machine | 136 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30/bfin/uClibc.config | 0 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30/bfin/uClibc.distro | 0 | ||||
-rw-r--r-- | recipes/uclibc/uclibc-0.9.30/bfin/uClibc.machine | 136 | ||||
-rw-r--r-- | recipes/uclibc/uclibc.inc | 11 |
7 files changed, 13 insertions, 270 deletions
diff --git a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.config b/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.config deleted file mode 100644 index e69de29bb2..0000000000 --- a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.config +++ /dev/null diff --git a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.distro b/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.distro deleted file mode 100644 index e69de29bb2..0000000000 --- a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.distro +++ /dev/null diff --git a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.machine b/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.machine index 33a294f009..2944534f7d 100644 --- a/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.machine +++ b/recipes/uclibc/uclibc-0.9.30.1/bfin/uClibc.machine @@ -49,144 +49,10 @@ ARCH_HAS_NO_MMU=y # UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y -# DO_C99_MATH is not set +DO_C99_MATH=y KERNEL_HEADERS="/usr/include" # UCLIBC_UCLINUX_BROKEN_MUNMAP is not set EXCLUDE_BRK=y HAVE_DOT_CONFIG=y # -# General Library Settings -# -# HAVE_NO_PIC is not set -DOPIC=y -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -UCLIBC_STATIC_LDCONFIG=y -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_SIMPLE is not set -# MALLOC_STANDARD is not set -# MALLOC_GLIBC_COMPAT is not set -UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -# UCLIBC_SUSV3_LEGACY is not set -# UCLIBC_SUSV3_LEGACY_MACROS is not set -UCLIBC_HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set -# UCLIBC_USE_NETLINK is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -UCLIBC_HAS_CTYPE_UNSAFE=y -# UCLIBC_HAS_CTYPE_CHECKED is not set -# UCLIBC_HAS_CTYPE_ENFORCED is not set -# UCLIBC_HAS_WCHAR is not set -# UCLIBC_HAS_LOCALE is not set -# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set -# USE_OLD_VFPRINTF is not set -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -UCLIBC_HAS_STDIO_BUFSIZ_4096=y -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set -# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set -# UCLIBC_HAS_PRINTF_M_SPEC is not set -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y -UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y -# UCLIBC_HAS_WORDEXP is not set -# UCLIBC_HAS_FTW is not set -UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib" -RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/" -MULTILIB="" - -# -# Security options -# -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -# UCLIBC_BUILD_NOW is not set -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.config b/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.config deleted file mode 100644 index e69de29bb2..0000000000 --- a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.config +++ /dev/null diff --git a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.distro b/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.distro deleted file mode 100644 index e69de29bb2..0000000000 --- a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.distro +++ /dev/null diff --git a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.machine b/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.machine index 33a294f009..2944534f7d 100644 --- a/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.machine +++ b/recipes/uclibc/uclibc-0.9.30/bfin/uClibc.machine @@ -49,144 +49,10 @@ ARCH_HAS_NO_MMU=y # UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y -# DO_C99_MATH is not set +DO_C99_MATH=y KERNEL_HEADERS="/usr/include" # UCLIBC_UCLINUX_BROKEN_MUNMAP is not set EXCLUDE_BRK=y HAVE_DOT_CONFIG=y # -# General Library Settings -# -# HAVE_NO_PIC is not set -DOPIC=y -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -UCLIBC_STATIC_LDCONFIG=y -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_SIMPLE is not set -# MALLOC_STANDARD is not set -# MALLOC_GLIBC_COMPAT is not set -UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -# UCLIBC_SUSV3_LEGACY is not set -# UCLIBC_SUSV3_LEGACY_MACROS is not set -UCLIBC_HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set -# UCLIBC_USE_NETLINK is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -UCLIBC_HAS_CTYPE_UNSAFE=y -# UCLIBC_HAS_CTYPE_CHECKED is not set -# UCLIBC_HAS_CTYPE_ENFORCED is not set -# UCLIBC_HAS_WCHAR is not set -# UCLIBC_HAS_LOCALE is not set -# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set -# USE_OLD_VFPRINTF is not set -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -UCLIBC_HAS_STDIO_BUFSIZ_4096=y -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set -# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set -# UCLIBC_HAS_PRINTF_M_SPEC is not set -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y -UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y -# UCLIBC_HAS_WORDEXP is not set -# UCLIBC_HAS_FTW is not set -UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib" -RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/" -MULTILIB="" - -# -# Security options -# -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -# UCLIBC_BUILD_NOW is not set -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 3c723664d3..3769c73c52 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -136,6 +136,17 @@ do_configure() { cat ${WORKDIR}/uClibc.config >>${S}/merged.config fi cp ${S}/merged.config ${S}/.config + if [ "${TARGET_ARCH}" = "bfin" ] + then + sed -e '/DOPIC/d' -e '/MALLOC/d' -e '/UCLIBC_STATIC_LDCONFIG/d' -e '/FORCE_SHAREABLE/d' -e '/WORDEXP/d' -i ${S}/.config + echo "DOPIC=y" >> ${S}/.config + echo "UCLIBC_STATIC_LDCONFIG=y" >> ${S}/.config + echo "MALLOC=y" >> ${S}/.config + grep "MALLOC_GLIBC_COMPAT" ${S}/merged.config >> ${S}/.config + echo "FORCE_SHAREABLE_TEXT_SEGMENTS=y" >> ${S}/.config + echo "# UCLIBC_HAS_WORDEXP is not defined" >> ${S}/.config + fi + # Mangle the resulting .config depending on OE variables perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak |