Clean up mkstemp patch mess.

This commit is contained in:
espie 1999-01-31 23:19:24 +00:00
parent c78bcf5e70
commit f02d753a4e
10 changed files with 318 additions and 52 deletions

View File

@ -1,18 +1,3 @@
--- libiberty/mkstemp.c.orig Tue Jan 12 11:43:52 1999
+++ libiberty/mkstemp.c Tue Jan 12 11:44:48 1999
@@ -37,6 +37,7 @@
#endif
#include "ansidecl.h"
+#ifndef HAVE_MKSTEMPS
/* We need to provide a type for gcc_uint64_t. */
#ifdef __GNUC__
typedef unsigned long long gcc_uint64_t;
@@ -126,3 +127,4 @@
template[0] = '\0';
return -1;
}
+#endif
--- libiberty/Makefile.in.orig Tue Jan 12 11:44:02 1999
+++ libiberty/Makefile.in Tue Jan 12 11:45:05 1999
@@ -125,7 +125,7 @@
@ -43,14 +28,3 @@
AC_CHECK_FUNCS(memset random rename rindex sigsetmask strcasecmp)
AC_CHECK_FUNCS(strchr strdup strncasecmp strrchr strstr strtod strtol)
AC_CHECK_FUNCS(strtoul tmpnam vasprintf vfprintf vprintf vsprintf waitpid)
--- gcc/configure.in.orig Wed Dec 30 23:05:07 1998
+++ gcc/configure.in Tue Jan 12 11:43:41 1999
@@ -370,7 +370,7 @@
fi
AC_CHECK_FUNCS(strtoul bsearch strerror putenv popen bcopy bzero bcmp \
- index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
+ index mkstemps rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
fputs_unlocked)

View File

@ -0,0 +1,103 @@
--- gcc/Makefile.in.orig2 Sun Jan 31 22:49:30 1999
+++ gcc/Makefile.in Sun Jan 31 22:57:25 1999
@@ -584,7 +584,8 @@
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) $(CLIB) ../libiberty/libiberty.a
+LIBIBERTY=../libiberty/libiberty.a
+LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) $(CLIB) $(LIBIBERTY)
# Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC.
@@ -891,10 +892,10 @@
# We call this executable `xgcc' rather than `gcc'
# to avoid confusion if the current directory is in the path
# and CC is `gcc'. It is renamed to `gcc' when it is installed.
-xgcc$(exeext): gcc.o version.o choose-temp.o intl.o pexecute.o prefix.o \
- version.o mkstemp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+xgcc$(exeext): gcc.o version.o intl.o prefix.o \
+ version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o prefix.o version.o \
- choose-temp.o pexecute.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS)
+ $(EXTRA_GCC_OBJS) $(LIBS)
# Dump a specs file to make -B./ read these specs over installed ones.
specs: xgcc$(exeext)
@@ -1337,11 +1338,11 @@
hard-reg-set.h $(BASIC_BLOCK_H)
sbitmap.o: sbitmap.c $(CONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H)
-collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \
- version.o choose-temp.o mkstemp.o $(LIBDEPS)
+collect2$(exeext): collect2.o tlink.o hash.o underscore.o \
+ version.o $(LIBDEPS)
-COLLECT2_OBJS = collect2.o tlink.o hash.o choose-temp.o cplus-dem.o \
- intl.o underscore.o version.o mkstemp.o
+COLLECT2_OBJS = collect2.o tlink.o hash.o \
+ intl.o underscore.o version.o
collect2 : $(COLLECT2_OBJS) $(LIBDEPS)
# Don't try modifying collect2 (aka ld) in place--it might be linking this.
-rm -f collect2$(exeext)
@@ -1356,16 +1357,6 @@
tlink.o: tlink.c $(DEMANGLE_H) hash.h $(CONFIG_H) system.h toplev.h collect2.h
hash.o: hash.c hash.h system.h toplev.h
-cplus-dem.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H)
- rm -f cplus-dem.c
- $(LN_S) $(srcdir)/../libiberty/cplus-dem.c cplus-dem.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) cplus-dem.c
-
-pexecute.o: $(srcdir)/../libiberty/pexecute.c $(CONFIG_H) system.h
- rm -f pexecute.c
- $(LN_S) $(srcdir)/../libiberty/pexecute.c pexecute.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) pexecute.c
-
vfprintf.o: $(srcdir)/../libiberty/vfprintf.c $(CONFIG_H) system.h
rm -f vfprintf.c
$(LN_S) $(srcdir)/../libiberty/vfprintf.c vfprintf.c
@@ -1433,16 +1424,6 @@
$(LN_S) $(srcdir)/../libiberty/obstack.c obstack.c
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) obstack.c
-choose-temp.o: $(srcdir)/../libiberty/choose-temp.c $(CONFIG_H) system.h
- rm -f choose-temp.c
- $(LN_S) $(srcdir)/../libiberty/choose-temp.c choose-temp.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) choose-temp.c
-
-mkstemp.o: $(srcdir)/../libiberty/mkstemp.c $(CONFIG_H) system.h
- rm -f mkstemp.c
- $(LN_S) $(srcdir)/../libiberty/mkstemp.c mkstemp.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) mkstemp.c
-
prefix.o: prefix.c $(CONFIG_H) system.h Makefile prefix.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DPREFIX=\"$(prefix)\" \
@@ -2022,8 +2003,7 @@
proto: config.status protoize$(exeext) unprotoize$(exeext) SYSCALLS.c.X
-PROTO_OBJS = choose-temp.o getopt.o getopt1.o getpwd.o \
- intl.o pexecute.o version.o mkstemp.o
+PROTO_OBJS = getpwd.o intl.o version.o
protoize$(exeext): protoize.o $(PROTO_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ protoize.o $(PROTO_OBJS) $(LIBS)
@@ -2052,16 +2032,6 @@
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DSTD_PROTO_DIR=\"$(libsubdir)\" \
$(srcdir)/unprotoize.c
-
-getopt.o: $(srcdir)/../libiberty/getopt.c $(srcdir)/../include/getopt.h
- rm -f getopt.c
- $(LN_S) $(srcdir)/../libiberty/getopt.c getopt.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) getopt.c
-
-getopt1.o: $(srcdir)/../libiberty/getopt1.c $(srcdir)/../include/getopt.h
- rm -f getopt1.c
- $(LN_S) $(srcdir)/../libiberty/getopt1.c getopt1.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) getopt1.c
# This info describes the target machine, so compile with GCC just built.
SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) \

