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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
From: "P. J. McDermott" <pjm@nac.net>
Description: Add strtonum() to generated conftest.awk
conftest.awk uses the strtonum() function of GNU Awk to check for a linker that
supports the "-z relro" option.
.
This patch adds the pure awk implementation of strtonum() found in
awklib/eg/lib/strtonum.awk in GNU Awk to enable conftest.awk to run on other
awk implementations.
diff -Naur src.orig/libc/configure src/libc/configure
--- src.orig/libc/configure 2012-12-02 16:11:45.000000000 -0500
+++ src/libc/configure 2013-06-20 20:13:34.122952650 -0400
@@ -6383,14 +6383,52 @@
_ACEOF
cat > conftest.awk <<\EOF
+# mystrtonum --- convert string to number
+# Arnold Robbins, arnold@skeeve.com, Public Domain
+# February, 2004
+function mystrtonum(str, ret, chars, n, i, k, c)
+{
+ if (str ~ /^0[0-7]*$/) {
+ # octal
+ n = length(str)
+ ret = 0
+ for (i = 1; i <= n; i++) {
+ c = substr(str, i, 1)
+ if ((k = index("01234567", c)) > 0)
+ k-- # adjust for 1-basing in awk
+ ret = ret * 8 + k
+ }
+ } else if (str ~ /^0[xX][[:xdigit:]]+/) {
+ # hexadecimal
+ str = substr(str, 3) # lop off leading 0x
+ n = length(str)
+ ret = 0
+ for (i = 1; i <= n; i++) {
+ c = substr(str, i, 1)
+ c = tolower(c)
+ if ((k = index("0123456789", c)) > 0)
+ k-- # adjust for 1-basing in awk
+ else if ((k = index("abcdef", c)) > 0)
+ k += 9
+ ret = ret * 16 + k
+ }
+ } else if (str ~ \
+ /^[-+]?([0-9]+([.][0-9]*([Ee][0-9]+)?)?|([.][0-9]+([Ee][-+]?[0-9]+)?))$/) {
+ # decimal number, possibly floating point
+ ret = str + 0
+ } else
+ ret = "NOT-A-NUMBER"
+
+ return ret
+}
BEGIN {
result = "no"
- commonpagesize = strtonum(commonpagesize)
+ commonpagesize = mystrtonum(commonpagesize)
}
{ print "LINE:", $0 > "/dev/stderr" }
$1 == "GNU_RELRO" {
- vaddr = strtonum($3)
- memsz = strtonum($6)
+ vaddr = mystrtonum($3)
+ memsz = mystrtonum($6)
end = vaddr + memsz
printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \
vaddr, memsz, end, commonpagesize > "/dev/stderr"
diff -Naur src.orig/libc/configure.in src/libc/configure.in
--- src.orig/libc/configure.in 2012-12-02 16:11:45.000000000 -0500
+++ src/libc/configure.in 2013-06-20 20:13:42.351194464 -0400
@@ -1475,14 +1475,52 @@
int data[0x10000] = { 1, };
]])])
cat > conftest.awk <<\EOF
+# mystrtonum --- convert string to number
+# Arnold Robbins, arnold@skeeve.com, Public Domain
+# February, 2004
+function mystrtonum(str, ret, chars, n, i, k, c)
+{
+ if (str ~ /^0[0-7]*$/) {
+ # octal
+ n = length(str)
+ ret = 0
+ for (i = 1; i <= n; i++) {
+ c = substr(str, i, 1)
+ if ((k = index("01234567", c)) > 0)
+ k-- # adjust for 1-basing in awk
+ ret = ret * 8 + k
+ }
+ } else if (str ~ /^0[xX][[:xdigit:]]+/) {
+ # hexadecimal
+ str = substr(str, 3) # lop off leading 0x
+ n = length(str)
+ ret = 0
+ for (i = 1; i <= n; i++) {
+ c = substr(str, i, 1)
+ c = tolower(c)
+ if ((k = index("0123456789", c)) > 0)
+ k-- # adjust for 1-basing in awk
+ else if ((k = index("abcdef", c)) > 0)
+ k += 9
+ ret = ret * 16 + k
+ }
+ } else if (str ~ \
+ /^[-+]?([0-9]+([.][0-9]*([Ee][0-9]+)?)?|([.][0-9]+([Ee][-+]?[0-9]+)?))$/) {
+ # decimal number, possibly floating point
+ ret = str + 0
+ } else
+ ret = "NOT-A-NUMBER"
+
+ return ret
+}
BEGIN {
result = "no"
- commonpagesize = strtonum(commonpagesize)
+ commonpagesize = mystrtonum(commonpagesize)
}
{ print "LINE:", $0 > "/dev/stderr" }
$1 == "GNU_RELRO" {
- vaddr = strtonum($3)
- memsz = strtonum($6)
+ vaddr = mystrtonum($3)
+ memsz = mystrtonum($6)
end = vaddr + memsz
printf "vaddr %#x memsz %#x end %#x commonpagesize %#x\n", \
vaddr, memsz, end, commonpagesize > "/dev/stderr"
|
