diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/config | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 42e9a65ef..32884f778 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -160,7 +160,7 @@ config ADK_TARGET_CFLAGS default "-march=pentium-m" if ADK_CPU_PENTIUM_M default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-mcpu=v9" if ADK_CPU_SPARC_V9 + default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 default "-march=loongson2f" if ADK_CPU_LOONGSON2F default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5 @@ -203,7 +203,6 @@ config ADK_TARGET_LIB_UCLIBC depends on \ !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \ !ADK_LINUX_SPARC64 && \ - !ADK_LINUX_SPARC && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE help |