From 8081b39d8db5e99f2f2da733e4a1434787ba3387 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Wed, 16 Aug 2006 01:06:02 +0000
Subject: [PATCH] Libsystem-88.3.4.tar.gz

---
 GNUmakefile        | 2 +-
 Info.plist         | 2 +-
 Makefile           | 6 +++++-
 Makefile.postamble | 4 +++-
 Makefile.preamble  | 6 ++++--
 spinlock_stub.s    | 2 +-
 spinlocktry_stub.s | 2 +-
 spinunlock_stub.s  | 2 +-
 8 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index b21054b..10d7182 100644
--- 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.
 ##---------------------------------------------------------------------
-ALLARCHS = hppa i386 m68k ppc ppc64 sparc
+ALLARCHS = hppa i386 m68k ppc ppc64 sparc x86_64
 NARCHS = $(words $(RC_ARCHS))
 USRLIB = /usr/lib
 
diff --git a/Info.plist b/Info.plist
index 5926bc4..f151683 100644
--- a/Info.plist
+++ b/Info.plist
@@ -15,7 +15,7 @@
 	<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>
diff --git a/Makefile b/Makefile
index 9e4b0df..8b7bc07 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,13 @@ MAKEFILE = library.make
 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
-ifneq ($(RC_ARCHS),ppc64)
+ifndef LP64
 LIBS += -lstreams -lkvm -llaunch
 endif
 DEBUG_LIBS = $(LIBS)
diff --git a/Makefile.postamble b/Makefile.postamble
index 4a3ef50..87e1f67 100644
--- 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
 
+ALL_ARCHS = i386 ppc ppc64 x86_64
 SEG1ADDR_i386 = 0xffff0000
 SEG1ADDR_ppc = 0xffff8000
 SEG1ADDR_ppc64 = 0xffffffffffff8000
+SEG1ADDR_x86_64 = 0x00007fffffe00000
 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 $<
diff --git a/Makefile.preamble b/Makefile.preamble
index 582ce09..a2973d2 100644
--- 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 \
-	-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
+ifndef LP64
+OTHER_LIBTOOL_FLAGS += -sectorder __TEXT __text System.order
+endif
 
 BSD_LIBS = c info kvm m pthread dbm poll dl rpcsvc
 
diff --git a/spinlock_stub.s b/spinlock_stub.s
index cb364b8..9d3b3ae 100644
--- 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
-        jmp     %eax
+        jmp     *%eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax
diff --git a/spinlocktry_stub.s b/spinlocktry_stub.s
index 5e1e88a..0c2e437 100644
--- 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
-        jmp     %eax
+        jmp     *%eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax
diff --git a/spinunlock_stub.s b/spinunlock_stub.s
index d83cd05..58cd863 100644
--- 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
-        jmp     %eax
+        jmp     *%eax
         nop
         call    LPC$1
 LPC$1:  popl    %eax
-- 
2.47.2