1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
cxref (1.6e-9) unstable; urgency=medium
.
* replace supplement files wit explicit work arounds for known header
file issues in cpp/cxref-cpp-configure.in
Author: Camm Maguire <camm@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
Bug: <upstream-bugtracker-url>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: (no|not-needed|<patch-forwarded-url>)
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
Reviewed-By: <name and email of someone who approved/reviewed the patch>
Last-Update: 2024-05-07
--- cxref-1.6e.orig/cpp/Makefile.in
+++ cxref-1.6e/cpp/Makefile.in
@@ -115,6 +115,5 @@ version.o : version.c
cxref-cpp.defines : cxref-cpp-configure
./cxref-cpp-configure $(CC) -o $@
- ! [ -e ../debian/cxref-cpp-supplement.defines ] || cat ../debian/cxref-cpp-supplement.defines >> $@
########
--- cxref-1.6e.orig/cpp/cccp.c
+++ cxref-1.6e/cpp/cccp.c
@@ -4291,7 +4291,7 @@ special_symbol (hp, op)
if (instack[i].fname != NULL)
true_indepth++;
- buf = (char *) alloca (11); /* Eight bytes ought to be more than enough */
+ buf = (char *) alloca (12); /* Eight bytes ought to be more than enough */
sprintf (buf, "%d", true_indepth - 1);
break;
--- cxref-1.6e.orig/cpp/cxref-cpp-configure.in
+++ cxref-1.6e/cpp/cxref-cpp-configure.in
@@ -104,3 +104,29 @@ export IFS
for define in $DEFINES; do
echo $define >> $cxref_cpp_defines
done
+
+# Work around for undefined _Float128 when including math.h
+
+if echo "#include <math.h>" | cpp |grep -q _Float128; then
+ cat >> $cxref_cpp_defines <<EOF
+#define _Float128 long double
+EOF
+
+fi
+
+# Work around for arm64 math-vector.h bug glibc #1070668
+
+if echo "#include <math.h>" | cpp |grep -q __Float64x2_t; then
+ cat >> $cxref_cpp_defines <<EOF
+#define __Float64x2_t __attribute__ ((__neon_vector_type__ (2))) double
+#define __Float32x4_t __attribute__ ((__neon_vector_type__ (4))) float
+#define __SVBool_t __attribute__ ((__neon_vector_type__ (N))) int
+#define __SVFloat32_t __attribute__ ((__neon_vector_type__ (N))) float
+#define __SVFloat64_t __attribute__ ((__neon_vector_type__ (N))) double
+#define __int128 long long
+#define __int128_t long long
+#define __uint128 unsigned long long
+#define __uint128_t unsigned long long
+EOF
+
+fi
|
