Patchwork Fix location where math-vector-fortran.h is installed.

login
register
mail settings
Submitter Martin Liška
Date March 1, 2019, 9:31 a.m.
Message ID <899e2237-81cf-ec5b-33f9-662f5a4ede4d@suse.cz>
Download mbox | patch
Permalink /patch/31691/
State New
Headers show

Comments

Martin Liška - March 1, 2019, 9:31 a.m.
On 2/28/19 2:32 PM, Florian Weimer wrote:
> * Zack Weinberg:
> 
>> Revised patch looks good to me except:
>>
>>> -! Platform-specific declarations of SIMD math functions for Fortran. -*- f90 -*-
>>> +! Platform-specific declarations of SIMD math functions for Fortran.
>>
>> Let's keep the -*- f90 -*- annotations, they will also be helpful for
>> future people editing these files.  For instance, on my computer, both
>> emacs and vim use the Fortran syntax highlighting rules for these
>> files when the annotation is present, and the C rules when it's
>> absent.
>>
>>> +            # Skip Fortran header files
>>> +            if 'finclude' in header:
>>> +                continue
>>
>> I think this conditional should be
>>
>>     if header.startswith('finclude/') or '/finclude/' in header
>>
>> so that it only applies to headers in the directory 'finclude', not
>> any hypothetical future headers that happen to have the string
>> 'finclude' in their base names.  (I don't know why that would happen,
>> but if it ever did, I can see someone being really confused why it
>> wasn't getting tested, so some extra defensiveness now seems like a
>> good idea.)
> 
> I agree.  Maybe also add a period to the end of the comment. 8-)
> 
> Thanks,
> Florian
> 

Thank you both for help, I've updated the patch.

Martin
Steve Ellcey - March 1, 2019, 10:30 p.m.
On Fri, 2019-03-01 at 10:31 +0100, Martin Liška wrote:
> 

> Thank you both for help, I've updated the patch.

> 

> Martin


Martin,

I tested this patch with some vector routines I am experimenting with
on Aarch64 and it worked fine for me when I created a
sysdeps/aarch64/fpu/finclude/math-vector-fortran.h file.

Steve Ellcey
sellcey@marvell.com
Martin Liška - March 5, 2019, 12:03 p.m.
On 3/1/19 10:31 AM, Martin Liška wrote:
> Thank you both for help, I've updated the patch.

Do it look fine to be installed?

Thanks,
Martin
Joseph Myers - March 6, 2019, 9:13 p.m.
On Tue, 5 Mar 2019, Martin Liška wrote:

> On 3/1/19 10:31 AM, Martin Liška wrote:
> > Thank you both for help, I've updated the patch.
> 
> Do it look fine to be installed?

Yes.

Patch

From 74b9d0deddbcb0f6433be937f6b1d7f632e257d6 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Tue, 26 Feb 2019 18:17:36 +0100
Subject: [PATCH] Fix location where math-vector-fortran.h is installed.

ChangeLog:

2019-02-26  Martin Liska  <mliska@suse.cz>

	* math/Makefile: Change location where math-vector-fortran.h is
	installed.
	* math/finclude/math-vector-fortran.h: Move from bits/math-vector-fortran.h.
	* sysdeps/x86/fpu/finclude/math-vector-fortran.h: Move
	from sysdeps/x86/fpu/bits/math-vector-fortran.h.
	* scripts/check-installed-headers.sh: Skip Fortran header files.
	* scripts/check-wrapper-headers.py: Likewise.
---
 math/Makefile                                            | 2 +-
 {bits => math/finclude}/math-vector-fortran.h            | 0
 scripts/check-installed-headers.sh                       | 4 ++++
 scripts/check-wrapper-headers.py                         | 4 ++++
 sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h | 0
 5 files changed, 9 insertions(+), 1 deletion(-)
 rename {bits => math/finclude}/math-vector-fortran.h (100%)
 rename sysdeps/x86/fpu/{bits => finclude}/math-vector-fortran.h (100%)

diff --git a/math/Makefile b/math/Makefile
index fc4191089d..cb4eaec6a9 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -26,7 +26,7 @@  headers		:= math.h bits/mathcalls.h bits/mathinline.h \
 		   fpu_control.h complex.h bits/cmathcalls.h fenv.h \
 		   bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \
 		   bits/math-finite.h bits/math-vector.h \
-		   bits/math-vector-fortran.h \
+		   finclude/math-vector-fortran.h \
 		   bits/libm-simd-decl-stubs.h bits/iscanonical.h \
 		   bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
 		   bits/long-double.h bits/mathcalls-helper-functions.h \
diff --git a/bits/math-vector-fortran.h b/math/finclude/math-vector-fortran.h
similarity index 100%
rename from bits/math-vector-fortran.h
rename to math/finclude/math-vector-fortran.h
diff --git a/scripts/check-installed-headers.sh b/scripts/check-installed-headers.sh
index 8e7beffd82..1f4496446c 100644
--- a/scripts/check-installed-headers.sh
+++ b/scripts/check-installed-headers.sh
@@ -84,6 +84,10 @@  for header in "$@"; do
         (sys/elf.h)
             continue;;
 
+        # Skip Fortran headers.
+        (finclude/*)
+            continue;;
+
 	# sys/sysctl.h is unsupported for x32.
 	(sys/sysctl.h)
             case "$is_x32" in
diff --git a/scripts/check-wrapper-headers.py b/scripts/check-wrapper-headers.py
index 094faa3ced..dc9fd86063 100644
--- a/scripts/check-wrapper-headers.py
+++ b/scripts/check-wrapper-headers.py
@@ -75,6 +75,10 @@  def check_headers(args):
 
         is_nonsysdep_header = os.access(header, os.R_OK)
         if is_nonsysdep_header:
+            # Skip Fortran header files.
+            if '/finclude/' in header:
+                continue
+
             include_path = os.path.join(args.root, INCLUDE, header)
             if not os.access(include_path, os.R_OK):
                 print('error: missing wrapper header {} for {}'.format(
diff --git a/sysdeps/x86/fpu/bits/math-vector-fortran.h b/sysdeps/x86/fpu/finclude/math-vector-fortran.h
similarity index 100%
rename from sysdeps/x86/fpu/bits/math-vector-fortran.h
rename to sysdeps/x86/fpu/finclude/math-vector-fortran.h
-- 
2.20.1