toolchain: Add support for Sourcery Codebench Standard

With the Sourcery Codebench standard edition, the sysroot returned point to a non existant directory if no CFLAGS are specified.

toolchain/toolchain-external/toolchain-external.mk +0 -0

@@ -443,6 +443,18 @@ define toolchain_find_libdir
 $$(echo -n $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:')
 endef
 

Romain, All,

On 2014-11-14 00:03 +0100, Romain Naour spake thusly:

Quoted 2 lines

With the Sourcery Codebench standard edition, the sysroot returned point to a non existant directory if no CFLAGS are specified.

I finally get to review this. Sorry for the long delay... :-(

[--SNIP--]

toolchain/toolchain-external/toolchain-external.mk

Quoted 13 lines

Signed-off-by Romain Naour <[email protected]>

---
v3: no change
v2: new patch

---
 toolchain/toolchain-external/toolchain-external.mk | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

toolchain/toolchain-external/toolchain-external.mk +0 -0

index da3718c..109af21 100644

[--SNIP--]

Quoted 4 lines

toolchain/toolchain-external/toolchain-external.mk +0 -0

@@ -443,6 +443,18 @@ define toolchain_find_libdir
 $$(echo -n $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?)/([^/]*/)?libc.a:\2:')
 endef
 

toolchain/toolchain-external/toolchain-external.mk define toolchain_find_libdir · line 455

Quoted 10 lines

toolchain/toolchain-external/toolchain-external.mk +10 -0

+# Returns the main sysroot location for the given compiler + flags
+# First, try to find the sysroot without flags.
+# If the sysroot path is empty/bogus then use the arch sysroot instead.
+define toolchain_find_sysroot
+$$(main_sysroot="$(call toolchain_find_arch_sysroot,$(1))"; \
+if ! test -d $${main_sysroot}; then \
+	echo -n $(call toolchain_find_arch_sysroot,$(1), $(2)) ; \
+else \
+	echo -n $${main_sysroot}; \
+fi)

Two comments:
- we prefer positive logic,
- we usually do not prepend a space before arguments to make macros.

So:

    if test -d $${main_sysroot}; then \
        echo -n $${main_sysroot}; \
    else
        echo -n $(call toolchain_find_arch_sysroot,$(1),$(2)) ; \
    fi

toolchain/toolchain-external/toolchain-external.mk endef · line 465

Quoted 12 lines

toolchain/toolchain-external/toolchain-external.mk +3 -1

+endef
+
 # Checks for an already installed toolchain: check the toolchain
 # location, check that it supports sysroot, and then verify that it
 # matches the configuration provided in Buildroot: ABI, C++ support,

@@ -450,13 +462,13 @@ endef
 define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
 	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
 	$(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC))
-	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
+	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC), $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \

Ditto: no space in front of a macro argument.

toolchain/toolchain-external/toolchain-external.mk endef · line 471

Quoted 8 lines

toolchain/toolchain-external/toolchain-external.mk +1 -1

 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
 	$(call check_kernel_headers_version,\
-		$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC)),\
+		$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC), $(TOOLCHAIN_EXTERNAL_CFLAGS)),\

Ditto: no space in front of a macro argument.

Quoted 7 lines

toolchain/toolchain-external/toolchain-external.mk +0 -0

 		$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \
 	if test "$(BR2_arm)" = "y" ; then \
 		$(call check_arm_abi,\

@@ -539,12 +551,12 @@ endif
 #                       to the target filesystem.
 

toolchain/toolchain-external/toolchain-external.mk endif · line 554

Quoted 3 lines

toolchain/toolchain-external/toolchain-external.mk +1 -1

 define TOOLCHAIN_EXTERNAL_INSTALL_CORE
-	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
+	$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC), $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \

Ditto: no space in front of a macro argument.

toolchain/toolchain-external/toolchain-external.mk endif · line 559

Quoted 7 lines

toolchain/toolchain-external/toolchain-external.mk +1 -1

 	if test -z "$${SYSROOT_DIR}" ; then \
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
-	ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	ARCH_SYSROOT_DIR="$(call toolchain_find_arch_sysroot,$(TOOLCHAIN_EXTERNAL_CC), $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \

Ditto: no space in front of a macro argument.

toolchain/toolchain-external/toolchain-external.mk ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) · line 605

