m68k/Makefile.inc:

- add __mmap.S to SRCS.
- add _lwp_getprivate.S mremap.S to ASM.
sys/Makefile.inc:
- look for __glue.S as well as glue.S.
- introduce a new ASM_MD and set it to "_lwp_getprivate.S mremap.S".
  this is used for assembler files that may have non-default
  implementations.

now m68k and m68000 mostly build again.

lib/libc/arch/m68k/Makefile.inc

@@ -1,6 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.12 2006/06/17 18:04:23 uwe Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2008/02/09 02:41:06 mrg Exp $
 
-SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S
+SRCS+=	__sigaction14_sigtramp.c __sigtramp2.S __mmap.S
+
+ASM+=	_lwp_getprivate.S mremap.S
 
 .if ${MKSOFTFLOAT} != "no"
 CPPFLAGS+= -DSOFTLOFLOAT_NEED_FIXUNS -DSOFTFLOAT -DSOFTFLOATM68K_FOR_GCC

lib/libc/sys/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.185 2008/01/27 16:18:22 martin Exp $
+#	$NetBSD: Makefile.inc,v 1.186 2008/02/09 02:41:07 mrg Exp $
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
 
 # sys sources
@@ -35,15 +35,19 @@ GLUE+=	adjtime.c clock_settime.c ftruncate.c \
 
 # 'glue' files might .c or .S depending on the architecture
 .for glue in ${GLUE}
-.if exists(${glue:.c=.S})
+. if exists(${glue:.c=.S})
 # Build the ASM glue file
 SRCS+=${glue:.c=.S}
-.else
+. else
+.  if exists(__${glue:.c=.S})
+SRCS+=__${glue:.c=.S} ${glue}
+.  else
 # Build the C glue file
 SRCS+= ${glue}
 # and an asm entry for __<syscall>
 ASM_GLUE+= __${glue:.c=.S}
-.endif
+.  endif
+. endif
 .endfor
 
 # glue to syscalls that may pass structs or unions, which cannot be
@@ -83,11 +87,11 @@ ASM=	access.S acct.S \
 		_lwp_create.S _lwp_exit.S _lwp_kill.S _lwp_park.S \
 		_lwp_self.S _lwp_wait.S _lwp_unpark.S _lwp_unpark_all.S \
 		_lwp_suspend.S _lwp_continue.S _lwp_wakeup.S _lwp_detach.S \
-		_lwp_getprivate.S _lwp_setprivate.S \
+		_lwp_setprivate.S \
 		_lwp_setname.S _lwp_getname.S _lwp_ctl.S \
 	madvise.S mincore.S minherit.S mkdir.S mkfifo.S mknod.S \
 		mlock.S mlockall.S modctl.S __mount50.S mprotect.S __msgctl13.S \
-		mremap.S msgget.S munlock.S munlockall.S munmap.S \
+		msgget.S munlock.S munlockall.S munmap.S \
 	nfssvc.S __ntp_gettime30.S \
 	pathconf.S pmc_get_info.S pmc_control.S __posix_chown.S \
 		__posix_fadvise50.S \
@@ -109,6 +113,17 @@ ASM=	access.S acct.S \
 	umask.S undelete.S unlink.S unmount.S utimes.S utrace.S uuidgen.S \
 	vadvise.S
 
+# modules with potentially non default implementations
+ASM_MD=	_lwp_getprivate.S mremap.S 
+
+.for f in ${ASM_MD}
+. if !exists(${f})
+   ASM+=	${f}
+. else
+   SRCS+=	${f}
+. endif
+.endfor
+
 WEAKASM= accept.S aio_suspend.S close.S connect.S execve.S \
 	fcntl.S fdatasync.S fsync.S fsync_range.S \
 	kill.S mq_receive.S mq_send.S mq_timedreceive.S mq_timedsend.S \