Commit ce82ff05 authored by Yuri Tikhonov's avatar Yuri Tikhonov Committed by Wolfgang Denk

FPU POST: fix warnings when building with 2.18 binutils

When compile u-boot with the 2.18 binutils the following
warning messages for each object file in post/lib_ppc/fpu/ is
produced at the linking stage:

post/libpost.a(acc1.o) uses hard float, u-boot uses soft-float
...

This is because of the fact that, in general, the soft-float and
hard-float ABIs are incompatible; the 2.18 binutils do checking
of the Tag_GNU_Power_ABI_FP attribute of the files to be linked, and
produce the worning like above if these are not compatible.

The incompatibility of ABIs is concerned only the float values:
e.g. the soft-float ABI assumes the float argument passing in the
pair of rX registers, and the hard-float ABI assumes passing of
the float argument in the fX register. When we don't pass the float
arguments between the functions compiled with different floatness,
then such an application will work correctly.
This is the case for the FPU POST: u-boot (compiled with soft-float)
doesn't pass to (and doesn't get from) the FPU POST functions any
floats; there are no functions exported from the post/lib_ppc/fpu/
objects which would work with float parameters/returns too. So, we
can reassure the linker not to worry about the difference in ABI
attributes of linking files just by setting the 'soft-float'
attribute for the objects in post/lib_ppc/fpu. And this patch does
this.

Also, to avoid passing both soft- and hard-float options in CFLAGS
when compiling the files from post/lib_ppc/fpu (which is OK, but
looks rather dirty) this patch removes the soft-float string from
CFLAGS in post/lib_ppc/fpu/Makefile.
Signed-off-by: default avatarYuri Tikhonov <yur@emcraft.com>
parent a7c93104
......@@ -80,6 +80,19 @@ extern struct post_test post_list[];
extern unsigned int post_list_size;
extern int post_hotkeys_pressed(void);
/*
* If GCC is configured to use a version of GAS that supports
* the .gnu_attribute directive, it will use that directive to
* record certain properties of the output code.
* This feature is new to GCC 4.3.0.
* .gnu_attribute is new to GAS 2.18.
*/
#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
/* Tag_GNU_Power_ABI_FP/soft-float */
#define GNU_FPOST_ATTR asm(".gnu_attribute 4, 2");
#else
#define GNU_FPOST_ATTR
#endif /* __GNUC__ */
#endif /* __ASSEMBLY__ */
#define CONFIG_SYS_POST_RTC 0x00000001
......
......@@ -30,6 +30,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
int fpu_post_test_math1 (void)
{
volatile double a, *p;
......
......@@ -30,6 +30,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
static float rintf (float x)
{
volatile float TWO23 = 8388608.0;
......
......@@ -30,6 +30,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
int fpu_post_test_math3 (void)
{
volatile long double dfrom = 1.1;
......
......@@ -30,6 +30,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
int fpu_post_test_math4 (void)
{
volatile float reale = 1.0f;
......
......@@ -29,4 +29,5 @@ COBJS-$(CONFIG_HAS_POST) += acc1.o compare-fp-1.o mul-subnormal-single-1.o
include $(TOPDIR)/post/rules.mk
CFLAGS := $(shell echo $(CFLAGS) | sed s/-msoft-float//)
CFLAGS += -mhard-float -fkeep-inline-functions
......@@ -30,6 +30,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
static double func (const double *array)
{
double d = *array;
......
......@@ -32,6 +32,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
static int failed;
#define TEST(c) if ((c) != ok) failed++
......
......@@ -40,6 +40,8 @@
#include <watchdog.h>
GNU_FPOST_ATTR
extern int fpu_status (void);
extern void fpu_enable (void);
extern void fpu_disable (void);
......
......@@ -32,6 +32,8 @@
#if CONFIG_POST & CONFIG_SYS_POST_FPU
GNU_FPOST_ATTR
union uf
{
unsigned int u;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment