[Openmcl-cvs-notifications] r15137 - in /trunk/source/lisp-kernel: arm-asmutils.s linuxarm/Makefile linuxppc/Makefile linuxppc64/Makefile linuxx8632/Makefile linuxx8664/Makefile ppc-asmutils.s x86-asmutils32.s x86-asmutils64.s
rme at clozure.com
rme at clozure.com
Wed Dec 14 10:47:01 CST 2011
Author: rme
Date: Wed Dec 14 10:47:01 2011
New Revision: 15137
Log:
In the Makefiles for the Linux ports, use the --no-as-needed
linker flag to ensure that the libraries that we specify
really get loaded for us.
Undo r15132 and r15133, which added references to external
symbols in libm to ensure that it was linked in. Also
remove a similar kludge of long standing in ppc-asmutils.s.
Modified:
trunk/source/lisp-kernel/arm-asmutils.s
trunk/source/lisp-kernel/linuxarm/Makefile
trunk/source/lisp-kernel/linuxppc/Makefile
trunk/source/lisp-kernel/linuxppc64/Makefile
trunk/source/lisp-kernel/linuxx8632/Makefile
trunk/source/lisp-kernel/linuxx8664/Makefile
trunk/source/lisp-kernel/ppc-asmutils.s
trunk/source/lisp-kernel/x86-asmutils32.s
trunk/source/lisp-kernel/x86-asmutils64.s
Modified: trunk/source/lisp-kernel/arm-asmutils.s
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/arm-asmutils.s (original)
+++ trunk/source/lisp-kernel/arm-asmutils.s Wed Dec 14 10:47:01 2011
@@ -193,8 +193,6 @@
__(mov lr,r3)
__(mov sp,r1)
__(bx ip)
- .globl C(sin)
- .long C(sin)
_endfn =
=
=
Modified: trunk/source/lisp-kernel/linuxarm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/linuxarm/Makefile (original)
+++ trunk/source/lisp-kernel/linuxarm/Makefile Wed Dec 14 10:47:01 2011
@@ -84,7 +84,7 @@
=
=
../../armcl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)
- $(CC) $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./armlinux.=
x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
+ $(CC) $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./armlinux.=
x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
=
=
$(SPOBJ): $(SPINC)
Modified: trunk/source/lisp-kernel/linuxppc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/linuxppc/Makefile (original)
+++ trunk/source/lisp-kernel/linuxppc/Makefile Wed Dec 14 10:47:01 2011
@@ -91,7 +91,7 @@
=
=
../../ppccl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)
- $(CC) $(PPC32) $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./e=
lf32ppclinux.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
+ $(CC) $(PPC32) $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./e=
lf32ppclinux.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLI=
BS)
=
=
$(SPOBJ): $(SPINC)
Modified: trunk/source/lisp-kernel/linuxppc64/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/linuxppc64/Makefile (original)
+++ trunk/source/lisp-kernel/linuxppc64/Makefile Wed Dec 14 10:47:01 2011
@@ -79,7 +79,7 @@
=
=
../../ppccl64: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)
- $(CC) -m64 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./elf6=
4ppc.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
+ $(CC) -m64 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./elf6=
4ppc.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
=
=
$(SPOBJ): $(SPINC)
Modified: trunk/source/lisp-kernel/linuxx8632/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/linuxx8632/Makefile (original)
+++ trunk/source/lisp-kernel/linuxx8632/Makefile Wed Dec 14 10:47:01 2011
@@ -74,7 +74,7 @@
USE_LINK_SCRIPT =3D # -T $(LINK_SCRIPT)
=
../../lx86cl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile $(LINK_SCRIPT)
- $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LIN=
K_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
+ $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LIN=
K_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
=
=
$(SPOBJ): $(SPINC)
Modified: trunk/source/lisp-kernel/linuxx8664/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/linuxx8664/Makefile (original)
+++ trunk/source/lisp-kernel/linuxx8664/Makefile Wed Dec 14 10:47:01 2011
@@ -74,7 +74,7 @@
USE_LINK_MAP =3D # -T ./elf_x86_64.x
=
../../lx86cl64: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile $(LINK_MAP)
- $(CC) -m64 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LIN=
K_MAP) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS)
+ $(CC) -m64 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LIN=
K_MAP) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
=
=
$(SPOBJ): $(SPINC)
Modified: trunk/source/lisp-kernel/ppc-asmutils.s
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/ppc-asmutils.s (original)
+++ trunk/source/lisp-kernel/ppc-asmutils.s Wed Dec 14 10:47:01 2011
@@ -53,19 +53,6 @@
__(sync)
__(isync)
__(blr)
-/* The strange reference to "exp" is supposed to force the kernel to */
-/* load libm, so lisp code can use it. Under Darwin, the functionality */
-/* of libm is contained in libsystem, along with libc & everything else. */
-
- __ifndef(`DARWIN')
- .data
- __ifdef(`PPC64')
- .quad C(exp)
- __else
- .long C(exp)
- __endif
- .text =
- __endif
_endfn
=
_exportfn(C(touch_page))
Modified: trunk/source/lisp-kernel/x86-asmutils32.s
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/x86-asmutils32.s (original)
+++ trunk/source/lisp-kernel/x86-asmutils32.s Wed Dec 14 10:47:01 2011
@@ -132,10 +132,6 @@
__(pop %esi)
__(pop %ebx)
__(ret)
- __ifndef(`DARWIN')
- .globl C(exp)
- .long C(exp)
- __endif
_endfn
=
/* switch_to_foreign_stack(new_sp, func, arg_0, arg_1, arg_2) */
Modified: trunk/source/lisp-kernel/x86-asmutils64.s
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/x86-asmutils64.s (original)
+++ trunk/source/lisp-kernel/x86-asmutils64.s Wed Dec 14 10:47:01 2011
@@ -147,10 +147,6 @@
__(popq %ctemp0) /* recover pecx */
__(movq %rcx,(%ctemp0))
__(ret)
- __ifndef(`DARWIN')
- .globl C(exp)
- .quad C(exp)
- __endif
_endfn
=
/* switch_to_foreign_stack(new_sp, func, arg_0, arg_1, arg_2, arg_3) */
@@ -180,7 +176,6 @@
__ifdef(`DARWIN')
_exportfn(C(darwin_sigreturn))
.globl C(sigreturn)
- =
/* Need to set the sigreturn 'infostyle' argument, which is mostly
undocumented. On x8664 Darwin, sigtramp() sets it to 0x1e, and
since we're trying to do what sigtramp() would do if we'd returned
More information about the Openmcl-cvs-notifications
mailing list