Libsystem-88.3.4.tar.gz

diff --git a/GNUmakefile b/GNUmakefile
index b21054b43a37d00fd13ad79565943896edaa0c92..10d71828cdd7269746ec06c5f759ee74366948d9 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,7 +16,7 @@ no_target:
 # time (for the non-dylib files), and then call lipo to create fat files
 # for the three dylibs.
 ##---------------------------------------------------------------------
 # time (for the non-dylib files), and then call lipo to create fat files
 # for the three dylibs.
 ##---------------------------------------------------------------------

-ALLARCHS = hppa i386 m68k ppc ppc64 sparc
+ALLARCHS = hppa i386 m68k ppc ppc64 sparc x86_64

 NARCHS = $(words $(RC_ARCHS))
 USRLIB = /usr/lib
 
 NARCHS = $(words $(RC_ARCHS))
 USRLIB = /usr/lib
 

diff --git a/Info.plist b/Info.plist
index 5926bc46482d8b7f62937335e31a0144fefe41ca..f1516832af11c8f46f344b90aa0f62aa280ff99a 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>

-       <string>8.11</string>
+       <string>8.8</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CarbonLazyValues</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CarbonLazyValues</key>

diff --git a/Makefile b/Makefile
index 9e4b0df37851e6779fe2171e791ebc738d8d1e22..8b7bc07349a591adea8825fb79a54108d8e6bb29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,13 @@ MAKEFILE = library.make
 NEXTSTEP_INSTALLDIR = $(USRLIBDIR)
 WINDOWS_INSTALLDIR = /Library/Frameworks
 PDO_UNIX_INSTALLDIR = /Library/Frameworks
 NEXTSTEP_INSTALLDIR = $(USRLIBDIR)
 WINDOWS_INSTALLDIR = /Library/Frameworks
 PDO_UNIX_INSTALLDIR = /Library/Frameworks

+
+ifneq ($(filter %64,$(RC_ARCHS)),)
+LP64 = 1
+endif

 LIBS = -lc -lcommonCrypto -ldyldapis -linfo -lm -lmacho\
        -lnotify -lunc -lkeymgr
 LIBS = -lc -lcommonCrypto -ldyldapis -linfo -lm -lmacho\
        -lnotify -lunc -lkeymgr

-ifneq ($(RC_ARCHS),ppc64)
+ifndef LP64

 LIBS += -lstreams -lkvm -llaunch
 endif
 DEBUG_LIBS = $(LIBS)
 LIBS += -lstreams -lkvm -llaunch
 endif
 DEBUG_LIBS = $(LIBS)

diff --git a/Makefile.postamble b/Makefile.postamble
index 4a3ef50656644bf458c14ddd2e8605a2e131c54d..87e1f67e5a0f3f6dd2f6fa7c4913e279cd7846e1 100644 (file)
--- a/Makefile.postamble
+++ b/Makefile.postamble
@@ -60,12 +60,14 @@ comm-page-symbols: spinlock_stub.o spinlocktry_stub.o spinunlock_stub.o CommPage
 
 .SUFFIXES: .st
 
 
 .SUFFIXES: .st
 

+ALL_ARCHS = i386 ppc ppc64 x86_64

 SEG1ADDR_i386 = 0xffff0000
 SEG1ADDR_ppc = 0xffff8000
 SEG1ADDR_ppc64 = 0xffffffffffff8000
 SEG1ADDR_i386 = 0xffff0000
 SEG1ADDR_ppc = 0xffff8000
 SEG1ADDR_ppc64 = 0xffffffffffff8000

+SEG1ADDR_x86_64 = 0x00007fffffe00000

 SLFS_F_PH = /System/Library/Frameworks/System.framework/PrivateHeaders
 
 SLFS_F_PH = /System/Library/Frameworks/System.framework/PrivateHeaders
 

-$(OFILE_DIR)/%.ppc.o %.ppc.o $(OFILE_DIR)/%.ppc64.o %.ppc64.o $(OFILE_DIR)/%.i386.o %.i386.o: %.st
+$(foreach A,$(ALL_ARCHS),$(OFILE_DIR)/%.$(A).o %.$(A).o): %.st

        $(CC) -arch $(CURRENT_ARCH) -x assembler-with-cpp \
            -I$(SLFS_F_PH)/$(CURRENT_ARCH) \
            $(ALL_CFLAGS) -c -o $(OFILE_DIR)/commsym.$(CURRENT_ARCH).o $<
        $(CC) -arch $(CURRENT_ARCH) -x assembler-with-cpp \
            -I$(SLFS_F_PH)/$(CURRENT_ARCH) \
            $(ALL_CFLAGS) -c -o $(OFILE_DIR)/commsym.$(CURRENT_ARCH).o $<

