DLD patch
Michael Koehne
kraehe at bakunin.north.de
Sat Dec 13 17:25:47 PST 1997
Moin Gurus,
this is a shell archive produced by shell version control.
Apply it against a clean kaffe-092, with epfl from the 091
version. Tell me if it breaks anything in other environments,
so that I can patch the patch and we can come up with working
dld/aout support in 0.93.
#!/bin/sh
echo Patching kaffe-0.9.2/configure.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/configure.in~ Sat Oct 4 10:26:53 1997
X--- kaffe-0.9.2/configure.in Sat Dec 13 05:30:48 1997
X***************
X*** 59,64 ****
X--- 59,75 ----
X AC_MSG_ERROR(This version of Linux is not supported)
X ;;
X
X+ i[3456]86-linuxaout)
X+ host_cpu=i386
X+ host_os=linux
X+ LIBEXT=.a
X+ if test "$dynamic_libraries" = "yes"; then
X+ LIBSHARE=-r
X+ LIBEXT=.o
X+ vm_dynamic_library=no
X+ fi
X+ ;;
X+
X i[3456]86-linux*)
X host_cpu=i386
X host_os=linux
X***************
X*** 424,429 ****
X--- 435,445 ----
X if test "$dynamic_libraries" = "no" ; then
X KAFFEVMFLAGS="-DNO_SHARED_LIBRARIES"
X LIBEXT=".a"
X+ elif test "$vm_dynamic_library" = "no" ; then
X+ KAFFEVMFLAGS="$KAFFEVMFLAGS -DDLD_SHARED"
X+ LINKLIB='$(LD) $(LDFLAGS) -o $(LIB) $(OBJECT)'
X+ LIBEXT=".o"
X+ OBJEXT=".o"
X fi
X if test "$OBJEXT" = "" ; then
X OBJEXT=".o"
X***************
X*** 1005,1013 ****
X dnl If we have share libraries, cancel all the non-shared ones.
X dnl Otherwise, add on the machine again to help linking.
X if test "$dynamic_libraries" = "yes" ; then
X! NOSHAREDLIBS="-L../kaffevm -lkaffevm"
X else
X! NOSHAREDLIBS="-L../kaffevm -lkaffevm $NOSHAREDLIBS -lkaffevm $LIBS"
X PIC=""
X PICVM=""
X LIBSHARE=""
X--- 1021,1029 ----
X dnl If we have share libraries, cancel all the non-shared ones.
X dnl Otherwise, add on the machine again to help linking.
X if test "$dynamic_libraries" = "yes" ; then
X! NOSHAREDLIBS="-L../kaffevm -lkaffe_vm"
X else
X! NOSHAREDLIBS="-L../kaffevm -lkaffe_vm $NOSHAREDLIBS -lkaffe_vm $LIBS"
X PIC=""
X PICVM=""
X LIBSHARE=""
X***************
X*** 1018,1024 ****
X LINKVMLIB='ld -r -o $(LIB) $(OBJECT)'
X PICVM=""
X LIBVMEXT=.o
X! NOSHAREDLIBS="../kaffevm/libkaffevm.o $VM_LIBRARIES $STD_LIBRARIES"
X else
X LINKVMLIB=$LINKLIB
X PICVM=$PIC
X--- 1034,1040 ----
X LINKVMLIB='ld -r -o $(LIB) $(OBJECT)'
X PICVM=""
X LIBVMEXT=.o
X! NOSHAREDLIBS="../kaffevm/libkaffe_vm.o $VM_LIBRARIES $STD_LIBRARIES"
X else
X LINKVMLIB=$LINKLIB
X PICVM=$PIC
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/config/i386/trampolines.c
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/config/i386/trampolines.c~ Sat Sep 20 00:04:49 1997
X--- kaffe-0.9.2/config/i386/trampolines.c Sat Dec 13 04:50:10 1997
X***************
X*** 33,39 ****
X #define C_FUNC_NAME(FUNC) #FUNC
X #endif
X
X! #if defined(NO_SHARED_LIBRARIES)
X
X asm(
X START_ASM_FUNC() C_FUNC_NAME(i386_do_fixup_trampoline) "\n"
X--- 33,39 ----
X #define C_FUNC_NAME(FUNC) #FUNC
X #endif
X
X! #if defined(NO_SHARED_LIBRARIES) || defined(DLD_SHARED)
X
X asm(
X START_ASM_FUNC() C_FUNC_NAME(i386_do_fixup_trampoline) "\n"
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/include/native.h
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/include/native.h~ Thu Jun 12 13:11:34 1997
X--- kaffe-0.9.2/include/native.h Sat Dec 13 04:50:10 1997
X***************
X*** 67,72 ****
X--- 67,76 ----
X extern void classname2pathname(char*, char*);
X
X /* Redirect the malloc/free functions */
X+ #undef malloc
X+ #undef calloc
X+ #undef free
X+
X extern void* gc_malloc_fixed(size_t);
X extern void gc_free(void*);
X
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/kaffe/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/kaffe/Makefile.in~ Thu Jun 26 15:24:15 1997
X--- kaffe-0.9.2/kaffe/Makefile.in Sat Dec 13 04:50:11 1997
X***************
X*** 9,15 ****
X
X @VPATHOPT@= @srcdir@
X
X! subdirs= kaffevm kaffe kaffeh scripts man
X
X all:
X @for i in $(subdirs); do (cd $$i && $(MAKE) all) || exit 1 ; done
X--- 9,15 ----
X
X @VPATHOPT@= @srcdir@
X
X! subdirs= kaffevm kaffe kaffeh man # scripts
X
X all:
X @for i in $(subdirs); do (cd $$i && $(MAKE) all) || exit 1 ; done
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/kaffe/kaffevm/external.c
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/kaffe/kaffevm/external.c~ Sat Oct 4 10:26:59 1997
X--- kaffe-0.9.2/kaffe/kaffevm/external.c Sat Dec 13 04:50:11 1997
X***************
X*** 10,17 ****
X * Written by Tim Wilkinson <tim at tjwassoc.demon.co.uk>, 1996.
X */
X
X! #define DBG(s)
X! #define LDBG(s)
X
X #include "config.h"
X #include "config-std.h"
X--- 10,17 ----
X * Written by Tim Wilkinson <tim at tjwassoc.demon.co.uk>, 1996.
X */
X
X! #define DBG(s) s
X! #define LDBG(s) s
X
X #include "config.h"
X #include "config-std.h"
X***************
X*** 105,110 ****
X--- 105,112 ----
X libraryPath = gc_malloc_fixed(strlen(ptr) + 1);
X strcpy(libraryPath, ptr);
X
X+ LDBG( fprintf(stderr, "initNative: LIBRARYINIT\n"); )
X+
X LIBRARYINIT();
X
X /* Find the default library */
X***************
X*** 126,136 ****
X strcat(lib, NATIVELIBRARY);
X strcat(lib, LIBRARYSUFFIX);
X
X if (loadNativeLibrary(lib) != -1) {
X return;
X }
X }
X! fprintf(stderr, "Failed to locate native library in path:\n");
X fprintf(stderr, "\t%s\n", libraryPath);
X fprintf(stderr, "Aborting.\n");
X fflush(stderr);
X--- 128,141 ----
X strcat(lib, NATIVELIBRARY);
X strcat(lib, LIBRARYSUFFIX);
X
X+ LDBG( fprintf(stderr, "initNative: loadNativeLibrary(%s)\n",lib); )
X+
X if (loadNativeLibrary(lib) != -1) {
X return;
X }
X+ LDBG( fprintf(stderr, "loading %s failed\n", lib); )
X }
X! fprintf(stderr, "Failed to locate native library (%s) in path:\n",lib);
X fprintf(stderr, "\t%s\n", libraryPath);
X fprintf(stderr, "Aborting.\n");
X fflush(stderr);
X***************
X*** 148,153 ****
X--- 153,161 ----
X int
X loadNativeLibrary(char* lib)
X {
X+
X+ #if !defined(NO_SHARED_LIBRARIES) && !defined(HAVE_LIBDLD)
X+
X int i;
X int j;
X
X***************
X*** 179,184 ****
X--- 187,210 ----
X libHandle[i].name = gc_malloc_fixed(strlen(lib) + 1);
X strcpy(libHandle[i].name, lib);
X
X+ #endif
X+ #if !defined(NO_SHARED_LIBRARIES) && defined(HAVE_LIBDLD)
X+
X+ int rv;
X+
X+ if ((rv = dld_link(lib))) {
X+ if (rv == DLD_EMULTDEFS) {
X+ LDBG( fprintf(stderr,"dld_link: dld_link(%s) Warning, multiple defs.\n", lib); )
X+ } else
X+ if (rv == DLD_ENOFILE) {
X+ LDBG( fprintf(stderr,"dld_link: dld_link(%s) failed: ", lib); )
X+ return(-1);
X+ }
X+ }
X+
X+ #endif
X+
X+ LDBG( fprintf(stderr,"Library load (%s) success\n", lib); )
X return (0);
X }
X
X***************
X*** 247,249 ****
X--- 273,348 ----
X {
X return (libraryPath);
X }
X+
X+ #ifdef HAVE_LIBDLD
X+
X+ #define LIBX_FILE "/usr/X11R6/lib/libX11.a"
X+ #define LIBC_FILE "/usr/lib/libc.a"
X+ #define LIBM_FILE "/usr/lib/libm.a"
X+
X+ PTR dld_resolve(char *func_name)
X+ {
X+ int rv, i;
X+ char **undef_syms;
X+ PTR ptr;
X+ char *p,*q;
X+
X+ ptr=dld_get_func(func_name);
X+ if (!ptr) {
X+ fprintf(stderr,"dld_resolve: %s failed\n", func_name);
X+ fprintf(stderr,"dld_resolve: Abort ! Dont wana swap dead !\n");
X+ exit(-1);
X+ }
X+
X+ if (dld_function_executable_p(func_name)) {
X+ /*** function contains no unresolved symbols ***/
X+ return(ptr);
X+ }
X+
X+ DBG( fprintf(stderr,"dld_resolve: resolving(%s)\n",func_name); )
X+
X+ p=getenv("LD_DLD_KAFFE");
X+
X+ if (!p) {
X+ fprintf(stderr,"dld_resolve: please set your environment\n");
X+ fprintf(stderr,"\tLD_DLD_KAFFE=/usr/lib/libX11.a:/usr/lib/libm.a:/usr/lib/libc.a\n");
X+ fprintf(stderr,"dld_resolve: Abort ! Dont wana swap dead !\n");
X+ exit(-1);
X+ }
X+
X+ DBG( fprintf(stderr,"dld_resolve: using lib(%s)\n",p); )
X+
X+ while (p && *p) {
X+ q=strchr(p,':');
X+ if (q) *q=0;
X+ if ((rv = dld_link(p))) {
X+ if (rv == DLD_EMULTDEFS) {
X+ fprintf(stderr,"dld_resolve: dld_link(%s) Warning, multiple defs.\n", p);
X+ } else
X+ if (rv == DLD_ENOFILE) {
X+ fprintf(stderr,"dld_resolve: dld_link(%s) failed: NOFILE", p);
X+ fprintf(stderr,"dld_resolve: Abort ! Dont wana swap dead !\n");
X+ exit(-1);
X+ }
X+ }
X+ DBG( fprintf(stderr,"dld_resolve: dld_link(%s) ok\n", p); )
X+ if (dld_function_executable_p(func_name)) return(ptr);
X+ if (q) *q++=':';
X+ p=q;
X+ }
X+
X+ DBG( fprintf(stderr,"dld_resolve: no other libs, giving up\n"); )
X+ if ((undef_syms = dld_list_undefined_sym()) != (char **)NULL) {
X+ fprintf(stderr, "dld_resolve: Error, undefined symbols remain:\n");
X+
X+ if ((undef_syms = dld_list_undefined_sym()) == (char **)NULL) {
X+ fprintf(stderr, "dld_resolve: Error, can't find unresolved symbols.\n");
X+ }
X+ for (i=0; i<dld_undefined_sym_count; i++) {
X+ fprintf(stderr, "\t<%s>\n", undef_syms[i]);
X+ }
X+ }
X+ fprintf(stderr,"dld_resolve: Abort ! Dont wana swap dead !\n");
X+ exit(-1);
X+ }
X+ #endif HAVE_LIBDLD
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/kaffe/kaffevm/slib.h
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/kaffe/kaffevm/slib.h~ Sat Sep 20 00:05:50 1997
X--- kaffe-0.9.2/kaffe/kaffevm/slib.h Sat Dec 13 04:50:12 1997
X***************
X*** 120,139 ****
X * GNU style shared library interface.
X */
X #if defined(HAVE_LIBDLD) && !defined(HAVE_DLFCN_H)
X #define LIBRARYINIT() \
X { \
X static int init_dld = 0; \
X if (init_dld == 0) { \
X init_dld = 1; \
X if (dld_init("/usr/local/bin/kaffe") != 0) { \
X! return (-1); \
X } \
X } \
X }
X #define LIBRARYLOAD(HAND, LIB) \
X! HAND = !dld_link(LIB)
X #define LIBRARYFUNCTION(FUNC, SYM) \
X! FUNC = dld_get_func(SYM)
X #define LIBRARYHANDLE int
X #define LIBRARYERROR() "No specific error support"
X #endif
X--- 120,144 ----
X * GNU style shared library interface.
X */
X #if defined(HAVE_LIBDLD) && !defined(HAVE_DLFCN_H)
X+ #include <dld.h>
X+ extern PTR dld_resolve(char *);
X #define LIBRARYINIT() \
X { \
X static int init_dld = 0; \
X if (init_dld == 0) { \
X init_dld = 1; \
X if (dld_init("/usr/local/bin/kaffe") != 0) { \
X! fprintf(stderr, "dld_init() failed\n"); \
X! fprintf(stderr, "Aborting.\n"); \
X! fflush(stderr); \
X! exit(1); \
X } \
X } \
X }
X #define LIBRARYLOAD(HAND, LIB) \
X! HAND=!dld_link(LIB)
X #define LIBRARYFUNCTION(FUNC, SYM) \
X! FUNC=(PTR) dld_resolve(SYM);
X #define LIBRARYHANDLE int
X #define LIBRARYERROR() "No specific error support"
X #endif
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/epfl.ch/APIawt/lib/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/epfl.ch/APIawt/lib/Makefile.in~ Wed Apr 16 08:11:28 1997
X--- kaffe-0.9.2/packages/epfl.ch/APIawt/lib/Makefile.in Sat Dec 13 06:00:04 1997
X***************
X*** 8,13 ****
X--- 8,14 ----
X LN= @LN_S@
X CC= @CC@
X LD= @LD@
X+ AR= @AR@
X RANLIB= @RANLIB@
X PIC= @PIC@
X LDFLAGS= @LIBSHARE@
X***************
X*** 20,27 ****
X LIBS= @LIBS@
X
X SAWTREV= 0.42
X! LIBNAME= sawt
X! LIB= libkaffe_$(LIBNAME)$(LIBEXT).$(SAWTREV)
X
X #ifdef JPEG
X # JPEGINC =
X--- 21,29 ----
X LIBS= @LIBS@
X
X SAWTREV= 0.42
X! LIBNAME= libkaffe_sawt
X! LIB= $(LIBNAME)$(LIBEXT).$(SAWTREV)
X! LLIB= $(LIBNAME)$(LIBEXT)
X
X #ifdef JPEG
X # JPEGINC =
X***************
X*** 30,36 ****
X # JPEGOBJ = readJPEG.o
X #endif
X
X! OBJECTS = XDisplay.o \
X XWindow.o \
X XGraphics.o \
X XFonts.o\
X--- 32,38 ----
X # JPEGOBJ = readJPEG.o
X #endif
X
X! OBJECT = XDisplay.o \
X XWindow.o \
X XGraphics.o \
X XFonts.o\
X***************
X*** 40,48 ****
X kaffe_awt_simple_NativeGraphics.o \
X kaffe_awt_simple_NativeFontMetrics.o
X
X! all: $(LIB)
X
X! $(LIB): $(OBJECTS)
X @LINKLIB@
X
X .c$(OBJEXT):
X--- 42,54 ----
X kaffe_awt_simple_NativeGraphics.o \
X kaffe_awt_simple_NativeFontMetrics.o
X
X! all: $(LLIB)
X
X! $(LLIB): $(LIB)
X! rm -f $(LLIB)
X! $(LN) $(LIB) $(LLIB)
X!
X! $(LIB): $(OBJECT)
X @LINKLIB@
X
X .c$(OBJEXT):
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/tjwassoc.co.uk/APIcore/lib/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/tjwassoc.co.uk/APIcore/lib/Makefile.in~ Sun Sep 28 13:58:16 1997
X--- kaffe-0.9.2/packages/tjwassoc.co.uk/APIcore/lib/Makefile.in Sat Dec 13 05:02:13 1997
X***************
X*** 32,38 ****
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libnative
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X--- 32,38 ----
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libkaffe_native
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X***************
X*** 89,98 ****
X Array$(OBJEXT) \
X ConstructorStub$(OBJEXT) \
X Constructor$(OBJEXT) \
X- FieldStub$(OBJEXT) \
X Field$(OBJEXT) \
X MethodStub$(OBJEXT) \
X Method$(OBJEXT)
X
X OBJECT.UTIL=\
X ResourceBundleStub$(OBJEXT) \
X--- 89,100 ----
X Array$(OBJEXT) \
X ConstructorStub$(OBJEXT) \
X Constructor$(OBJEXT) \
X Field$(OBJEXT) \
X MethodStub$(OBJEXT) \
X Method$(OBJEXT)
X+
X+ OBJECT.STILL.BROKEN=\
X+ FieldStub$(OBJEXT)
X
X OBJECT.UTIL=\
X ResourceBundleStub$(OBJEXT) \
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/kaffe/kaffevm/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/kaffe/kaffevm/Makefile.in~ Sat Oct 4 10:26:57 1997
X--- kaffe-0.9.2/kaffe/kaffevm/Makefile.in Sat Dec 13 04:59:29 1997
X***************
X*** 33,39 ****
X CFLAGS= @CFLAGS@
X ALL_CFLAGS= $(CFLAGS) @KAFFEVMFLAGS@ $(INCLUDES) $(ENGINE_CFLAGS) -DKVER=\"$(KVER)\"
X
X! LIBNAME= libkaffevm
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X--- 33,39 ----
X CFLAGS= @CFLAGS@
X ALL_CFLAGS= $(CFLAGS) @KAFFEVMFLAGS@ $(INCLUDES) $(ENGINE_CFLAGS) -DKVER=\"$(KVER)\"
X
X! LIBNAME= libkaffe_vm
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/tjwassoc.co.uk/APIagent/lib/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/tjwassoc.co.uk/APIagent/lib/Makefile.in~ Sun Sep 21 22:58:49 1997
X--- kaffe-0.9.2/packages/tjwassoc.co.uk/APIagent/lib/Makefile.in Sat Dec 13 05:01:45 1997
X***************
X*** 32,38 ****
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libagent
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X--- 32,38 ----
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libkaffe_agent
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/tjwassoc.co.uk/APInet/lib/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/tjwassoc.co.uk/APInet/lib/Makefile.in~ Sun Sep 28 13:58:48 1997
X--- kaffe-0.9.2/packages/tjwassoc.co.uk/APInet/lib/Makefile.in Sat Dec 13 05:02:36 1997
X***************
X*** 32,38 ****
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libnet
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X--- 32,38 ----
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libkaffe_net
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/tjwassoc.co.uk/APIzip/lib/Makefile.in
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/tjwassoc.co.uk/APIzip/lib/Makefile.in~ Sun Sep 21 22:59:08 1997
X--- kaffe-0.9.2/packages/tjwassoc.co.uk/APIzip/lib/Makefile.in Sat Dec 13 05:02:56 1997
X***************
X*** 32,38 ****
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libzip
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
X--- 32,38 ----
X OBJEXT= @OBJEXT@
X LIBEXT= @LIBEXT@
X
X! LIBNAME= libkaffe_zip
X LIB= $(LIBNAME)$(LIBEXT).$(KVER)
X LLIB= $(LIBNAME)$(LIBEXT)
X
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/epfl.ch/external_wrappers.h
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/epfl.ch/external_wrappers.h~ Wed Apr 16 08:11:27 1997
X--- kaffe-0.9.2/packages/epfl.ch/external_wrappers.h Sat Dec 13 05:54:50 1997
X***************
X*** 27,33 ****
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_reshapeWindow)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_selectEvents)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setTitle)
X! KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setcursorType)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setBackground)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setInputFocus)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_raiseWindow)
X--- 27,33 ----
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_reshapeWindow)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_selectEvents)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setTitle)
X! /*KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setcursorType)*/
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setBackground)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_setInputFocus)
X KAFFE_NATIVE(kaffe_awt_simple_NativeDisplay_raiseWindow)
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.c
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.c~ Wed Apr 16 08:11:28 1997
X--- kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.c Sat Dec 13 05:59:07 1997
X***************
X*** 126,137 ****
X--- 126,139 ----
X }
X
X /* SYMBOL: kaffe_awt_simple_NativeDisplay_setcursorType(Lkaffe/awt/simple/NativeWindow;)V */
X+ /*
X void
X Kaffe_kaffe_awt_simple_NativeDisplay_setcursorType_stub(stack_item* _P_, stack_item* _R_)
X {
X extern void kaffe_awt_simple_NativeDisplay_setcursorType(void*, void*);
X kaffe_awt_simple_NativeDisplay_setcursorType(_P_[1].p, _P_[0].p);
X }
X+ */
X
X /* SYMBOL: kaffe_awt_simple_NativeDisplay_setBackground(Lkaffe/awt/simple/NativeWindow;)V */
X void
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.h
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.h~ Wed Apr 16 08:11:28 1997
X--- kaffe-0.9.2/packages/epfl.ch/APIawt/lib/kaffe_awt_simple_NativeDisplay.h Sat Dec 13 05:57:57 1997
X***************
X*** 34,40 ****
X--- 34,42 ----
X extern void kaffe_awt_simple_NativeDisplay_reshapeWindow(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X extern void kaffe_awt_simple_NativeDisplay_selectEvents(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X extern void kaffe_awt_simple_NativeDisplay_setTitle(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X+ /*
X extern void kaffe_awt_simple_NativeDisplay_setcursorType(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X+ */
X extern void kaffe_awt_simple_NativeDisplay_setBackground(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X extern void kaffe_awt_simple_NativeDisplay_setInputFocus(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
X extern void kaffe_awt_simple_NativeDisplay_raiseWindow(struct Hkaffe_awt_simple_NativeDisplay*, struct Hkaffe_awt_simple_NativeWindow*);
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
echo Patching kaffe-0.9.2/kaffe/kaffevm/external.h
echo File /tmp/svc_diff
sed '/^X/s///' > /tmp/svc_diff << '/'
X*** kaffe-0.9.2/kaffe/kaffevm/external.h~ Thu Oct 2 21:06:20 1997
X--- kaffe-0.9.2/kaffe/kaffevm/external.h Sat Dec 13 23:32:29 1997
X***************
X*** 21,27 ****
X #if !defined(LIBRARYPATH)
X #define LIBRARYPATH "LD_LIBRARY_PATH"
X #endif
X! #define NATIVELIBRARY "libnative"
X
X /*
X * Define the Kaffe function call routine.
X--- 21,27 ----
X #if !defined(LIBRARYPATH)
X #define LIBRARYPATH "LD_LIBRARY_PATH"
X #endif
X! #define NATIVELIBRARY "libkaffe_native"
X
X /*
X * Define the Kaffe function call routine.
/
patch < /tmp/svc_diff
rm /tmp/svc_diff
exit 0
--
mailto:kraehe at bakunin.north.de http://human.is-bremen.de/~kraehe
" CETERUM CENSEO MSDOS ESSE DELENDAM "
More information about the kaffe
mailing list