diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-17 17:58:15 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-17 17:58:15 +0200 |
| commit | 63d872f3a7641da98fb96f368dfe0c05cef953c7 (patch) | |
| tree | 090355841930c02b8193902e716c643c8383d8dd /target | |
| parent | 84d0570146b7bc7bd85de24e3922cdc22ac141f8 (diff) | |
| parent | f7397b4ca4094a7101db10708cd0023a0b2506e8 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 7 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips | 1 | ||||
| -rw-r--r-- | target/ppc/target.mk | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index fc5c8d94a..a14ef5b7a 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -564,9 +564,6 @@ config ADK_musl config ADK_libc boolean -config ADK_TARGET_LIB_STATIC_LIBGCC - boolean - config ADK_TARGET_LIBC string default "uclibc" if ADK_uclibc @@ -588,7 +585,6 @@ config ADK_TARGET_LIB_UCLIBC !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE - select ADK_TARGET_LIB_STATIC_LIBGCC help http://uclibc.org @@ -609,7 +605,6 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 - select ADK_TARGET_LIB_STATIC_LIBGCC help http://www.eglibc.org @@ -630,7 +625,6 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_SPARC64 || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 - select ADK_TARGET_LIB_STATIC_LIBGCC help http://www.gnu.org/libc @@ -652,7 +646,6 @@ config ADK_TARGET_LIB_LIBC prompt "Native C library" boolean select ADK_libc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on ADK_LINUX_NATIVE endchoice diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 59d31d38c..d806d9c78 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -5,6 +5,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS select ADK_qemu_mips select ADK_KERNEL_MIPS_MALTA select ADK_KERNEL_CPU_BIG_ENDIAN + select ADK_KERNEL_PAGE_SIZE_4KB select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT diff --git a/target/ppc/target.mk b/target/ppc/target.mk index 3654b0d35..bd6624fe7 100644 --- a/target/ppc/target.mk +++ b/target/ppc/target.mk @@ -2,4 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk ARCH:= powerpc CPU_ARCH:= ppc TARGET_OPTIMIZATION:= -Os -pipe -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) +TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -Wl,--secure-plt |