16892 Update ast feature files

Reviewed by: Dan Cross <cross@oxidecomputer.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Patrick Mooney <pmooney@pfmooney.com>
illumos · Nov 18, 2024 · 616c769 · 616c769
1 parent 2317519
commit 616c769
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 41 deletions.
diff --git a/exception_lists/copyright b/exception_lists/copyright
@@ -58,6 +58,7 @@ usr/src/cmd/acpi/common/utmath.c
 usr/src/cmd/acpi/common/utnonansi.c
 usr/src/cmd/acpi/common/utprint.c
 usr/src/cmd/acpi/common/utxferror.c
+usr/src/cmd/ast/libast/*/FEATURE/*
 usr/src/cmd/dtrace/test/tst/common/*/*.out
 usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c
 usr/src/cmd/krb5/kadmin/cli/kadmin.h

diff --git a/exception_lists/wscheck b/exception_lists/wscheck
@@ -15,6 +15,7 @@
 #
 syntax: glob
 
+usr/src/cmd/ast/libast/*/FEATURE/*
 usr/src/cmd/cxgbetool/*
 usr/src/cmd/smbsrv/testoplock/case*.ref
 usr/src/data/hwdata/pci.ids

diff --git a/usr/src/cmd/ast/README.ast b/usr/src/cmd/ast/README.ast
@@ -16,8 +16,3 @@ The FEATURE files can be re-generated based on the current contents of
 proto using 'make _feature' in this directory. This should be done after
 adding new features to the standard libraries that AST can detect and use.
 This needs to be done for all supported architectures.
-
-Note that for the moment, as long as building gate using gcc 4.4.4 as the
-primary compiler is supported, libast/i386/FEATURE/aso has some additional
-local edits to use the appropriate atomic ops for 32-bit objects built
-with this version of gcc.
diff --git a/usr/src/cmd/ast/libast/amd64/FEATURE/lib b/usr/src/cmd/ast/libast/amd64/FEATURE/lib
@@ -29,6 +29,7 @@
 #define _lib_execlp	1	/* execlp() in default lib(s) */
 #define _lib_execve	1	/* execve() in default lib(s) */
 #define _lib_execvp	1	/* execvp() in default lib(s) */
+#define _lib_execvpe	1	/* execvpe() in default lib(s) */
 #define _lib_fchmod	1	/* fchmod() in default lib(s) */
 #define _lib_fcntl	1	/* fcntl() in default lib(s) */
 #define _lib_fmtmsg	1	/* fmtmsg() in default lib(s) */

diff --git a/usr/src/cmd/ast/libast/amd64/FEATURE/map b/usr/src/cmd/ast/libast/amd64/FEATURE/map
@@ -83,9 +83,6 @@
 #define dirname		_ast_dirname
 #undef	eaccess
 #define eaccess		_ast_eaccess
-#undef	execvpe
-#define execvpe		_ast_execvpe
-extern __MANGLE__ int		execvpe __PROTO__((const char*, char* const[], char* const[]));
 #undef	fnmatch
 #define fnmatch		_ast_fnmatch
 #undef	fts_children

diff --git a/usr/src/cmd/ast/libast/amd64/FEATURE/sys b/usr/src/cmd/ast/libast/amd64/FEATURE/sys
@@ -143,7 +143,6 @@
 extern __MANGLE__ void	cfree __PROTO__((__V_*));
 extern __MANGLE__ size_t	confstr __PROTO__((int, char*, size_t));
 extern __MANGLE__ int	eaccess __PROTO__((const char*, int));
-extern __MANGLE__ int	execvpe __PROTO__((const char*, char* const[], char* const[]));
 extern __MANGLE__ __V_*	pvalloc __PROTO__((size_t));
 extern __MANGLE__ pid_t	spawnveg __PROTO__((const char*, char* const[], char* const[], pid_t));
 #undef __MANGLE__

diff --git a/usr/src/cmd/ast/libast/i386/FEATURE/aso b/usr/src/cmd/ast/libast/i386/FEATURE/aso
@@ -2,30 +2,6 @@
 #ifndef _def_aso_ast
 #define _def_aso_ast	1
 #define _sys_types	1	/* #include <sys/types.h> ok */