View File

@ -0,0 +1,24 @@
--- gcc/cp/Make-lang.in.orig2 Sun Jan 31 22:52:17 1999
+++ gcc/cp/Make-lang.in Sun Jan 31 22:58:26 1999
@@ -94,8 +94,7 @@
-c g++.c
# Create the compiler driver for g++.
-GXX_OBJS = g++.o g++spec.o choose-temp.o intl.o pexecute.o prefix.o version.o \
- mkstemp.o
+GXX_OBJS = g++.o g++spec.o intl.o prefix.o version.o
g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS)
@@ -112,9 +111,9 @@
-DVERSION=\"$(version)\" cxxmain.c
# Apparently OpenVM needs the -o to be at the beginning of the link line.
-$(DEMANGLER_PROG): cxxmain.o underscore.o getopt.o getopt1.o $(LIBDEPS)
+$(DEMANGLER_PROG): cxxmain.o underscore.o $(LIBDEPS)
$(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \
- cxxmain.o underscore.o getopt.o getopt1.o $(LIBS)
+ cxxmain.o underscore.o $(LIBS)
CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
$(srcdir)/cp/except.c $(srcdir)/cp/input.c $(srcdir)/cp/pt.c \

View File

@ -0,0 +1,16 @@
--- gcc/f/Make-lang.in.orig2 Sun Jan 31 22:52:27 1999
+++ gcc/f/Make-lang.in Sun Jan 31 22:58:56 1999
@@ -103,11 +103,11 @@
else true; fi
# Create the compiler driver for g77.
-g77$(exeext): g77.o g77spec.o g77version.o version.o choose-temp.o pexecute.o prefix.o mkstemp.o \
+g77$(exeext): g77.o g77spec.o g77version.o version.o prefix.o \
$(LIBDEPS) $(EXTRA_GCC_OBJS)
if [ -f lang-f77 ]; then \
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ g77.o g77spec.o g77version.o \
- version.o choose-temp.o pexecute.o prefix.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS); \
+ version.o prefix.o $(EXTRA_GCC_OBJS) $(LIBS); \
else true; fi
# Create a version of the g77 driver which calls the cross-compiler.

View File

@ -0,0 +1,16 @@
--- gcc/java/Make-lang.in.orig2 Sun Jan 31 22:52:37 1999
+++ gcc/java/Make-lang.in Sun Jan 31 22:59:16 1999
@@ -100,10 +100,10 @@
-c $(GCJ).c
# Create the compiler driver for $(GCJ).
-$(GCJ)$(exeext): $(GCJ).o jvspec.o version.o choose-temp.o\
- pexecute.o prefix.o mkstemp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+$(GCJ)$(exeext): $(GCJ).o jvspec.o version.o \
+ prefix.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o \
- version.o choose-temp.o pexecute.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS)
+ version.o $(EXTRA_GCC_OBJS) $(LIBS)
# Create a version of the $(GCJ) driver which calls the cross-compiler.
$(GCJ)-cross$(exeext): $(GCJ)$(exeext)

