[ruby-dev:2920] Re: experimental release 1.1b9_26

ども、白山@Stellarです。


In <[e-mail]> , [e-mail]  
(Yukihiro Matsumoto) said...
>
> やっとリリースします．
>

OPENSTEP 4.2J, NeXTSTEP3.3J では問題なく作成できました
・・・っといいたい所ですが、私のまぬけなミスを発見してし
まいました。

先のパッチに肝心のOPENSTEP向けの dln.cのコードを入れる
のを忘れておりました。・・・何の為にパッチを作ったのやら(^^;)
今回のパッチこそが OPENSTEP4.0以降の環境でダイナミック
ロードを実現するパッチです。

また、先日の NeXTSTEP3.3Jでの -mオプションを手動で入れて
ほしいという件ですが、これにも対応いたしました。

---
SHIROYAMA Takayuki : [e-mail]


diff -rcN ruby-1.1b9_26.org/Makefile.in ruby-1.1b9_26/Makefile.in
*** ruby-1.1b9_26.org/Makefile.in	Tue Jun 16 13:27:57 1998
--- ruby-1.1b9_26/Makefile.in	Thu Jun 18 19:06:57 1998
***************
*** 75,85 ****

  miniruby$(binsuffix):	$(OBJS) $(MAINOBJ) dmyext.o
  		@rm -f $@
! 		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(OBJS) dmyext.o  
$(LIBS) -o $@

  ruby$(binsuffix):     	$(LIBRUBY) $(MAINOBJ) $(EXTOBJS)
  		@rm -f $@
! 		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS)  
$(LIBRUBYARG) $(LIBS) -o $@

  libruby.a:	$(OBJS) dmyext.o
  		@AR@ rcu $@ $(OBJS) dmyext.o
--- 75,85 ----

  miniruby$(binsuffix):	$(OBJS) $(MAINOBJ) dmyext.o
  		@rm -f $@
! 		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(OBJS) dmyext.o  
$(LIBS) -o $@ @NeXT_MFLAG@

  ruby$(binsuffix):     	$(LIBRUBY) $(MAINOBJ) $(EXTOBJS)
  		@rm -f $@
! 		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS)  
$(LIBRUBYARG) $(LIBS) -o $@ @NeXT_MFLAG@

  libruby.a:	$(OBJS) dmyext.o
  		@AR@ rcu $@ $(OBJS) dmyext.o
diff -rcN ruby-1.1b9_26.org/configure.in ruby-1.1b9_26/configure.in
*** ruby-1.1b9_26.org/configure.in	Tue Jun 16 11:59:40 1998
--- ruby-1.1b9_26/configure.in	Thu Jun 18 20:23:53 1998
***************
*** 519,524 ****
--- 519,527 ----
      setup=Setup
      ;;
  esac
+
+
+
  AC_SUBST(binsuffix)
  AC_SUBST(setup)

***************
*** 527,533 ****
  fi

  if test "$fat_binary" = yes ; then
!   CFLAGS="$CFLAGS -pipe $ARCH_FLAG"
  fi

  LIBRUBY='libruby.a'
--- 530,536 ----
  fi

  if test "$fat_binary" = yes ; then
!   CFLAGS="$CFLAGS $ARCH_FLAG"
  fi

  LIBRUBY='libruby.a'
***************
*** 550,558 ****
    esac
  fi

! if test "$host_os" = "rhapsody" ; then
!     CFLAGS="$CFLAGS -no-precomp"
! fi


  AC_SUBST(LIBRUBY)
--- 553,574 ----
    esac
  fi

! NeXT_MFLAG=
! AC_SUBST(NeXT_MFLAG)dnl
! case "$host_os" in
! 	nextstep*)
! 		NeXT_MFLAG=" -m"
!     	CFLAGS="$CFLAGS -pipe"
! 		;;
! 	openstep*)
!     	CFLAGS="$CFLAGS -pipe"
! 		;;
! 	rhasody*)
!     	CFLAGS="$CFLAGS -pipe -no-precomp"
! 		;;
! 	*)
! 		;;	
! esac


  AC_SUBST(LIBRUBY)
diff -rcN ruby-1.1b9_26.org/defines.h ruby-1.1b9_26/defines.h
*** ruby-1.1b9_26.org/defines.h	Tue Jun 16 13:23:24 1998
--- ruby-1.1b9_26/defines.h	Thu Jun 18 21:07:15 1998
***************
*** 23,29 ****

  #ifdef NeXT
  #define DYNAMIC_ENDIAN		/* determine endian at runtime */
! #ifndef __Apple__
  #define S_IXUSR _S_IXUSR        /* execute/search permission, owner */
  #endif
  #define S_IXGRP 0000010         /* execute/search permission, group */
--- 23,29 ----

  #ifdef NeXT
  #define DYNAMIC_ENDIAN		/* determine endian at runtime */
! #ifndef __APPLE__
  #define S_IXUSR _S_IXUSR        /* execute/search permission, owner */
  #endif
  #define S_IXGRP 0000010         /* execute/search permission, group */
diff -rcN ruby-1.1b9_26.org/dln.c ruby-1.1b9_26/dln.c
*** ruby-1.1b9_26.org/dln.c	Mon Jun  8 18:30:17 1998
--- ruby-1.1b9_26/dln.c	Thu Jun 18 19:02:03 1998
***************
*** 1088,1094 ****
  #endif

  #ifdef NeXT
! /*#include <mach-o/rld.h>*/
  #endif

  #ifdef _WIN32
--- 1088,1098 ----
  #endif

  #ifdef NeXT
! #if NS_TARGET_MAJOR < 4
! #include <mach-o/rld.h>
! #else
! #include <mach-o/dyld.h>
! #endif
  #endif

  #ifdef _WIN32
***************
*** 1316,1321 ****
--- 1320,1326 ----
      Mi [e-mail],
      and... Miss ARAI Akino(^^;)
   ----------------------------------------------------*/
+ #if NS_TARGET_MAJOR < 4 /* NeXTSTEP rld functions */
      {
  	unsigned long init_address;
  	char *object_files[2] = {NULL, NULL};
***************
*** 1341,1346 ****
--- 1346,1387 ----
  	(*init_fct)();
  	return ;
      }
+ #else/* OPENSTEP dyld functions */
+ 	{
+ 	int dyld_result ;
+ 	NSObjectFileImage obj_file ; /* handle, but not use it */
+ 	/* "file" is module file name .
+ 	   "buf" is initial function name with "_" . */
+
+ 	void (*init_fct)();
+
+
+     dyld_result = NSCreateObjectFileImageFromFile( file, &obj_file );
+
+     if (dyld_result != NSObjectFileImageSuccess)
+     {
+ 	    LoadError("Failed to load %.200s", file);
+     }
+
+     NSLinkModule(obj_file, file, TRUE);
+
+
+ 	/* lookup the initial function */
+ 	 /*NSIsSymbolNameDefined require function name without "_" */
+     if( NSIsSymbolNameDefined( buf + 1 ) )
+     {
+ 	    LoadError("Failed to lookup Init function %.200s",file);
+ 	}
+
+ 	/* NSLookupAndBindSymbol require function name with "_" !! */
+
+ 	init_fct = NSAddressOfSymbol( NSLookupAndBindSymbol( buf ) );
+ 	(*init_fct)();
+
+
+ 	return ;
+     }
+ #endif /* rld or dyld */
  #endif

  #ifdef __BEOS__