Updated CRIS configuration files.

diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris
index 9304c24..2a2b093 100644 (file)
--- a/extra/Configs/Config.cris
+++ b/extra/Configs/Config.cris
@@ -16,11 +16,9 @@ config ARCH_CFLAGS
 
 config ARCH_LDFLAGS
        string
-       default "-mcrislinux"
 
 config LIBGCC_CFLAGS
        string
-       default "-mlinux"
 
 
 choice

diff --git a/extra/Configs/Config.cris.default b/extra/Configs/Config.cris.default
index b73855d..cca157e 100644 (file)
--- a/extra/Configs/Config.cris.default
+++ b/extra/Configs/Config.cris.default
@@ -6,8 +6,6 @@
 # Target Architecture Features and Options
 #
 HAVE_ELF=y
-ARCH_LDFLAGS="-mcrislinux"
-LIBGCC_CFLAGS="-mlinux"
 CONFIG_CRIS=y
 UCLIBC_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
@@ -16,22 +14,29 @@ HAS_FPU=y
 WARNINGS="-Wall"
 KERNEL_SOURCE="$(AXIS_KERNEL_DIR)"
 C_SYMBOL_PREFIX=""
+HAVE_DOT_CONFIG=y
 
 #
 # General Library Settings
 #
 DOPIC=y
 HAVE_SHARED=y
+ADD_LIBGCC_FUNCTIONS=y
 BUILD_UCLIBC_LDSO=y
 # LDSO_LDD_SUPPORT is not set
+UCLIBC_CTOR_DTOR=y
+# UCLIBC_PROFILING is not set
 UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
 MALLOC_930716=y
+# UCLIBC_DYNAMIC_ATEXIT is not set
 HAS_SHADOW=y
 UCLIBC_HAS_REGEX=y
 UNIX98PTY_ONLY=y
 ASSUME_DEVPTS=y
+# UCLIBC_HAS_TM_EXTENSIONS is not set
 
 #
 # Networking Support
@@ -49,10 +54,10 @@ UCLIBC_HAS_RPC=y
 #
 # Library Installation Options
 #
-SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib"
+SHARED_LIB_LOADER_PATH="/lib"
 DEVEL_PREFIX="$(AXIS_TOP_DIR)/target/cris-axis-linux-gnuuclibc"
-SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
-DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
+SYSTEM_DEVEL_PREFIX="$(AXIS_TOP_DIR)/tools/build"
+DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/include"
 
 #
 # uClibc hacking options