Commit aa86b52c authored by Spenser Gilliland's avatar Spenser Gilliland Committed by Peter Korsgaard
Browse files

ext-toolchain-wrapper: fix uboot/linux with hardfp 



The linux kernel and uboot specify -msoft-float in order to prevent floating
point code from being generated.  This causes a conflict when -mfloat-abi=hard
or -mfloat-abi options are specified in the wrapper. This patch removes the
-mfloat-abi option from the options generated by the wrapper only when
-msoft-float, -mhard-float or -mfloat-abi are specified by the user.

[Peter: fix !BR_FLOAT_ABI case, simplify]
Signed-off-by: default avatarSpenser Gilliland <spenser@gillilanding.com>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 27c93703

toolchain/toolchain-external/ext-toolchain-wrapper.c

+25 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * (C) 2011 Peter Korsgaard <jacmet@sunsite.dk>

 * (C) 2011 Daniel Nyström <daniel.nystrom@timeterminal.se>

 * (C) 2012 Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 * (C) 2013 Spenser Gilliland <spenser@gillilanding.com>

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any
@@ -23,6 +24,15 @@ 
static char path[PATH_MAX];

static char sysroot[PATH_MAX];



/**

 * GCC errors out with certain combinations of arguments (examples are

 * -mabi-float={hard|soft} and -m{little|big}-endian), so we have to ensure

 * that we only pass the predefined one to the real compiler if the inverse

 * option isn't in the argument list.

 * This specifies the worst case number of extra arguments we might pass

 */

#define EXCLUSIVE_ARGS	1



static char *predef_args[] = {

	path,

	"--sysroot", sysroot,
@@ -38,9 +48,6 @@ static char *predef_args[] = { 
#ifdef BR_ABI

	"-mabi=" BR_ABI,

#endif

#ifdef BR_FLOAT_ABI

	"-mfloat-abi=" BR_FLOAT_ABI,

#endif

#ifdef BR_FPU

	"-mfpu=" BR_FPU,

#endif
@@ -119,7 +126,8 @@ int main(int argc, char **argv) 
		return 3;

	}



	cur = args = malloc(sizeof(predef_args) + (sizeof(char *) * argc));

	cur = args = malloc(sizeof(predef_args) +

			    (sizeof(char *) * (argc + EXCLUSIVE_ARGS)));

	if (args == NULL) {

		perror(__FILE__ ": malloc");

		return 2;
@@ -129,6 +137,19 @@ int main(int argc, char **argv) 
	memcpy(cur, predef_args, sizeof(predef_args));

	cur += sizeof(predef_args) / sizeof(predef_args[0]);



#ifdef BR_FLOAT_ABI

	/* add float abi if not overridden in args */

	for (i = 1; i < argc; i++) {

		if (!strncmp(argv[i], "-mfloat-abi=", strlen("-mfloat-abi=")) ||

		    !strcmp(argv[i], "-msoft-float") ||

		    !strcmp(argv[i], "-mhard-float"))

			break;

	}



	if (i == argc)

		*cur++ = "-mfloat-abi=" BR_FLOAT_ABI;

#endif



	/* append forward args */

	memcpy(cur, &argv[1], sizeof(char *) * (argc - 1));

	cur += argc - 1;