Merge pull request #1112 from stilor/moxie-fix

Moxie fix
crosstool-ng · Dec 8, 2018 · 1f65837 · 1f65837
2 parents 2a4ea32 + 7a7a20b
commit 1f65837
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/config/libc/moxiebox.in b/config/libc/moxiebox.in
@@ -4,6 +4,7 @@
 # autoconfig and automake.
 
 ## depends on ARCH_MOXIE
+## depends on ARCH_LE
 ## depends on BARE_METAL
 ## select LIBC_NEWLIB_SHOW
 ## select LIBC_SUPPORT_THREADS_NONE

diff --git a/config/target.in b/config/target.in
@@ -142,10 +142,12 @@ config ARCH_LE
 config ARCH_BE_LE
     bool
     prompt "Both, default big endian"
+    depends on ARCH_SUPPORTS_BOTH_ENDIAN
 
 config ARCH_LE_BE
     bool
     prompt "Both, default little endian"
+    depends on ARCH_SUPPORTS_BOTH_ENDIAN
 
 endchoice
 

diff --git a/samples/moxie-unknown-moxiebox/crosstool.config b/samples/moxie-unknown-moxiebox/crosstool.config
@@ -1,5 +1,6 @@
 CT_EXPERIMENTAL=y
 CT_ARCH_MOXIE=y
+CT_ARCH_LE=y
 CT_DEBUG_GDB=y
 CT_GDB_CROSS_SIM=y
 # CT_GDB_CROSS_PYTHON is not set

diff --git a/scripts/build/arch/moxie.sh b/scripts/build/arch/moxie.sh
@@ -3,6 +3,11 @@
 # No arch-specific overrides yet
 CT_DoArchTupleValues()
 {
+    case "${CT_ARCH_ENDIAN}" in
+        big)    CT_ARCH_ENDIAN_CFLAG=-meb;;
+        little) CT_ARCH_ENDIAN_CFLAG=-mel;;
+    esac
+
     case "${CT_LIBC}" in
     moxiebox)
         CT_TARGET_SYS=moxiebox

diff --git a/scripts/build/libc/moxiebox.sh b/scripts/build/libc/moxiebox.sh
@@ -23,14 +23,6 @@ moxiebox_main()
 {
     newlib_main
 
-    # newlib installs the linker script, moxiebox.ld, to the
-    # PREFIX/moxie-unknown-moxiebox/lib, but ld searches PREFIX/lib when
-    # configured for that target. ld does find scripts in PREFIX/TARGET/lib
-    # for other targets, so this seems to be moxie architecture's quirk.
-    # Move it to PREFIX/lib.
-    # TBD CT_DoExecLog ALL mv -v "${CT_SYSROOT_DIR}/lib/"*.ld "${CT_PREFIX_DIR}/lib"
-    # TBD what about moxie-*-elf? Does it need the same?
-
     CT_DoStep INFO "Installing moxiebox runtime and VM"
 
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-moxiebox"