From 29ab4251f721c64324202357310cba16aa34a2c0 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 16 Aug 2007 07:46:11 +0000 Subject: [PATCH] * configure.in (aix): enable shared by default. * configure.in (aix): for 64bit-mode AIX. [ruby-dev:31401] + use CC for LDSHARED if non-gcc, + moved -G option from *LDFLAGS to LDSHARED, + set -brtl only in XLDFLAGS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 64 +++++++++++++++++------------- configure.in | 10 ++--- ext/json/ext/generator/generator.c | 2 +- vm.c | 6 ++- 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5183cd4fa..12697c7cce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Aug 16 16:46:07 2007 Nobuyoshi Nakada + + * configure.in (aix): enable shared by default. + + * configure.in (aix): for 64bit-mode AIX. [ruby-dev:31401] + + use CC for LDSHARED if non-gcc, + + moved -G option from *LDFLAGS to LDSHARED, + + set -brtl only in XLDFLAGS. + Thu Aug 16 13:06:08 2007 Tanaka Akira * bignum.c (big_lshift): make shift offset long type. @@ -97,11 +106,12 @@ Tue Aug 14 19:51:20 2007 Koichi Sasada Tue Aug 14 00:04:27 2007 Kouhei Sutou - * lib/rss/rss.rb: 0.1.8 -> 0.1.9. - * test/rss/test_version.rb: followed the above change. + * lib/rss/rss.rb: 0.1.8 -> 0.1.9. + + * test/rss/test_version.rb: followed the above change. * lib/rss/parser.rb: fixed a bug that handles unintended elements. - Thanks to Takuo Yonezawa. [ruby-list:43841] + Thanks to Takuo Yonezawa. [ruby-list:43841] Mon Aug 13 17:23:10 2007 Nobuyoshi Nakada @@ -1020,7 +1030,7 @@ Fri Jul 6 19:55:10 2007 Keiju Ishitsuka * lib/irb.rb: typo. Thanks, Giles Bowkett. * lib/irb/completion.rb: support Ruby1.9 changing return value - String to Symbol for Object#methods, etc. [ruby-dev:31148]. + String to Symbol for Object#methods, etc. [ruby-dev:31148]. Fri Jul 6 18:20:50 2007 Koichi Sasada @@ -1779,7 +1789,7 @@ Thu Jun 21 20:36:12 2007 Yukihiro Matsumoto Thu Jun 21 20:28:05 2007 Yukihiro Matsumoto * hash.c (rb_hash_select): returns new hash, not assoc array. - [ruby-core:11504] + [ruby-core:11504] * hash.c (env_select): ditto. @@ -3915,13 +3925,13 @@ Sat Feb 24 10:49:55 2007 Koichi Sasada * parse.y, node.h, compile.c: change node tree structure. a purpose of this change is to unify argument structure of method and block. - this change prohibits duplicate block parameter name. - new argument infromation: - NODE_ARGS [m: int, o: NODE_OPT_ARG, ->] - NODE_ARGS_AUX [r: ID, b: ID, ->] - NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*] - optarg information: - NODE_OPT_ARGS [idx, expr, ->] + this change prohibits duplicate block parameter name. + new argument infromation: + NODE_ARGS [m: int, o: NODE_OPT_ARG, ->] + NODE_ARGS_AUX [r: ID, b: ID, ->] + NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*] + optarg information: + NODE_OPT_ARGS [idx, expr, ->] * vm_macro.def: ditto. @@ -4568,15 +4578,15 @@ Wed Feb 7 03:39:32 2007 Koichi Sasada Tue Feb 06 22:06:45 2007 NARUSE, Yui - * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}: - imported nkf 2007-01-28. - * Fixed: can't decode MIME encode JIS string. - * Fixed: Fullwitdh-halfwidth conversion. - * Support DoCoMo's and Softbank's EMOJI - * Support CP932, CP5022x, eucJP-ms UDC - * Support UTF-32 encoding - * Support beyond BMP - [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144] + * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}: + imported nkf 2007-01-28. + * Fixed: can't decode MIME encode JIS string. + * Fixed: Fullwitdh-halfwidth conversion. + * Support DoCoMo's and Softbank's EMOJI + * Support CP932, CP5022x, eucJP-ms UDC + * Support UTF-32 encoding + * Support beyond BMP + [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144] Tue Feb 6 20:36:19 2007 Kouhei Sutou @@ -4967,7 +4977,7 @@ Fri Jan 19 17:12:23 2007 Masaki Suketa * ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_VARIANT::Empty, WIN32OLE_VARIANT::Null, WIN32OLE_VARIANT::Nothing. - * test/win32ole/test_win32ole_variant.rb: ditto. + * test/win32ole/test_win32ole_variant.rb: ditto. * test/win32ole/test_nil2vtempty.rb(test_openSchema): ditto. @@ -4992,9 +5002,9 @@ Wed Jan 17 17:31:28 2007 Koichi Sasada * yarvcore.h, yarvcore.c: rename or remove some global variables removed: mYarvCore, mYarvInsns renamed: cYarvISeq -> rb_cISeq, - cYarvProc -> rb_cProc, cYarvBinding -> rb_cBinding + cYarvProc -> rb_cProc, cYarvBinding -> rb_cBinding ::YarvCore module is removed and ::YarvCore::VM class becomes ::VM. - And change/remove some functions which added with YARV. + And change/remove some functions which added with YARV. * compile.c: ditto. @@ -5315,8 +5325,8 @@ Tue Jan 2 10:29:54 2007 Eric Hodel Mon Jan 01 08:07:06 2007 Koichi Sasada * ext/tk/tcltklib.c: fix to compile on YARV - ruby_errinfo -> rb_errinfo(), - ruby_safe_level -> rb_safe_level(). + ruby_errinfo -> rb_errinfo(), + ruby_safe_level -> rb_safe_level(). Mon Jan 01 07:57:17 2007 Koichi Sasada @@ -6973,7 +6983,7 @@ Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto Wed Sep 13 16:43:36 2006 Yukihiro Matsumoto - * string.c (rb_str_intern): prohibit interning tainted string. + * string.c (rb_str_intern): prohibit interning tainted string. Wed Sep 13 01:14:02 2006 Nobuyoshi Nakada diff --git a/configure.in b/configure.in index effadc38fb..dfa56aaf32 100644 --- a/configure.in +++ b/configure.in @@ -1042,11 +1042,11 @@ if test "$with_dln_a_out" != yes; then aix*) if test "$GCC" = yes; then : ${LDSHARED='$(CC) -shared'} else - : ${LDSHARED='/usr/ccs/bin/ld'} + : ${LDSHARED='$(CC)'} fi - DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)' - LDFLAGS="${LDFLAGS} ${linker_flag}-brtl" - XLDFLAGS="${linker_flag}-bE:ruby.imp" + LDSHARED="$LDSHARED ${linker_flag}-G" + DLDFLAGS='-eInit_$(TARGET)' + XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl" : ${ARCHFILE="ruby.imp"} TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)' TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)' @@ -1359,7 +1359,7 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl' ;; aix*) - LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS" + LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS" LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' SOLIBS='-lm -lc' ;; diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index cc639f9a34..b08455f223 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -1,9 +1,9 @@ /* vim: set cin et sw=4 ts=4: */ -#include #include "ruby/ruby.h" #include "ruby/st.h" #include "unicode.h" +#include #include #define check_max_nesting(state, depth) do { \ diff --git a/vm.c b/vm.c index 48e738dcd3..e65918a4a9 100644 --- a/vm.c +++ b/vm.c @@ -237,11 +237,13 @@ vm_make_env_each(rb_thread_t *th, rb_control_frame_t *cfp, for (i = 0; i <= local_size; i++) { env->env[i] = envptr[-local_size + i]; - // dp(env->env[i]); +#if 0 + dp(env->env[i]); if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) { /* clear value stack for GC */ - // envptr[-local_size + i] = 0; + envptr[-local_size + i] = 0; } +#endif } *envptr = envval; /* GC mark */