View File

@ -1,18 +1,3 @@
--- libiberty/mkstemp.c.orig Tue Jan 12 11:43:52 1999
+++ libiberty/mkstemp.c Tue Jan 12 11:44:48 1999
@@ -37,6 +37,7 @@
#endif
#include "ansidecl.h"
+#ifndef HAVE_MKSTEMPS
/* We need to provide a type for gcc_uint64_t. */
#ifdef __GNUC__
typedef unsigned long long gcc_uint64_t;
@@ -126,3 +127,4 @@
template[0] = '\0';
return -1;
}
+#endif
--- libiberty/Makefile.in.orig Tue Jan 12 11:44:02 1999
+++ libiberty/Makefile.in Tue Jan 12 11:45:05 1999
@@ -125,7 +125,7 @@
@ -43,14 +28,3 @@
AC_CHECK_FUNCS(memset random rename rindex sigsetmask strcasecmp)
AC_CHECK_FUNCS(strchr strdup strncasecmp strrchr strstr strtod strtol)
AC_CHECK_FUNCS(strtoul tmpnam vasprintf vfprintf vprintf vsprintf waitpid)
--- gcc/configure.in.orig Wed Dec 30 23:05:07 1998
+++ gcc/configure.in Tue Jan 12 11:43:41 1999
@@ -370,7 +370,7 @@
fi
AC_CHECK_FUNCS(strtoul bsearch strerror putenv popen bcopy bzero bcmp \
- index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
+ index mkstemps rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
fputs_unlocked)

View File

@ -0,0 +1,103 @@
--- gcc/Makefile.in.orig2 Sun Jan 31 22:49:30 1999
+++ gcc/Makefile.in Sun Jan 31 22:57:25 1999
@@ -584,7 +584,8 @@
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) $(CLIB) ../libiberty/libiberty.a
+LIBIBERTY=../libiberty/libiberty.a
+LIBS = $(OBSTACK) $(USE_ALLOCA) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) $(CLIB) $(LIBIBERTY)
# Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC.
@@ -891,10 +892,10 @@
# We call this executable `xgcc' rather than `gcc'
# to avoid confusion if the current directory is in the path
# and CC is `gcc'. It is renamed to `gcc' when it is installed.
-xgcc$(exeext): gcc.o version.o choose-temp.o intl.o pexecute.o prefix.o \
- version.o mkstemp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+xgcc$(exeext): gcc.o version.o intl.o prefix.o \
+ version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o prefix.o version.o \
- choose-temp.o pexecute.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS)
+ $(EXTRA_GCC_OBJS) $(LIBS)
# Dump a specs file to make -B./ read these specs over installed ones.
specs: xgcc$(exeext)
@@ -1337,11 +1338,11 @@
hard-reg-set.h $(BASIC_BLOCK_H)
sbitmap.o: sbitmap.c $(CONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H)
-collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \
- version.o choose-temp.o mkstemp.o $(LIBDEPS)
+collect2$(exeext): collect2.o tlink.o hash.o underscore.o \
+ version.o $(LIBDEPS)
-COLLECT2_OBJS = collect2.o tlink.o hash.o choose-temp.o cplus-dem.o \
- intl.o underscore.o version.o mkstemp.o
+COLLECT2_OBJS = collect2.o tlink.o hash.o \
+ intl.o underscore.o version.o
collect2 : $(COLLECT2_OBJS) $(LIBDEPS)
# Don't try modifying collect2 (aka ld) in place--it might be linking this.
-rm -f collect2$(exeext)
@@ -1356,16 +1357,6 @@
tlink.o: tlink.c $(DEMANGLE_H) hash.h $(CONFIG_H) system.h toplev.h collect2.h
hash.o: hash.c hash.h system.h toplev.h
-cplus-dem.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H)
- rm -f cplus-dem.c
- $(LN_S) $(srcdir)/../libiberty/cplus-dem.c cplus-dem.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) cplus-dem.c
-
-pexecute.o: $(srcdir)/../libiberty/pexecute.c $(CONFIG_H) system.h
- rm -f pexecute.c
- $(LN_S) $(srcdir)/../libiberty/pexecute.c pexecute.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) pexecute.c
-
vfprintf.o: $(srcdir)/../libiberty/vfprintf.c $(CONFIG_H) system.h
rm -f vfprintf.c
$(LN_S) $(srcdir)/../libiberty/vfprintf.c vfprintf.c
@@ -1433,16 +1424,6 @@
$(LN_S) $(srcdir)/../libiberty/obstack.c obstack.c
$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) obstack.c
-choose-temp.o: $(srcdir)/../libiberty/choose-temp.c $(CONFIG_H) system.h
- rm -f choose-temp.c
- $(LN_S) $(srcdir)/../libiberty/choose-temp.c choose-temp.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) choose-temp.c
-
-mkstemp.o: $(srcdir)/../libiberty/mkstemp.c $(CONFIG_H) system.h
- rm -f mkstemp.c
- $(LN_S) $(srcdir)/../libiberty/mkstemp.c mkstemp.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) mkstemp.c
-
prefix.o: prefix.c $(CONFIG_H) system.h Makefile prefix.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DPREFIX=\"$(prefix)\" \
@@ -2022,8 +2003,7 @@
proto: config.status protoize$(exeext) unprotoize$(exeext) SYSCALLS.c.X
-PROTO_OBJS = choose-temp.o getopt.o getopt1.o getpwd.o \
- intl.o pexecute.o version.o mkstemp.o
+PROTO_OBJS = getpwd.o intl.o version.o
protoize$(exeext): protoize.o $(PROTO_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ protoize.o $(PROTO_OBJS) $(LIBS)
@@ -2052,16 +2032,6 @@
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DSTD_PROTO_DIR=\"$(libsubdir)\" \
$(srcdir)/unprotoize.c
-
-getopt.o: $(srcdir)/../libiberty/getopt.c $(srcdir)/../include/getopt.h
- rm -f getopt.c
- $(LN_S) $(srcdir)/../libiberty/getopt.c getopt.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) getopt.c
-
-getopt1.o: $(srcdir)/../libiberty/getopt1.c $(srcdir)/../include/getopt.h
- rm -f getopt1.c
- $(LN_S) $(srcdir)/../libiberty/getopt1.c getopt1.c
- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) getopt1.c
# This info describes the target machine, so compile with GCC just built.
SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) \

