From f8bc724a4d89aaf364bb1dbdb10a694b4ae35bef Mon Sep 17 00:00:00 2001 From: Eric Andersen <andersen@codepoet.org> Date: Wed, 5 Nov 2003 04:27:32 +0000 Subject: Yet more config system updates --- extra/Configs/Config.alpha | 2 ++ extra/Configs/Config.e1 | 1 + extra/Configs/Config.h8300 | 1 + extra/Configs/Config.i960 | 1 + extra/Configs/Config.in | 6 +++++- extra/Configs/Config.m68k | 1 + extra/Configs/Config.microblaze | 2 +- extra/Configs/Config.sh | 3 +++ extra/Configs/Config.sparc | 2 ++ extra/Configs/Config.v850 | 1 + 10 files changed, 18 insertions(+), 2 deletions(-) diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha index e810c6dd7..a98b8303e 100644 --- a/extra/Configs/Config.alpha +++ b/extra/Configs/Config.alpha @@ -7,6 +7,8 @@ config HAVE_ELF bool select UCLIBC_HAS_MMU select ARCH_HAS_NO_FPU + select ARCH_LITTLE_ENDIAN + select ARCH_HAS_NO_LDSO default y config TARGET_ARCH diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1 index 06b5a9206..8c1b2f2a0 100644 --- a/extra/Configs/Config.e1 +++ b/extra/Configs/Config.e1 @@ -8,6 +8,7 @@ config HAVE_ELF select ARCH_HAS_NO_MMU select ARCH_HAS_NO_FPU select ARCH_HAS_C_SYMBOL_PREFIX + select ARCH_HAS_NO_LDSO bool default n diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300 index 6e869c0a7..dce9fec5a 100644 --- a/extra/Configs/Config.h8300 +++ b/extra/Configs/Config.h8300 @@ -8,6 +8,7 @@ config HAVE_ELF select ARCH_HAS_NO_MMU select ARCH_HAS_NO_FPU select ARCH_HAS_C_SYMBOL_PREFIX + select ARCH_HAS_NO_LDSO default y config TARGET_ARCH diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960 index 3c30a1c85..045148f75 100644 --- a/extra/Configs/Config.i960 +++ b/extra/Configs/Config.i960 @@ -10,6 +10,7 @@ config HAVE_ELF bool select ARCH_HAS_NO_MMU select ARCH_HAS_NO_FPU + select ARCH_HAS_NO_LDSO default n config ARCH_CFLAGS diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 83e8b655b..a652b148c 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -144,9 +144,13 @@ config HAVE_SHARED answer Y here. If you only want to build uClibc as a static library, then answer N. +config ARCH_HAS_NO_LDSO + bool + default n + config BUILD_UCLIBC_LDSO bool "Compile native shared library loader" - depends on HAVE_SHARED + depends on HAVE_SHARED && !ARCH_HAS_NO_LDSO default y help uClibc has a native shared library loader for some architectures. diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k index f105b31da..8bcfa4611 100644 --- a/extra/Configs/Config.m68k +++ b/extra/Configs/Config.m68k @@ -11,6 +11,7 @@ config HAVE_ELF select ARCH_HAS_NO_MMU select ARCH_HAS_NO_FPU select ARCH_BIG_ENDIAN + select ARCH_HAS_NO_LDSO default y config ARCH_CFLAGS diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze index 957d39698..b0fd16f86 100644 --- a/extra/Configs/Config.microblaze +++ b/extra/Configs/Config.microblaze @@ -11,7 +11,7 @@ config HAVE_ELF select ARCH_HAS_NO_MMU select ARCH_HAS_NO_FPU select ARCH_HAS_C_SYMBOL_PREFIX - select HAVE_NO_PIC + select ARCH_HAS_NO_LDSO default y config ARCH_CFLAGS diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh index 59f4e862e..4277e920d 100644 --- a/extra/Configs/Config.sh +++ b/extra/Configs/Config.sh @@ -46,11 +46,13 @@ choice config CONFIG_SH2 select ARCH_HAS_NO_FPU select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_LDSO bool "SH2" config CONFIG_SH3 select HAS_FPU select UCLIBC_HAS_MMU + select ARCH_HAS_NO_LDSO bool "SH3" config CONFIG_SH4 @@ -61,6 +63,7 @@ config CONFIG_SH4 config CONFIG_SH5 select HAS_FPU select UCLIBC_HAS_MMU + select ARCH_HAS_NO_LDSO bool "SH5" endchoice diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index 42748691a..cc5530c06 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -8,6 +8,8 @@ config TARGET_ARCH config HAVE_ELF bool + select ARCH_BIG_ENDIAN + select ARCH_HAS_NO_LDSO default y config ARCH_CFLAGS diff --git a/extra/Configs/Config.v850 b/extra/Configs/Config.v850 index 11f48d088..7d8389078 100644 --- a/extra/Configs/Config.v850 +++ b/extra/Configs/Config.v850 @@ -12,6 +12,7 @@ config HAVE_ELF select ARCH_HAS_NO_MMU select ARCH_HAS_C_SYMBOL_PREFIX select HAVE_NO_PIC + select ARCH_HAS_NO_LDSO default y config ARCH_CFLAGS -- cgit v1.2.3