svn commit: r297619 - in head/lib/libc: aarch64/gen aarch64/sys arm/aeabi gen include

[Andrew Turner]

Author: andrew
Date: Wed Apr  6 16:09:10 2016
New Revision: 297619
URL: https://svnweb.freebsd.org/changeset/base/297619

Log:
  Disable support for compat syscalls on arm64. These symbols were never
  shipped since arm64 exists only on 11+.
  
  Submitted by:	brooks
  Reviewed by:	emaste, imp

Modified:
  head/lib/libc/aarch64/gen/Makefile.inc
  head/lib/libc/aarch64/sys/Makefile.inc
  head/lib/libc/arm/aeabi/aeabi_vfp.h
  head/lib/libc/gen/semctl.c
  head/lib/libc/include/compat.h

Modified: head/lib/libc/aarch64/gen/Makefile.inc
==============================================================================
--- head/lib/libc/aarch64/gen/Makefile.inc	Wed Apr  6 15:28:26 2016	(r297618)
+++ head/lib/libc/aarch64/gen/Makefile.inc	Wed Apr  6 16:09:10 2016	(r297619)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+CFLAGS+=	-DNO_COMPAT7
+
 SRCS+=	_ctx_start.S \
 	fabs.S \
 	flt_rounds.c \

Modified: head/lib/libc/aarch64/sys/Makefile.inc
==============================================================================
--- head/lib/libc/aarch64/sys/Makefile.inc	Wed Apr  6 15:28:26 2016	(r297618)
+++ head/lib/libc/aarch64/sys/Makefile.inc	Wed Apr  6 16:09:10 2016	(r297619)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MIASM:=	${MIASM:Nfreebsd[467]_*}
+
 SRCS+=	__vdso_gettc.c
 
 #MDASM= ptrace.S

Modified: head/lib/libc/arm/aeabi/aeabi_vfp.h
==============================================================================
--- head/lib/libc/arm/aeabi/aeabi_vfp.h	Wed Apr  6 15:28:26 2016	(r297618)
+++ head/lib/libc/arm/aeabi/aeabi_vfp.h	Wed Apr  6 16:09:10 2016	(r297619)
@@ -42,7 +42,9 @@
 #define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x ## _vfp)
 #define	AEABI_END(x)	END(__aeabi_ ## x ## _vfp)
 #else
-#define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x)
+#define	AEABI_ENTRY(x)				\
+    .set __fbsd_ ## x, __aeabi_ ## x;		\
+    ENTRY(__aeabi_ ## x)
 #define	AEABI_END(x)	END(__aeabi_ ## x)
 #endif
 

Modified: head/lib/libc/gen/semctl.c
==============================================================================
--- head/lib/libc/gen/semctl.c	Wed Apr  6 15:28:26 2016	(r297618)
+++ head/lib/libc/gen/semctl.c	Wed Apr  6 16:09:10 2016	(r297619)
@@ -29,7 +29,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifndef NO_COMPAT7
 #define _WANT_SEMUN_OLD
+#endif
 
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -38,8 +40,10 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 
 int	__semctl(int semid, int semnum, int cmd, union semun *arg);
+#ifndef NO_COMPAT7
 int	freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg);
 int	freebsd7_semctl(int semid, int semnum, int cmd, ...);
+#endif
 
 int
 semctl(int semid, int semnum, int cmd, ...)
@@ -61,6 +65,7 @@ semctl(int semid, int semnum, int cmd, .
 	return (__semctl(semid, semnum, cmd, semun_ptr));
 }
 
+#ifndef NO_COMPAT7
 int
 freebsd7_semctl(int semid, int semnum, int cmd, ...)
 {
@@ -82,3 +87,4 @@ freebsd7_semctl(int semid, int semnum, i
 }
 
 __sym_compat(semctl, freebsd7_semctl, FBSD_1.0);
+#endif

Modified: head/lib/libc/include/compat.h
==============================================================================
--- head/lib/libc/include/compat.h	Wed Apr  6 15:28:26 2016	(r297618)
+++ head/lib/libc/include/compat.h	Wed Apr  6 16:09:10 2016	(r297619)
@@ -38,9 +38,11 @@
 #define	__sym_compat(sym,impl,verid)	\
 	.symver impl, sym at verid
 
+#ifndef NO_COMPAT7
 __sym_compat(__semctl, freebsd7___semctl, FBSD_1.0);
 __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0);
 __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0);
+#endif
 
 #undef __sym_compat