diff --git a/Makefile.preamble b/Makefile.preamble
index 582ce097bc679e526745b3f70ea0e25cd6f3f774..a2973d25f791f8d168c8bb8675b107f42db64893 100644 (file)
--- a/Makefile.preamble
+++ b/Makefile.preamble
@@ -12,9 +12,11 @@ DEBUG_BUILD_LIBS := $(foreach LIBS, $(LIBS), $(LIBS)_debug  ) $(GCCLIBS)
 OTHER_LIBTOOL_FLAGS = $(OFILE_DIR)/spinlock_stub.o \
        $(OFILE_DIR)/spinlocktry_stub.o \
        $(OFILE_DIR)/spinunlock_stub.o \
 OTHER_LIBTOOL_FLAGS = $(OFILE_DIR)/spinlock_stub.o \
        $(OFILE_DIR)/spinlocktry_stub.o \
        $(OFILE_DIR)/spinunlock_stub.o \

-       -L/usr/lib/system -sub_library libmathCommon \
-       -lmathCommon -sectorder __TEXT __text System.order \
+       -L/usr/lib/system -sub_library libmathCommon -lmathCommon \

        -segcreate __DATA __commpage $(OFILE_DIR)/CommPageSymbols.o
        -segcreate __DATA __commpage $(OFILE_DIR)/CommPageSymbols.o

+ifndef LP64
+OTHER_LIBTOOL_FLAGS += -sectorder __TEXT __text System.order
+endif

 
 BSD_LIBS = c info kvm m pthread dbm poll dl rpcsvc
 
 
 BSD_LIBS = c info kvm m pthread dbm poll dl rpcsvc
 

diff --git a/spinlock_stub.s b/spinlock_stub.s
index cb364b8804e72b8b365bf29d610a51bc29e6fc7c..9d3b3aed34d12f8f555ed9d85bffb7d17a8634b8 100644 (file)
--- a/spinlock_stub.s
+++ b/spinlock_stub.s
@@ -51,7 +51,7 @@ L__spin_lock$lazy_ptr:
 L__spin_lock$stub:
         .indirect_symbol __spin_lock
         movl    $(_COMM_PAGE_SPINLOCK_LOCK), %eax
 L__spin_lock$stub:
         .indirect_symbol __spin_lock
         movl    $(_COMM_PAGE_SPINLOCK_LOCK), %eax

-        jmp     %eax
+        jmp     *%eax

         nop
         call    LPC$1
 LPC$1:  popl    %eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax

diff --git a/spinlocktry_stub.s b/spinlocktry_stub.s
index 5e1e88a1fab4ba2371844020ab420d09afa6aac8..0c2e437841f053368ab6a3365ea4788200da5eee 100644 (file)
--- a/spinlocktry_stub.s
+++ b/spinlocktry_stub.s
@@ -51,7 +51,7 @@ L__spin_lock_try$lazy_ptr:
 L__spin_lock_try$stub:
         .indirect_symbol __spin_lock_try
         movl    $(_COMM_PAGE_SPINLOCK_TRY), %eax
 L__spin_lock_try$stub:
         .indirect_symbol __spin_lock_try
         movl    $(_COMM_PAGE_SPINLOCK_TRY), %eax

-        jmp     %eax
+        jmp     *%eax

         nop
         call    LPC$1
 LPC$1:  popl    %eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax

diff --git a/spinunlock_stub.s b/spinunlock_stub.s
index d83cd05cf8f79c9cfba3933cb9bcc52db71493c0..58cd8636a6ddebbb6d8a23fdf3ac5f1ebbb954d3 100644 (file)
--- a/spinunlock_stub.s
+++ b/spinunlock_stub.s
@@ -51,7 +51,7 @@ L__spin_unlock$lazy_ptr:
 L__spin_unlock$stub:
         .indirect_symbol __spin_unlock
         movl    $(_COMM_PAGE_SPINLOCK_UNLOCK), %eax
 L__spin_unlock$stub:
         .indirect_symbol __spin_unlock
         movl    $(_COMM_PAGE_SPINLOCK_UNLOCK), %eax

-        jmp     %eax
+        jmp     *%eax

         nop
         call    LPC$1
 LPC$1:  popl    %eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax