Mercurial > hg > xemacs-beta

changeset 4851:5fea88c726f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 13 Jan 2010 13:17:02 -0600
parents 2727d0d8ef07 (current diff) 5eacb04a2e62 (diff)
children e0138eaaca0c
files ChangeLog src/s/cygwin.sc
diffstat 8 files changed, 20 insertions(+), 121 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jan 13 13:15:56 2010 -0600
+++ b/ChangeLog	Wed Jan 13 13:17:02 2010 -0600
@@ -1,3 +1,7 @@
+2010-01-13  Jerry James  <james@xemacs.org>
+
+	* configure.ac: Update comment about Cygwin and pdump.
+
 2010-01-13  Ben Wing  <ben@xemacs.org>
 
 	* Makefile.in.in (fix-perms):
--- a/configure.ac	Wed Jan 13 13:15:56 2010 -0600
+++ b/configure.ac	Wed Jan 13 13:17:02 2010 -0600
@@ -1442,7 +1442,7 @@
   case "$opsys" in
     linux* )  with_pdump=yes ;;          dnl glibc 2.3.1 seems to hose unexec
     darwin )  with_pdump=yes ;;          dnl No "native" working dumper available
-    cygwin* ) with_pdump=yes ;;          dnl unexec is broken
+    cygwin* ) with_pdump=yes ;;          dnl No "native" dumper available
     * )       with_pdump=no ;;
   esac
 fi
--- a/src/ChangeLog	Wed Jan 13 13:15:56 2010 -0600
+++ b/src/ChangeLog	Wed Jan 13 13:17:02 2010 -0600
@@ -1,3 +1,15 @@
+2010-01-13  Jerry James  <james@xemacs.org>
+
+	* font-mgr.c (Ffc_config_app_font_add_file): Fix parentheses.
+	(Ffc_config_app_font_add_dir): Ditto.
+
+2010-01-13  Jerry James  <james@xemacs.org>
+
+	* Makefile.in.in: Remove CYGWIN && !PDUMP section.
+	* depend: Regenerated.
+	* s/cygwin.sc: Removed.
+	* s/cygwin32.h (UNEXEC): Do not define.
+
 2010-01-13  Ben Wing  <ben@xemacs.org>
 
 	* print.c:
--- a/src/Makefile.in.in	Wed Jan 13 13:15:56 2010 -0600
+++ b/src/Makefile.in.in	Wed Jan 13 13:17:02 2010 -0600
@@ -391,10 +391,6 @@
 ldflags  = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags)
 #endif
 
-#if defined (CYGWIN) && !defined (PDUMP)
-ldflags += -Wl,--script=s/cygwin.sc
-#endif
-
 #ifdef SOLARIS2
 %.o : %.c
 #else
--- a/src/depend	Wed Jan 13 13:15:56 2010 -0600
+++ b/src/depend	Wed Jan 13 13:17:02 2010 -0600
@@ -239,7 +239,7 @@
 undo.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h dumper.h extents.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
 unexaix.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h getpagesize.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
 unexalpha.o: $(CONFIG_H) compiler.h
-unexcw.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h text.h vdb.h
+unexcw.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h intl-auto-encap-win32.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h syswindows.h text.h vdb.h
 unexec.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h getpagesize.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
 unexelf.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
 unexhp9k800.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
--- a/src/font-mgr.c	Wed Jan 13 13:15:56 2010 -0600
+++ b/src/font-mgr.c	Wed Jan 13 13:17:02 2010 -0600
@@ -783,7 +783,7 @@
   if (FcConfigAppFontAddFile
       (XFCCONFIG_PTR (config),
        /* #### FIXME! is Qfile_name right? */
-       (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (file, Qfile_name) == FcFalse)
+       (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (file, Qfile_name)) == FcFalse)
     return Qnil;
   else
     return Qt;
@@ -802,7 +802,7 @@
   if (FcConfigAppFontAddDir
       (XFCCONFIG_PTR (config),
        /* #### FIXME! is Qfile_name right? */
-       (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (dir), Qfile_name) == FcFalse)
+       (FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL (dir, Qfile_name)) == FcFalse)
     return Qnil;
   else
     return Qt;
--- a/src/s/cygwin.sc	Wed Jan 13 13:15:56 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT(pei-i386)
-SEARCH_DIR("/usr/i686-pc-cygwin/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/lib/w32api");
-ENTRY(_mainCRTStartup)
-SECTIONS
-{
-  .text  __image_base__ + __section_alignment__  :
-  {
-     *(.init)
-    *(.text)
-    *(SORT(.text$*))
-    *(.glue_7t)
-    *(.glue_7)
-     ___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
-			LONG (-1); *(SORT(.ctors.*)); *(.ctors); *(.ctor); LONG (0);
-     ___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
-			LONG (-1); *(SORT(.dtors.*)); *(.dtors); *(.dtor);  LONG (0);
-     *(.fini)
-    /* ??? Why is .gcc_exc here?  */
-     *(.gcc_exc)
-     etext = .;
-    *(.gcc_except_table)
-  }
-  /* The Cygwin32 library uses a section to avoid copying certain data
-     on fork.  This used to be named ".data".  The linker used
-     to include this between __data_start__ and __data_end__, but that
-     breaks building the cygwin32 dll.  Instead, we name the section
-     ".data_cygwin_nocopy" and explictly include it after __data_end__. */
-  .data BLOCK(__section_alignment__) :
-  {
-    __data_start__ = . ;
-    *(.data)
-    *(.data2)
-    *(SORT(.data$*))
-    __data_end__ = . ;
-    *(.data_cygwin_nocopy)
-  }
-  .bss BLOCK(__section_alignment__) :
-  {
-    __bss_start__ = . ;
-    *(.bss)
-    *(COMMON)
-    __bss_end__ = . ;
-  }
-  .rdata BLOCK(__section_alignment__) :
-  {
-    *(.rdata)
-    *(SORT(.rdata$*))
-    *(.eh_frame)
-    ___RUNTIME_PSEUDO_RELOC_LIST__ = .;
-    __RUNTIME_PSEUDO_RELOC_LIST__ = .;
-    *(.rdata_runtime_pseudo_reloc)
-    ___RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
-    __RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
-  }
-  .pdata BLOCK(__section_alignment__) :
-  {
-    *(.pdata)
-  }
-  .edata BLOCK(__section_alignment__) :
-  {
-    *(.edata)
-  }
-  /DISCARD/ :
-  {
-    *(.debug$S)
-    *(.debug$T)
-    *(.debug$F)
-    *(.drectve)
-  }
-  .idata BLOCK(__section_alignment__) :
-  {
-    /* This cannot currently be handled with grouped sections.
-	See pe.em:sort_sections.  */
-    SORT(*)(.idata$2)
-    SORT(*)(.idata$3)
-    /* These zeroes mark the end of the import list.  */
-    LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
-    SORT(*)(.idata$4)
-    SORT(*)(.idata$5)
-    SORT(*)(.idata$6)
-    SORT(*)(.idata$7)
-  }
-  .CRT BLOCK(__section_alignment__) :
-  {
-    *(SORT(.CRT$*))
-  }
-  .endjunk BLOCK(__section_alignment__) :
-  {
-    /* end is deprecated, don't use it */
-     end = .;
-     _end = .;
-     __end__ = .;
-  }
-  .rsrc BLOCK(__section_alignment__) :
-  {
-    *(.rsrc)
-    *(SORT(.rsrc$*))
-  }
-  .reloc BLOCK(__section_alignment__) :
-  {
-    *(.reloc)
-  }
-  .stab BLOCK(__section_alignment__) (NOLOAD) :
-  {
-    [ .stab ]
-  }
-  .stabstr BLOCK(__section_alignment__) (NOLOAD) :
-  {
-    [ .stabstr ]
-  }
-}
--- a/src/s/cygwin32.h	Wed Jan 13 13:15:56 2010 -0600
+++ b/src/s/cygwin32.h	Wed Jan 13 13:17:02 2010 -0600
@@ -74,7 +74,6 @@
 #define TEXT_START -1
 #define HEAP_IN_DATA
 #define NO_LIM_DATA
-#define UNEXEC "unexcw.o"
 
 #define BROKEN_SIGIO