Update of /cvsroot/sbcl/sbcl/tools-for-build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12780/tools-for-build
Modified Files:
grovel-headers.c ldso-stubs.lisp
Log Message:
1.0.39.3: support building on darwin x86 and x86-64 without the dlshim
* x86 config -mmacosx-version-min cleanup
* remove dlshim feature in make-config.sh
* fix extern-alien-name and ldso naming conventions
* kludge in load-cold-foreign-symbol-table to strip off the leading
#\_ from the nm parsing
* change dependency on ldso stubs for dlopen and friends to be
#!-dlshim instead of #!-darwin
* remove Config.x86-64-darwin9+ and replace with makefile
conditionals
* add :dlshim feature for darwin in make-config.sh and rework the
darwin9+ stuff
* make grovel-headers.c load genesis/config.h first so that we can
use the LISP_FEATURE_xxx conditionals earlier
Index: grovel-headers.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/grovel-headers.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- grovel-headers.c 27 Nov 2009 16:59:30 -0000 1.39
+++ grovel-headers.c 3 Jun 2010 04:39:51 -0000 1.40
@@ -18,6 +18,8 @@
* more information.
*/
+#include "genesis/config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -34,12 +36,13 @@
#include <sys/wait.h>
#include <sys/ioctl.h>
#include <sys/termios.h>
- #ifdef __APPLE_CC__
- #include "../src/runtime/darwin-dlshim.h"
+ #ifdef LISP_FEATURE_DARWIN
#include "../src/runtime/darwin-langinfo.h"
+ #endif
+ #ifdef LISP_FEATURE_DLSHIM
+ #include "../src/runtime/darwin-dlshim.h"
#else
#include <dlfcn.h>
- #include <langinfo.h>
#endif
#endif
@@ -49,8 +52,6 @@
#include <signal.h>
#include <errno.h>
-#include "genesis/config.h"
-
#ifdef LISP_FEATURE_HPUX
#include <sys/bsdtty.h> /* for TIOCGPGRP */
#endif
Index: ldso-stubs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/ldso-stubs.lisp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ldso-stubs.lisp 21 Jan 2010 05:09:44 -0000 1.24
+++ ldso-stubs.lisp 3 Jun 2010 04:39:51 -0000 1.25
@@ -133,8 +133,8 @@
#define LDSO_STUBIFY(fct) \\
.text ; \\
.align 4 ; \\
-.globl _ldso_stub___ ## fct ; \\
-_ldso_stub___ ## fct: ; \\
+.globl _ldso_stub__ ## fct ; \\
+_ldso_stub__ ## fct: ; \\
jmp L ## fct ## $stub ; \\
.section __IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5 ; \\
L ## fct ## $stub: ; \\
@@ -150,8 +150,8 @@
#!+(and darwin x86-64) "
#define LDSO_STUBIFY(fct) \\
.align 4 ; \\
-.globl _ldso_stub___ ## fct ; \\
-_ldso_stub___ ## fct: ; \\
+.globl _ldso_stub__ ## fct ; \\
+_ldso_stub__ ## fct: ; \\
jmp _ ## fct ; \\
.L ## fct ## e1: ; "
@@ -324,7 +324,7 @@
"unlockpt")
#!+openbsd
'("openpty")
- #!-darwin
+ #!-dlshim
'("dlclose"
"dlerror"
"dlopen"
|