Quoted 10 lines

toolchain/toolchain-external/toolchain-external.mk +1 -1

 	ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
 	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \

@@ -590,7 +602,7 @@ ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y)
 define TOOLCHAIN_EXTERNAL_INSTALL_BFIN_FDPIC
 	$(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
 	FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
-	FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	FDPIC_SYSROOT_DIR="$(call toolchain_find_arch_sysroot,$${FDPIC_EXTERNAL_CC}, $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \

Ditto: no space in front of a macro argument.

Otherwise, looks OK.

Regards,
Yann E. MORIN.

The part of copy_toolchain_sysroot function that create the symlink in the staging directory will be used in two different place in the following patch. So factorize this part in a new function called toolchain_create_arch_sysroot_symlink.

Signed-off-by Romain Naour <[email protected]>

---
v3: no change
v2: new patch

---
 toolchain/helpers.mk | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

toolchain/helpers.mk +0 -0

index 3121da4..7d7af5f 100644

toolchain/helpers.mk +9 -0

+	mkdir -p `dirname $(STAGING_DIR)/$${ARCH_SUBDIR}` ; \
+	relpath="./" ; \
+	nbslashs=`echo -n $${ARCH_SUBDIR} | sed 's%[^/]%%g' | wc -c` ; \
+	for slash in `seq 1 $${nbslashs}` ; do \
+		relpath=$${relpath}"../" ; \
+	done ; \
+	ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
+	echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}"
+
 #
 # Copy the full external toolchain sysroot directory to the staging
 # dir. The operation of this function is rendered a little bit

@@ -148,14 +162,7 @@ copy_toolchain_sysroot = \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
 			cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \

