[M3devel] LINUXLIBC6 problem

[Dragiša Durić]

Not too nice to reply to own message, but probably a time saver for
people upgrading to cvs-head:

--- /home/dragisha/cm3/bin/cm3.cfg	2007-04-19 22:20:00.000000000 +0200
+++ /usr/local/cm3/bin/cm3.cfg	2007-06-29 20:27:03.000000000 +0200
@@ -69,5 +69,5 @@
 % fixed the permissions.
 
-INSTALL_ROOT = "/home/dragisha/cm3"
+INSTALL_ROOT = "/usr/local/cm3"
 
 BIN_INSTALL   = INSTALL_ROOT & "/bin"        % executables
@@ -149,6 +149,6 @@
 
 proc m3_backend (source, object, optimize, debug) is
-  local args = [ "-quiet", source, "-o", object, "-fPIC" ]
-  if optimize  args += "-O"  end
+  local args = [ "-quiet", source, "-o", object, "-fPIC", "-m32", "-fno-reorder-blocks" ]
+  if optimize  args += "-O3"  end
   if debug     args += "-gstabs+"  end
   if M3_PROFILING args += "-p" end
@@ -169,5 +169,5 @@
 
 proc compile_c (source, object, options, optimize, debug) is
-  local args = [ "-fPIC", options ]
+  local args = [ "-m32", "-fPIC", options ]
   if optimize  args += "-O"  end
   if debug     args += "-gstabs+"  end
@@ -182,5 +182,5 @@
 
 proc assemble (source, object) is
-  return try_exec ("@" & SYSTEM_ASM, source, "-o", object)
+  return try_exec ("@" & SYSTEM_ASM, "--32", source, "-o", object)
 end
 
@@ -189,6 +189,4 @@
 % a library.
 
-GCWRAPFLAGS = "-Wl,--wrap,adjtime,--wrap,getdirentries,--wrap,readv,--wrap,utimes,--wrap,wait3"
-
 proc make_lib (lib, options, objects, imported_libs, shared) is
   local ret_code = 0
@@ -204,9 +202,9 @@
     % build the shared library
     if M3_PROFILING 
-      ret_code = try_exec ("@" & SYSTEM_CC, "-pg -shared " & GCWRAPFLAGS & 
+      ret_code = try_exec ("@" & SYSTEM_CC, "-pg -shared -m32 " &
                            "-Wl,-soname," & lib_sox,
                            "-o", lib_sox, objects)
     else
-      ret_code = try_exec ("@" & SYSTEM_CC, "-shared " & GCWRAPFLAGS & 
+      ret_code = try_exec ("@" & SYSTEM_CC, "-shared -m32 " &
                            "-Wl,-soname," & lib_sox,
                            "-o", lib_sox, objects)
@@ -260,9 +258,9 @@
   local args = []
   if M3_PROFILING args += "-pg" end
-  args += [ "-o", prog, "-fPIC", options, objects, imported_libs ]
+  args += [ "-m32", "-o", prog, "-fPIC", options, objects, imported_libs ]
   if shared
-    return try_exec ("@" & SYSTEM_CC, args, GCWRAPFLAGS)
+    return try_exec ("@" & SYSTEM_CC, args)
   else
-    return try_exec ("@" & SYSTEM_CC, "-static", args, GCWRAPFLAGS)
+    return try_exec ("@" & SYSTEM_CC, "-static", args)
     %%% -- see M3_NEED_STANDALONE_LINKS  below
     %%%return try_exec ("@" & SYSTEM_CC, args)

On Fri, 2007-06-29 at 20:20 +0200, Dragiša Durić wrote:
> This being non-trivial... Can you provide us with diff of your systems
> cm3.cfg before and after wrapper removal?
> 
> dd
> 
> On Fri, 2007-06-29 at 14:11 -0400, Tony Hosking wrote:
> > You need to update your cm3.cfg to match the most recent version in  
> > cm3/m3-sys/cminstall/src/config/LINUXLIBC6.
> > 
> > Wrapping of system calls is no longer needed (or supported) since the  
> > VM-synchronized GC has been discarded.
> > 
> > On Jun 29, 2007, at 11:31 AM, Daniel Alejandro Benavides D. wrote:
> > 
> > > Hi:
> > > Trying to compile the last  updated sources from cvs
> > > repository, I get this with do-cm3.std.sh buildship,
> > > I have done the do-cm3-std.sh realclean before:
> > >
> > >  -> archiving libm3tools.a
> > > --- shipping from LINUXLIBC6 ---
> > >
> > > . => /usr/local/cm3-cvs/pkg/m3tools/LINUXLIBC6
> > >   .M3EXPORTS        libm3tools.a      libm3tools.m3x
> > >  .M3WEB
> > > ../src => /usr/local/cm3-cvs/pkg/m3tools/src
> > >   M3Lexer.i3        M3Lexer.m3        M3AST.i3
> > >  M3AST.m3
> > >   M3Parse.m3        M3Scope.i3        M3Scope.m3
> > >  M3Type.i3
> > >   M3Type.m3         M3Const.m3        M3Const.i3
> > >  M3SetVal.i3
> > >   M3SetVal.m3       M3RecVal.i3       M3RecVal.m3
> > >  M3ArrVal.i3
> > >   M3ArrVal.m3       M3Builtin.i3      M3Builtin.m3
> > >  ==> /home/danielb/cm3-cvs/cm3/m3-sys/m3tools done
> > >
> > > === package /home/danielb/cm3-cvs/cm3/m3-sys/m3cgcat
> > > ===
> > >  +++ /usr/local/cm3-cvs/bin/cm3 -build
> > > -DROOT='/home/danielb/cm3-cvs/cm3'  &&
> > > /usr/local/cm3-cvs/bin/cm3 -ship
> > > -DROOT='/home/danielb/cm3-cvs/cm3'  +++
> > > --- building in LINUXLIBC6 ---
> > >
> > > ignoring ../src/m3overrides
> > >
> > > new source -> compiling Main.m3
> > >  -> linking m3cgcat
> > > /usr/local/cm3-cvs/pkg/libm3/LINUXLIBC6/libm3.a(FSPosix.mo):
> > > In function `FS__SetModificationTime':FSPosix.m3:345:
> > > undefined reference to `__wrap_utimes'
> > > collect2: ld returned 1 exit status
> > > Fatal Error: package build failed
> > >  *** execution of  failed ***
> > > danielb at danielb-desktop:~/cm3-cvs/cm3/scripts$
> > >
> > >
> > >
> > > Thanks
> > >
> > >
> > >
> > > ______________________________________________________________________ 
> > > ______________
> > > ¡Descubre una nueva forma de obtener respuestas a tus preguntas!
> > > Entra en Yahoo! Respuestas.
> > > http://es.answers.yahoo.com/info/welcome
> > 
-- 
Dragiša Durić <dragisha at m3w.org>