Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 12 years ago
parent
commit
33fa59cbaf
3 changed files with 11 additions and 4 deletions
  1. 0 3
      package/uclibc/Makefile
  2. 7 1
      target/linux/config/Config.in.debug
  3. 4 0
      toolchain/Makefile

+ 0 - 3
package/uclibc/Makefile

@@ -30,9 +30,6 @@ do-install:
 	test -z $(ADK_RUNTIME_TIMEZONE) || \
 	    grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
 	    cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
-	$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
-endif
 	$(CP) $(STAGING_TARGET_DIR)/lib/libc.so.* $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)
 	$(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \
 		$(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH)

+ 7 - 1
target/linux/config/Config.in.debug

@@ -59,12 +59,18 @@ config ADK_KERNEL_MAGIC_SYSRQ
 config ADK_KERNEL_DEBUG_FS
 	prompt "Debug Filesystem"
 	boolean
-	default y
+	default n
 	help
 	  debugfs is a virtual file system that kernel developers use to put
 	  debugging files into.  Enable this option to be able to read and
 	  write to these files.
 
+config ADK_KERNEL_DEBUG_INFO
+	prompt "Debug info"
+	boolean
+	default n
+	help
+
 config ADK_KERNEL_DEBUG_WITH_KGDB
 	prompt "Enable remote kernel debugging using KGDB"
 	boolean

+ 4 - 0
toolchain/Makefile

@@ -49,7 +49,11 @@ endif
 gcc-configure: $(LIBC)-prepare
 $(LIBC)-compile: gcc-configure
 gcc-compile: $(LIBC)-install
+ifeq ($(ADK_TOOLCHAIN_GDB),y)
+$(LIBC)-fixup: gdb-install
+else
 $(LIBC)-fixup: gcc-install
+endif
 
 $(STAGING_HOST_DIR):
 	@mkdir -p $(STAGING_HOST_DIR)/lib