View File

@ -0,0 +1,24 @@
--- gcc/cp/Make-lang.in.orig2 Sun Jan 31 22:52:17 1999
+++ gcc/cp/Make-lang.in Sun Jan 31 22:58:26 1999
@@ -94,8 +94,7 @@
-c g++.c
# Create the compiler driver for g++.
-GXX_OBJS = g++.o g++spec.o choose-temp.o intl.o pexecute.o prefix.o version.o \
- mkstemp.o
+GXX_OBJS = g++.o g++spec.o intl.o prefix.o version.o
g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS)
@@ -112,9 +111,9 @@
-DVERSION=\"$(version)\" cxxmain.c
# Apparently OpenVM needs the -o to be at the beginning of the link line.
-$(DEMANGLER_PROG): cxxmain.o underscore.o getopt.o getopt1.o $(LIBDEPS)
+$(DEMANGLER_PROG): cxxmain.o underscore.o $(LIBDEPS)
$(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \
- cxxmain.o underscore.o getopt.o getopt1.o $(LIBS)
+ cxxmain.o underscore.o $(LIBS)
CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
$(srcdir)/cp/except.c $(srcdir)/cp/input.c $(srcdir)/cp/pt.c \

View File

@ -0,0 +1,16 @@
--- gcc/f/Make-lang.in.orig2 Sun Jan 31 22:52:27 1999
+++ gcc/f/Make-lang.in Sun Jan 31 22:58:56 1999
@@ -103,11 +103,11 @@
else true; fi
# Create the compiler driver for g77.
-g77$(exeext): g77.o g77spec.o g77version.o version.o choose-temp.o pexecute.o prefix.o mkstemp.o \
+g77$(exeext): g77.o g77spec.o g77version.o version.o prefix.o \
$(LIBDEPS) $(EXTRA_GCC_OBJS)
if [ -f lang-f77 ]; then \
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ g77.o g77spec.o g77version.o \
- version.o choose-temp.o pexecute.o prefix.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS); \
+ version.o prefix.o $(EXTRA_GCC_OBJS) $(LIBS); \
else true; fi
# Create a version of the g77 driver which calls the cross-compiler.

View File

@ -0,0 +1,16 @@
--- gcc/java/Make-lang.in.orig2 Sun Jan 31 22:52:37 1999
+++ gcc/java/Make-lang.in Sun Jan 31 22:59:16 1999
@@ -100,10 +100,10 @@
-c $(GCJ).c
# Create the compiler driver for $(GCJ).
-$(GCJ)$(exeext): $(GCJ).o jvspec.o version.o choose-temp.o\
- pexecute.o prefix.o mkstemp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+$(GCJ)$(exeext): $(GCJ).o jvspec.o version.o \
+ prefix.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o \
- version.o choose-temp.o pexecute.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS)
+ version.o $(EXTRA_GCC_OBJS) $(LIBS)
# Create a version of the $(GCJ) driver which calls the cross-compiler.
$(GCJ)-cross$(exeext): $(GCJ)$(exeext)