qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hurd: Avoid using ino64_t and loff_t in headers 

* mach/Machrules ($(patsubst %,$(objpfx)%.h,$(user-interfaces)):
	Process mig output through $(migheaderpipe).
	* hurd/Makefile (migheaderpipe): Define variable.
This commit is contained in:
Samuel Thibault 2018-03-04 02:11:46 +01:00
parent 44c6376ca3
commit 95dfdbd28c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17,6 +17,9 @@
* hurd/hurd/fd.h (_hurd_fd_error): Fix struct initializer to be * hurd/hurd/fd.h (_hurd_fd_error): Fix struct initializer to be
trivial, for C++ conformity. trivial, for C++ conformity.
* sysdeps/mach/hurd/dl-sysdep.c: Include <mach/machine/vm_param.h>. * sysdeps/mach/hurd/dl-sysdep.c: Include <mach/machine/vm_param.h>.
* mach/Machrules ($(patsubst %,$(objpfx)%.h,$(user-interfaces)):
Process mig output through $(migheadersed).
* hurd/Makefile (migheadersed): Define variable.
2018-03-03 Andreas Schwab <schwab@linux-m68k.org> 2018-03-03 Andreas Schwab <schwab@linux-m68k.org>

2
hurd/Makefile
View File

@ -86,6 +86,8 @@ generated += $(inlines:=.c)
CFLAGS-hurdstartup.o = $(no-stack-protector) CFLAGS-hurdstartup.o = $(no-stack-protector)
CFLAGS-RPC_exec_startup_get_info.o = $(no-stack-protector) CFLAGS-RPC_exec_startup_get_info.o = $(no-stack-protector)
# Make generated headers compatible with all support standards
migheaderpipe := | sed -e 's/\<ino64_t\>/__ino64_t/' -e 's/\<loff_t\>/__loff_t/'
include ../mach/Machrules include ../mach/Machrules
include ../Rules include ../Rules

3
mach/Machrules
View File

@ -29,6 +29,7 @@
# _S_rpcname. # _S_rpcname.
# Includers can also add to or modify `migdefines' to set MiG flags. # Includers can also add to or modify `migdefines' to set MiG flags.
# They can also set `migheaderpipe' to mangle the MiG header output.
all: all:
@ -176,7 +177,7 @@ $(patsubst %,$(objpfx)%.h,$(user-interfaces)): $(objpfx)%.h: $(objpfx)%.__h \
$(objpfx)%.uh $(objpfx)%.uh
# The last line of foo.__h is "#endif _foo_user_". # The last line of foo.__h is "#endif _foo_user_".
# The first two lines of foo.uh are "#ifndef _foo_user_"/"#define _foo_user_". # The first two lines of foo.uh are "#ifndef _foo_user_"/"#define _foo_user_".
(sed -e '$$d' $<; sed -e '1,2d' $(word 2,$^)) > $@-new (sed -e '$$d' $<; sed -e '1,2d' $(word 2,$^)) $(migheaderpipe) > $@-new
mv -f $@-new $@ mv -f $@-new $@
interface-routines := $(foreach if,$(user-interfaces), \ interface-routines := $(foreach if,$(user-interfaces), \