From: Rich Felker Date: Fri, 24 Apr 2015 16:09:01 +0000 (-0400) Subject: fix ldso name for sh-nofpu subarch X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1fb0878ebc037ee2ad9e31e5873b6c7f95b22c1c;p=android-x86%2Fexternal-musl-libc.git fix ldso name for sh-nofpu subarch previously it was using the same name as the default ABI with hard float (floating point args and return value in registers). the test __SH_FPU_ANY__ || __SH4__ matches what's used in the configure script already, and seems correct under casual review against gcc's config/sh.h, but may need tweaks. the logic for predefined macros for sh, and what they all mean, is very complex. eventually this should be documented in comments here. configure already rejects "half-hard" configurations on sh where double=float since these do not conform to Annex F and are not suitable for musl, so these do not need to be considered here. --- diff --git a/arch/sh/reloc.h b/arch/sh/reloc.h index 61192ffe..77da6508 100644 --- a/arch/sh/reloc.h +++ b/arch/sh/reloc.h @@ -6,7 +6,13 @@ #define ENDIAN_SUFFIX "" #endif -#define LDSO_ARCH "sh" ENDIAN_SUFFIX +#if __SH_FPU_ANY__ || __SH4__ +#define FP_SUFFIX "" +#else +#define FP_SUFFIX "-nofpu" +#endif + +#define LDSO_ARCH "sh" ENDIAN_SUFFIX FP_SUFFIX #define TPOFF_K 8