3 files changed, 8 insertions, 59 deletions
diff --git a/sysdeps/i386/machine-gmon.h b/sysdeps/i386/machine-gmon.h
deleted file mode 100644
index 4128390..0000000
--- a/sysdeps/i386/machine-gmon.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Machine-specific calling sequence for `mcount' profiling function.  i386
-Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#define _MCOUNT_DECL static inline void _mcount
-
-/* Call _mcount with our the return PC for our caller,
-   and the return PC our caller will return to.  */
-#define MCOUNT								      \
-void mcount (u_long arg)						      \
-{									      \
-  _mcount (((u_long *) (&arg)[-2])[-1],					      \
-	   (&arg)[-1]);							      \
-}
diff --git a/sysdeps/stub/machine-gmon.h b/sysdeps/stub/machine-gmon.h
deleted file mode 100644
index 166faed..0000000
--- a/sysdeps/stub/machine-gmon.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Machine-specific calling sequence for `mcount' profiling function.  Stub
-Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#define _MCOUNT_DECL static inline void _mcount
-
-/* Call _mcount with our the return PC for our caller,
-   and the return PC our caller will return to.  */
-#define MCOUNT								      \
-void mcount (u_long arg)						      \
-{									      \
-  _mcount (caller return PC, my return PC);				      \
-}
-
-#error "sysdeps/MACHINE/machine-gmon.h missing"
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index a09ea4f..fd41666 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -292,4 +292,12 @@ $(objpfx)sysd-syscalls: $(..)sysdeps/unix/make-syscalls.sh \
 	done > $@T
 	mv -f $@T $@
 
+# This syscall objects depend on s-proto.d, which is generated to
+# specify dependencies generated syscalls with have on headers.
+ifdef subdir
+# These deps use file names relative to a subdir, so don't
+# include them in the parent directory.
+-include $(objpfx)s-proto.d
+endif
+
 endif