diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-03-07 00:36:02 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-03-07 00:36:02 +0000 |
| commit | fa9dda64932da5eec1b67eefafb3a03738bbc529 (patch) | |
| tree | 62a566e9a9480870d4d4e5123255b4a1f3009815 | |
| parent | 4acc27ed0a83995ad687c69a3f3f11510e0796d7 (diff) | |
| download | glibc-fa9dda64932da5eec1b67eefafb3a03738bbc529.tar.gz | |
soft-fp: Condition sfp-machine.h include path on __KERNEL__.
My Linux kernel patch to update the kernel to current glibc soft-fp
<https://sourceware.org/ml/libc-alpha/2015-02/msg00107.html> still
leaves a few small differences between the two copies of soft-fp.
I think it's desirable to avoid such differences completely if
possible by having one set of sources suitable for use in both places.
To that end, this patch introduces a conditional on __KERNEL__ for the
path by which sfp-machine.h is included.
Tested for powerpc-nofpu that installed stripped shared libraries are
unchanged by this patch.
* soft-fp/soft-fp.h [!_LIBC && __KERNEL__]: Include
<asm/sfp-machine.h> instead of <sfp-machine.h>.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | soft-fp/soft-fp.h | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2015-03-06 Joseph Myers <joseph@codesourcery.com> + + * soft-fp/soft-fp.h [!_LIBC && __KERNEL__]: Include + <asm/sfp-machine.h> instead of <sfp-machine.h>. + 2015-03-06 Roland McGrath <roland@hack.frob.com> * manual/install.texi (Configuring and compiling): diff --git a/soft-fp/soft-fp.h b/soft-fp/soft-fp.h index d0171e3845..db94e0b3ef 100644 --- a/soft-fp/soft-fp.h +++ b/soft-fp/soft-fp.h @@ -34,6 +34,10 @@ #ifdef _LIBC # include <sfp-machine.h> +#elif defined __KERNEL__ +/* The Linux kernel uses <asm/*.h> names for architecture-specific + files. */ +# include <asm/sfp-machine.h> #else # include "sfp-machine.h" #endif |