summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--Src/mkmakemod.sh135
-rw-r--r--Src/zsh.h14
-rw-r--r--configure.in15
4 files changed, 64 insertions, 103 deletions
diff --git a/ChangeLog b/ChangeLog
index 39f8ef7ec..f62c01f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2000-08-14 Bart Schaefer <schaefer@zsh.org>
+ * Andrej: 12623: configure.in, Src/mkmakemod.sh, Src/zsh.h: Fix
+ dynamic linking on cygwin, again.
+
* 12621: Src/Zle/zle_main.c: Use ztrdup() on a string that will
later be freed; this appears to have been a bug ever since 9839.
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index 0e8702ce3..e0ef05c9c 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -73,15 +73,6 @@ sed_normalise='
s,\(.\)/$,\1,
'
-CYGWIN=no
-if uname -s > /dev/null 2>&1; then
- case `uname -s` in
- CYGWIN* )
- CYGWIN=yes
- ;;
- esac
-fi
-
# decide which stages to process
first_stage=true
second_stage=true
@@ -202,7 +193,6 @@ if $first_stage; then
exportdeps=
imports=
q_moddeps=
- dllname=
for dep in $moddeps; do
q_dep=`echo $dep | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
q_moddeps="$q_moddeps $q_dep"
@@ -222,9 +212,6 @@ if $first_stage; then
zsh/main )
mdll="\$(dir_top)/Src/libzsh-\$(VERSION).\$(DL_EXT) "
;;
- zsh/$mddname )
- mdll=
- ;;
* )
mdll="${depbase}.\$(DL_EXT) "
;;
@@ -245,9 +232,6 @@ if $first_stage; then
zsh/main )
mdll="\$(dir_top)/Src/libzsh-\$(VERSION).\$(DL_EXT) "
;;
- zsh/$mddname )
- mdll=
- ;;
* )
mdll="\$(dir_top)/$loc/${depbase}.\$(DL_EXT) "
;;
@@ -272,9 +256,6 @@ if $first_stage; then
zsh/main )
mdll="\$(dir_top)/Src/libzsh-\$(VERSION).\$(DL_EXT) "
;;
- zsh/$mddname )
- mdll=
- ;;
* )
mdll="\$(dir_top)/$loc/${depbase}.\$(DL_EXT) "
;;
@@ -288,20 +269,15 @@ if $first_stage; then
modhdeps="$modhdeps $mdh"
exportdeps="$exportdeps $export"
imports="$imports \$(IMPOPT)$export"
- if test $CYGWIN = yes -a -n "$mdll"; then
- case "$mododeps" in
- *" $mdll "* )
- :
- ;;
- * )
- mododeps="$mododeps $mdll"
- ;;
- esac
- fi
+ case "$mododeps " in
+ *" $mdll "* )
+ :
+ ;;
+ * )
+ mododeps="$mododeps $mdll"
+ ;;
+ esac
done
- if test $CYGWIN = yes; then
- dllname="--dllname $q_name"
- fi
echo "##### ===== DEPENDENCIES GENERATED FROM ${mddname}.mdd ===== #####"
echo
@@ -312,8 +288,8 @@ if $first_stage; then
echo "INCS_${mddname} = \$(EPRO_${mddname}) $otherincs"
echo "EXPIMP_${mddname} = $imports \$(EXPOPT)$mddname.export"
echo "NXPIMP_${mddname} ="
- echo "DEPMODS_${mddname} = $mododeps"
- echo "DLLNAME_${mddname} = $dllname"
+ echo "LINKMODS_${mddname} = $mododeps"
+ echo "NOLINKMODS_${mddname} = "
echo
echo "proto.${mddname}: \$(EPRO_${mddname})"
echo "\$(SYMS_${mddname}): \$(PROTODEPS)"
@@ -338,9 +314,9 @@ if $first_stage; then
echo "uninstall.modules.${mddname}:"
echo " rm -f \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)"
echo
- echo "${mddname}.\$(DL_EXT): \$(MODDOBJS_${mddname}) ${mddname}.export $exportdeps \$(DEPMODS_${mddname})"
+ echo "${mddname}.\$(DL_EXT): \$(MODDOBJS_${mddname}) ${mddname}.export $exportdeps \$(@LINKMODS@_${mddname})"
echo ' rm -f $@'
- echo " \$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(DLLNAME_${mddname}) \$(MODDOBJS_${mddname}) \$(DEPMODS_${mddname}) \$(LIBS) "
+ echo " \$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(@LINKMODS@_${mddname}) \$(LIBS) "
echo
fi
echo "${mddname}.mdhi: ${mddname}.mdhs \$(INCS_${mddname})"
@@ -368,30 +344,16 @@ if $first_stage; then
echo " echo '#define have_${q_name}_module'; \\"
echo " echo; \\"
echo " echo '# ifndef IMPORTING_MODULE_${q_name}'; \\"
- if test $CYGWIN = yes; then
- echo " echo '# ifdef MODULE'; \\"
- echo " echo '# define boot_ __attribute__((__dllexport__)) boot_${q_name}'; \\"
- echo " echo '# define cleanup_ __attribute__((__dllexport__)) cleanup_${q_name}'; \\"
- echo " echo '# define setup_ __attribute__((__dllexport__)) setup_${q_name}'; \\"
- echo " echo '# define finish_ __attribute__((__dllexport__)) finish_${q_name}'; \\"
- echo " echo '# else /* MODULE */'; \\"
- echo " echo '# define boot_ boot_${q_name}'; \\"
- echo " echo '# define cleanup_ cleanup_${q_name}'; \\"
- echo " echo '# define setup_ setup_${q_name}'; \\"
- echo " echo '# define finish_ finish_${q_name}'; \\"
- echo " echo '# endif /* MODULE */'; \\"
- else
- echo " if test @SHORTBOOTNAMES@ = yes; then \\"
- echo " echo '# ifndef MODULE'; \\"
- echo " fi; \\"
- echo " echo '# define boot_ boot_${q_name}'; \\"
- echo " echo '# define cleanup_ cleanup_${q_name}'; \\"
- echo " echo '# define setup_ setup_${q_name}'; \\"
- echo " echo '# define finish_ finish_${q_name}'; \\"
- echo " if test @SHORTBOOTNAMES@ = yes; then \\"
- echo " echo '# endif /* !MODULE */'; \\"
- echo " fi; \\"
- fi
+ echo " if test @SHORTBOOTNAMES@ = yes; then \\"
+ echo " echo '# ifndef MODULE'; \\"
+ echo " fi; \\"
+ echo " echo '# define boot_ boot_${q_name}'; \\"
+ echo " echo '# define cleanup_ cleanup_${q_name}'; \\"
+ echo " echo '# define setup_ setup_${q_name}'; \\"
+ echo " echo '# define finish_ finish_${q_name}'; \\"
+ echo " if test @SHORTBOOTNAMES@ = yes; then \\"
+ echo " echo '# endif /* !MODULE */'; \\"
+ echo " fi; \\"
echo " echo '# endif /* !IMPORTING_MODULE_${q_name} */'; \\"
echo " echo; \\"
if test -n "$moddeps"; then (
@@ -416,26 +378,25 @@ if $first_stage; then
echo " echo; \\"
fi
if test -n "$proto"; then
- if test "$CYGWIN" = yes; then
- echo " echo '# ifndef IMPORTING_MODULE_${q_name} '; \\"
- echo " echo '# undef mod_import_variable'; \\"
- echo " echo '# define mod_import_variable'; \\"
- echo " echo '# endif /* IMPORTING_MODULE_${q_name} */'; \\"
- fi
+ echo " echo '# undef mod_import_variable'; \\"
+ echo " echo '# undef mod_import_function'; \\"
+ echo " echo '# if defined(IMPORTING_MODULE_${q_name}) && defined(MODULE)'; \\"
+ echo " echo '# define mod_import_variable @MOD_IMPORT_VARIABLE@'; \\"
+ echo " echo '# define mod_import_function @MOD_IMPORT_FUNCTION@'; \\"
+ echo " echo '# else'; \\"
+ echo " echo '# define mod_import_function'; \\"
+ echo " echo '# define mod_import_variable'; \\"
+ echo " echo '# endif /* IMPORTING_MODULE_${q_name} && MODULE */'; \\"
echo " for epro in \$(EPRO_${mddname}); do \\"
echo " echo '# include \"'\$\$epro'\"'; \\"
echo " done; \\"
- if test "$CYGWIN" = yes; then
- echo " echo '# ifndef IMPORTING_MODULE_${q_name} '; \\"
- echo " echo '# ifdef MODULE'; \\"
- echo " echo '# undef mod_import_variable'; \\"
- echo " echo '# define mod_import_variable __attribute__((__dllimport__))'; \\"
- echo " echo '# else /* MODULE */'; \\"
- echo " echo '# undef mod_import_variable'; \\"
- echo " echo '# define mod_import_variable'; \\"
- echo " echo '# endif /* MODULE */'; \\"
- echo " echo '# endif /* IMPORTING_MODULE_${q_name} */'; \\"
- fi
+ echo " echo '# undef mod_import_variable'; \\"
+ echo " echo '# define mod_import_variable'; \\"
+ echo " echo '# undef mod_import_variable'; \\"
+ echo " echo '# define mod_import_variable'; \\"
+ echo " echo '# ifndef mod_export'; \\"
+ echo " echo '# define mod_export @MOD_EXPORT@'; \\"
+ echo " echo '# endif /* mod_export */'; \\"
echo " echo; \\"
fi
echo " echo '#endif /* !have_${q_name}_module */'; \\"
@@ -472,17 +433,15 @@ if $first_stage; then
echo " false # should only happen with make -n"
echo
fi
- if test "$CYGWIN" = yes; then
- for mdll in $remote_modules; do
- echo "$mdll: FORCE"
- echo " @cd @%@ && \$(MAKE) \$(MAKEDEFS) @%@$mdll"
- echo
- done | sed 's,^\(.*\)@%@\(.*\)@%@\(.*\)/\([^/]*\)$,\1\3\2\4,'
- if test -n "$other_modules"; then
- echo "${other_modules}:" | sed 's,^ ,,'
- echo " false # should only happen with make -n"
- echo
- fi
+ for mdll in $remote_modules; do
+ echo "$mdll: FORCE"
+ echo " @cd @%@ && \$(MAKE) \$(MAKEDEFS) @%@$mdll"
+ echo
+ done | sed 's,^\(.*\)@%@\(.*\)@%@\(.*\)/\([^/]*\)$,\1\3\2\4,'
+ if test -n "$other_modules"; then
+ echo "${other_modules}:" | sed 's,^ ,,'
+ echo " false # should only happen with make -n"
+ echo
fi
fi
diff --git a/Src/zsh.h b/Src/zsh.h
index cdb90e264..cdf1ed489 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -1681,20 +1681,6 @@ typedef void (*ZleVoidIntFn) _((int));
typedef unsigned char * (*ZleReadFn) _((char *, char *, int));
/***************************************/
-/* Pseudo-keyword to mark exportedness */
-/***************************************/
-
-#if defined(__CYGWIN__) && defined(MODULE)
-#define mod_export __attribute__((__dllexport__))
-#define mod_import_variable __attribute__((__dllimport__))
-#define mod_import_function
-#else
-#define mod_export
-#define mod_import_variable
-#define mod_import_function
-#endif
-
-/***************************************/
/* Hooks in core. */
/***************************************/
diff --git a/configure.in b/configure.in
index 2b1c13e28..6355655cc 100644
--- a/configure.in
+++ b/configure.in
@@ -371,6 +371,7 @@ AC_PROG_GCC_TRADITIONAL dnl Do we need -traditional flag for gcc.
AC_C_CONST dnl Does compiler support `const'.
AC_CYGWIN dnl Check for cygwin environment
+
AC_EXEEXT dnl Check for executable extension, e.g. .exe
fp_PROG_CC_STDC
@@ -1431,6 +1432,10 @@ dnl ---------------
dnl dynamic loading
dnl ---------------
L=N
+LINKMODS=NOLINKMODS
+MOD_EXPORT=
+MOD_IMPORT_VARIABLE=
+MOD_IMPORT_FUNCTION=
aixdynamic=no
hpuxdynamic=no
if test "$ac_cv_func_dlopen" != yes ||
@@ -1477,6 +1482,7 @@ if test "x$aixdynamic" = xyes; then
elif test "x$ac_cv_cygwin" = xyes; then
DL_EXT="${DL_EXT=dll}"
DLLD="${DLLD=dllwrap}"
+ DLLDFLAGS="${DLLDFLAGS=--export-all-symbols}"
zsh_cv_func_dlsym_needs_underscore=no
DLLDFLAGS=${DLLDFLAGS=}
EXTRA_LDFLAGS=${EXTRA_LDFLAGS=}
@@ -1486,6 +1492,10 @@ elif test "x$ac_cv_cygwin" = xyes; then
zsh_cv_sys_dynamic_strip_exe="${zsh_cv_sys_dynamic_strip_exe=yes}"
zsh_cv_sys_dynamic_strip_lib="${zsh_cv_sys_dynamic_strip_lib=yes}"
zsh_cv_sys_dynamic_broken="${zsh_cv_sys_dynamic_broken=no}"
+ LINKMODS=LINKMODS
+ MOD_EXPORT="__attribute__((__dllexport__))"
+ MOD_IMPORT_VARIABLE="__attribute__((__dllimport__))"
+ MOD_IMPORT_FUNCTION=
elif test "x$dynamic" = xyes; then
AC_CACHE_CHECK(if your system use ELF binaries,
zsh_cv_sys_elf,
@@ -1694,7 +1704,10 @@ AC_SUBST(EXTRA_LDFLAGS)dnl
AC_SUBST(EXPOPT)dnl
AC_SUBST(IMPOPT)dnl
AC_SUBST(L)dnl
-AC_SUBST(RTLD_GLOBAL_OK)dnl
+AC_SUBST(LINKMODS)dnl
+AC_SUBST(MOD_EXPORT)dnl
+AC_SUBST(MOD_IMPORT_VARIABLE)dnl
+AC_SUBST(MOD_IMPORT_FUNCTION)dnl
CLEAN_MK="${srcdir}/Config/clean.mk"
CONFIG_MK="${srcdir}/Config/config.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-09 05:45:58 +0000