From fa9dda64932da5eec1b67eefafb3a03738bbc529 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 7 Mar 2015 00:36:02 +0000
Subject: 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>.
---
 soft-fp/soft-fp.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'soft-fp')

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
-- 
cgit 1.4.1