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
|
From 847591f173627441fdab42edbfbbe058ccb511d9 Mon Sep 17 00:00:00 2001
From: Bartlomiej Puget <larhard@gmail.com>
Date: Mon, 22 Feb 2016 02:50:14 +0100
Subject: [PATCH hurd] fix Xioctl-proto.defs creation
---
hurd/Makefile | 4 ++--
hurd/gensym.awk | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hurd/Makefile b/hurd/Makefile
index 4273ff3..2902d47 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -58,7 +58,7 @@ hurd.msgids: $(patsubst %.defs,%.msgids,$(filter %.defs,$(INSTHDRS)))
%.symc.o: %.symc
$(CC) -S $(CPPFLAGS) $(CFLAGS) $(CPPFLAGS-$@) -x c -o $@ $<
%.h: %.symc.o
- sed <$< -e 's/^[^*].*$$//' | \
+ sed <$< -e 's/^[[:space:]]*//' -e 's/^[^*].*$$//' | \
sed -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' -e '/^ *$$/d' >$@
%-ioctls.sym: tmpl-ioctls.sym
@@ -69,7 +69,7 @@ cpp = $(CC) $(CPPFLAGS) $(CFLAGS) $(CPPFLAGS-$@) -E -x c
%ioctl-requests.list: %ioctl-headers.h
$(cpp) $< | sed -n 's/^#.*"\([^"]*\)".*$$/\1/p' | sort | uniq | \
while read f; do \
- sed -n 's/^[ ]*#[ ]*define[ ]*\([A-Z0-9_]*\)[^A-Z0-9_][^A-Z0-9_]*_IO.*'\'$*\'.*$$'/\1/p' $$f; \
+ sed -n 's/^[ ]*#[ ]*define[ ]*\([A-Z0-9_]*\)[^A-Z0-9_][^A-Z0-9_]*_IO.*'\'$*\''.*$$/\1/p' $$f; \
done | sort | uniq > $@
%ioctl.defs: %ioctl.sym
diff --git a/hurd/gensym.awk b/hurd/gensym.awk
index 6c6e1a1..e5157c3 100644
--- a/hurd/gensym.awk
+++ b/hurd/gensym.awk
@@ -34,7 +34,7 @@ BEGIN {
# Take an arbitrarily complex C symbol or expression and constantize it.
/^expr/ {
- print "__asm (\"";
+ printf "__asm (\"";
if ($3 == "")
printf "* %s mAgIc%%0\" : : \"i\" (%s));\n", $2, $2;
else
@@ -43,7 +43,7 @@ BEGIN {
# Output a symbol defining the size of a C structure.
/^size/ {
- print "__asm (\"";
+ printf "__asm (\"";
if ($4 == "")
printf "* %s_SIZE mAgIc%%0\" : : \"i\" (sizeof(struct %s)));\n",
toupper($3), $2;
@@ -54,7 +54,7 @@ BEGIN {
# Output a symbol defining the byte offset of an element of a C structure.
/^offset/ {
- print "__asm (\"";
+ printf "__asm (\"";
if ($5 == "")
{
printf "* %s_%s mAgIc%%0\" : : \"i\" (&((struct %s*)0)->%s));\n",
--
2.1.4
|
