src/lisp/Config.x86_darwin

@@ -2,7 +2,8 @@
 
 include Config.x86_common
 
-# Compile code that will run on OSX 10.5 (Tiger)
+# Compile code that will run on OSX 10.5 (Tiger).  This only works if
+# you have the 10.5 SDK available.
 MIN_VER = -mmacosx-version-min=10.5
 
 CPPFLAGS += -DDARWIN $(MIN_VER) -m32
@@ -13,7 +14,10 @@ ASFLAGS += -g3 $(MIN_VER)
 UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
 
 OS_SRC += Darwin-os.c mach-o.c
-OS_LINK_FLAGS = -m32 $(MIN_VER)
+
+# Turn off the PIE warning; we know the x86-assem.S is not
+# relocatable, and we're not going to fix that anytime soon.
+OS_LINK_FLAGS = -m32 $(MIN_VER) -Wl,-no_pie
 OS_LIBS =
 
 EXEC_FINAL_OBJ = exec-final.o

src/tools/linker.sh

@@ -92,12 +92,8 @@ case $uname_s in
 	    # Extra stuff.  For some reason one __LINKEDIT segment is
 	    # mapped just past the dynamic space.  This messes things
 	    # up, so we move it to another address.  This seems to be
-	    # free, at least on 10.5.
-
-	    # Also specify the min version. (See Config.x86_darwin for
-	    # the desired version.)  This gets rid of a PIE warning
-	    # when creating the executable on 10.8.  (See ticket:112.)
-
+	    # free, at least on 10.5.  -no_pie is to get rid of the
+	    # linker warning about PIE.
 	    OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic -Wl,-no_pie"
 	    OS_LIBS=
 	    ;;
@@ -106,7 +102,7 @@ case $uname_s in
 	    # just after the dynamic space which messes things up, so
 	    # we move it to a diffferent address. The address below
 	    # appears to be free.
-	    OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -mmacosx-version-min=10.4 -static-libgcc"
+	    OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -static-libgcc"
 	    OS_LIBS="-lSystem -lc -lm"
 	    ;;
       esac