toolchain/helpers.mk +0 -0

 	fi ; \
 	if test -n "$${SUPPORT_LIB_DIR}" ; then \
 		cp -a $${SUPPORT_LIB_DIR}/* $(STAGING_DIR)/lib/ ; \

Signature · 1 line

1.9.3

Romain, All,

On 2014-11-14 00:03 +0100, Romain Naour spake thusly:

Quoted 19 lines

The part of copy_toolchain_sysroot function that create the symlink in the staging directory will be used in two different place in the following patch. So factorize this part in a new function called toolchain_create_arch_sysroot_symlink.

Signed-off-by Romain Naour <[email protected]>

---
v3: no change
v2: new patch

---
 toolchain/helpers.mk | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

toolchain/helpers.mk +0 -0

index 3121da4..7d7af5f 100644

toolchain/helpers.mk copy_toolchain_lib_root = \ · line 90

Quoted 8 lines

toolchain/helpers.mk +5 -0

@@ -83,6 +83,20 @@ copy_toolchain_lib_root = \
 \
 	echo -n
 
+# Calculate the symlink's depth by counting the number of slashs.
+# Then create the symlink to arch sysroot.
+# $1: arch specific subdirectory in the sysroot
+toolchain_create_arch_sysroot_symlink = \
+	ARCH_SUBDIR="$(strip $1)"; \

I think I have some problems parsing that...

- $(strip $1) is makefile syntax,
- $1 is the first argument to the macro,
- $1 is set to literally $${ARCH_SUBDIR} at the time of the call.

So, you're calling $(strip) which is evaluated by make on a shell variable, set in the shell to something that is already $(strip)ed.

I think this assignement should just go away.

Unless I'm too tired and I missed something...

Quoted 16 lines

toolchain/helpers.mk +9 -0

+	mkdir -p `dirname $(STAGING_DIR)/$${ARCH_SUBDIR}` ; \
+	relpath="./" ; \
+	nbslashs=`echo -n $${ARCH_SUBDIR} | sed 's%[^/]%%g' | wc -c` ; \
+	for slash in `seq 1 $${nbslashs}` ; do \
+		relpath=$${relpath}"../" ; \
+	done ; \
+	ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
+	echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}"
+
 #
 # Copy the full external toolchain sysroot directory to the staging
 # dir. The operation of this function is rendered a little bit

@@ -148,14 +162,7 @@ copy_toolchain_sysroot = \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
 			cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \

toolchain/helpers.mk copy_toolchain_sysroot = \ · line 165

Quoted 10 lines

toolchain/helpers.mk +1 -8

 		fi ; \
-		mkdir -p `dirname $(STAGING_DIR)/$${ARCH_SUBDIR}` ; \
-		relpath="./" ; \
-		nbslashs=`echo -n $${ARCH_SUBDIR} | sed 's%[^/]%%g' | wc -c` ; \
-		for slash in `seq 1 $${nbslashs}` ; do \
-			relpath=$${relpath}"../" ; \
-		done ; \
-		ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
-		echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}" ; \
+		$(call toolchain_create_arch_sysroot_symlink,$${ARCH_SUBDIR}) ; \

Here you are doing the call with something that is supposed to be a shell variable.

Care to review this part, and provide an explanation of what I missed?

Regards,
Yann E. MORIN.

Quoted 6 lines

toolchain/helpers.mk +0 -0

 	fi ; \
 	if test -n "$${SUPPORT_LIB_DIR}" ; then \
 		cp -a $${SUPPORT_LIB_DIR}/* $(STAGING_DIR)/lib/ ; \

Signature · 1 line

1.9.3

When copying external toolchain sysroot to staging, we need to create the symbolic link that matches the name of the subdirectory for the architecture variant in the original sysroot. (ex: sgxx-glibc for CodeSourcery Standard edition)
To do that, SYSROOT_DIR must be different than ARCH_SYSROOT_DIR.

In the case where ARCH_SYSROOT_DIR is used as SYSROOT_DIR we need to check again the path to the main sysroot directory. if SYSROOT_DIR returned by toolchain_find_sysroot without TOOLCHAIN_EXTERNAL_CFLAGS is empty/invalid, then compute the common part between SYSROOT_DIR and ARCH_SYSROOT_DIR returned by toolchain_print_sysroot in order to get the "base sysroot". This "base sysroot" is used as SYSROOT_DIR to create the symlink in the staging directory.

Signed-off-by Romain Naour <[email protected]>

---
v3: Rework the end of string detection (Yann E. Morin)
Handle a second argument in toolchain_print_sysroot Detect if the main sysroot is the same as arch sysroot, then return the main_sysroot

v2: new patch

---
 toolchain/helpers.mk | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

toolchain/helpers.mk +0 -0

index 7d7af5f..dd7bcac 100644

toolchain/helpers.mk +28 -0

+if [ "$${main_sysroot_path}" = "$${arch_sysroot_path}" ]; then \
+	common_sysroot_path="$${main_sysroot_path}"; \
+else \
+	index=0 ; \
+	while [ "$${main_sysroot_path:$${index}:1}" = "$${arch_sysroot_path:$${index}:1}" ] ; do \
+		if [ "$${main_sysroot_path:$${index}:1}" = "/" ]; then \
+			common_sysroot_path="$${main_sysroot_path:0:$${index}+1}"; \
+		fi ; \
+		if [ $${index} -gt $${#main_sysroot_path} ] || [ $${index} -gt $${#arch_sysroot_path} ]; then \
+			break; \
+		fi ; \
+		: $$((index++)) ; \
+	done ; \
+fi ; \
+echo -n $${common_sysroot_path})
+endef
+
 #
 # Copy the full external toolchain sysroot directory to the staging
 # dir. The operation of this function is rendered a little bit

@@ -130,6 +160,17 @@ toolchain_create_arch_sysroot_symlink = \
 #    non-default architecture variant is used. Without this, the
 #    compiler fails to find libraries and headers.
 #
+# Some toolchain (i.e CodeSourcery Standard edition) doesn't have
+# a main sysroot directory and use the arch sysroot as fallback.
+# In this case we need to check again the path to the main sysroot
+# directory when SYSROOT_DIR == ARCH_SYSROOT_DIR.
+# if SYSROOT_DIR returned by toolchain_find_sysroot without
+# TOOLCHAIN_EXTERNAL_CFLAGS point to valid directory.
+# If SYSROOT_DIR is empty/invalid, compute the common part between
+# SYSROOT_DIR and ARCH_SYSROOT_DIR returned by toolchain_print_sysroot
+# in order to get the "base sysroot". This "base sysroot" is used
+# to create the symlink in the staging directory.
+#
 # Some toolchains (i.e Linaro binary toolchains) store support
 # libraries (libstdc++, libgcc_s) outside of the sysroot, so we simply
 # copy all the libraries from the "support lib directory" into our