-
-#if defined (__GNUC__) && (__GNUC__ == 4)
-/* <atomic.h> atomic_cas_64 */
-#include <atomic.h>
-#define _aso_cas8(p,o,n)	atomic_cas_8(p,o,n)
-#define _aso_inc8(p)		(atomic_add_8_nv(p,1)-1)
-#define _aso_dec8(p)		(atomic_add_8_nv(p,-1)+1)
-#define _aso_cas16(p,o,n)	atomic_cas_16(p,o,n)
-#define _aso_inc16(p)		(atomic_add_16_nv(p,1)-1)
-#define _aso_dec16(p)		(atomic_add_16_nv(p,-1)+1)
-#define _aso_cas32(p,o,n)	atomic_cas_32(p,o,n)
-#define _aso_inc32(p)		(atomic_add_32_nv(p,1)-1)
-#define _aso_dec32(p)		(atomic_add_32_nv(p,-1)+1)
-#define _aso_cas64(p,o,n)	atomic_cas_64(p,o,n)
-#define _aso_inc64(p)		(atomic_add_64_nv(p,1)-1)
-#define _aso_dec64(p)		(atomic_add_64_nv(p,-1)+1)
-#if _ast_sizeof_pointer == 8
-#define _aso_casptr(p,o,n)	((void*)atomic_cas_64((uint64_t*)p,(uint64_t)o,(uint64_t)n))
-#else
-#define _aso_casptr(p,o,n)	((void*)atomic_cas_32((uint32_t*)p,(uint32_t)o,(uint32_t)n))
-#endif
-
-#else /* __GNUC__ == 4 */
-
 /* gcc 4.1+ 64 bit memory atomic operations model */
 #define _aso_cas8(p,o,n)	__sync_val_compare_and_swap(p,o,n)
 #define _aso_inc8(p)		__sync_fetch_and_add(p,1)
@@ -45,6 +21,4 @@
 #define _aso_casptr(p,o,n)	((void*)__sync_val_compare_and_swap(p,(uint32_t)o,(uint32_t)n))
 #endif
 
-#endif /* __GNUC__ == 4 */
-
 #endif
diff --git a/usr/src/cmd/ast/libast/i386/FEATURE/lib b/usr/src/cmd/ast/libast/i386/FEATURE/lib
@@ -29,6 +29,7 @@
 #define _lib_execlp	1	/* execlp() in default lib(s) */
 #define _lib_execve	1	/* execve() in default lib(s) */
 #define _lib_execvp	1	/* execvp() in default lib(s) */
+#define _lib_execvpe	1	/* execvpe() in default lib(s) */
 #define _lib_fchmod	1	/* fchmod() in default lib(s) */
 #define _lib_fcntl	1	/* fcntl() in default lib(s) */
 #define _lib_fmtmsg	1	/* fmtmsg() in default lib(s) */

diff --git a/usr/src/cmd/ast/libast/i386/FEATURE/map b/usr/src/cmd/ast/libast/i386/FEATURE/map
@@ -83,9 +83,6 @@
 #define dirname		_ast_dirname
 #undef	eaccess
 #define eaccess		_ast_eaccess
-#undef	execvpe
-#define execvpe		_ast_execvpe
-extern __MANGLE__ int		execvpe __PROTO__((const char*, char* const[], char* const[]));
 #undef	fnmatch
 #define fnmatch		_ast_fnmatch
 #undef	fts_children

diff --git a/usr/src/cmd/ast/libast/i386/FEATURE/sys b/usr/src/cmd/ast/libast/i386/FEATURE/sys
@@ -143,7 +143,6 @@
 extern __MANGLE__ void	cfree __PROTO__((__V_*));
 extern __MANGLE__ size_t	confstr __PROTO__((int, char*, size_t));
 extern __MANGLE__ int	eaccess __PROTO__((const char*, int));
-extern __MANGLE__ int	execvpe __PROTO__((const char*, char* const[], char* const[]));
 extern __MANGLE__ __V_*	pvalloc __PROTO__((size_t));
 extern __MANGLE__ pid_t	spawnveg __PROTO__((const char*, char* const[], char* const[], pid_t));
 #undef __MANGLE__

diff --git a/usr/src/cmd/ast/libast/mapfile-vers b/usr/src/cmd/ast/libast/mapfile-vers
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 #
 
 #
@@ -129,7 +129,6 @@ $endif
 	_ast_doprnt;
 	_ast_doscan;
 	_ast_eaccess;
-	_ast_execvpe;
 	_ast_fclose;
 	_ast_fcloseall;
 	_ast_fdopen;