--- Libc/Libc-498/Makefile
+++ Libc/Libc-391.4.2/Makefile
@@ -1,5 +1,11 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD: src/lib/libc/Makefile,v 1.31 2001/08/13 21:48:43 peter Exp $
+#
+# All library objects contain rcsid strings by default; they may be
+# excluded as a space-saving measure.  To produce a library that does
+# not contain these strings, delete -DLIBC_RCS and -DSYSLIBC_RCS
+# from CFLAGS below.  To remove these strings from just the system call
+# stubs, remove just -DSYSLIBC_RCS from CFLAGS.
 #
 # Yes, we build everything with -g, and strip it out later...
 #
@@ -13,23 +19,30 @@
 .if (${MACHINE_ARCH} == unknown)
 MACHINE_ARCH != /usr/bin/arch
 .endif 
-.if !empty $(MACHINE_ARCH:M*64)
-LP64 = 1
+CC = gcc-4.0
+# always set __DARWIN_UNIX03 to zero (variant will set to one) except for ppc64
+.if (${MACHINE_ARCH} == ppc64)
+CFLAGS += -D__DARWIN_UNIX03=1
+.else
+CFLAGS += -D__DARWIN_UNIX03=0
 .endif
-CC = gcc-4.0
-CFLAGS += -D__LIBC__ -D__DARWIN_UNIX03=1 -D__DARWIN_64_BIT_INO_T=1 -D__DARWIN_NON_CANCELABLE=1 -D__DARWIN_VERS_1050=1
-CFLAGS += -DNOID -I${.CURDIR}/include -std=gnu99
+.if (${MACHINE_ARCH} == i386)
+CFLAGS += -march=prescott -msse3
+.endif
+CFLAGS += -D__LIBC__ -DNOID -I${.CURDIR}/include
 .ifdef ALTLIBCHEADERS
 INCLUDEDIR = ${ALTLIBCHEADERS}
-LIBCFLAGS += -I${INCLUDEDIR}
+CFLAGS += -I${INCLUDEDIR}
 .endif
-LIBCFLAGS += -I$(SRCROOT)/include -include _.libc_internal.h
-FRAMEWORKS = ${OBJROOT}/Frameworks
-PRIVATEHEADERS = ${FRAMEWORKS}/System.framework/PrivateHeaders
-PRIVINC = -F${FRAMEWORKS} -I${PRIVATEHEADERS}
-CFLAGS += ${PRIVINC} -I${.OBJDIR}
+.ifdef ALTFRAMEWORKSPATH
+PRIVINC = -F${ALTFRAMEWORKSPATH} -I${ALTFRAMEWORKSPATH}/System.framework/PrivateHeaders
+.else
+PRIVINC = -I${NEXT_ROOT}/System/Library/Frameworks/System.framework/PrivateHeaders
+.endif
+CFLAGS += ${PRIVINC}
 CFLAGS += -DLIBC_MAJOR=${SHLIB_MAJOR} -no-cpp-precomp -force_cpusubtype_ALL
 CFLAGS += -fno-common -pipe -Wmost -g -D__FBSDID=__RCSID
+CFLAGS += -finline-limit=1500 --param inline-unit-growth=200 -Winline
 AINC=	-I${.CURDIR}/${MACHINE_ARCH} -no-cpp-precomp -force_cpusubtype_ALL
 AINC+=-arch ${MACHINE_ARCH} -g
 CLEANFILES+=tags
@@ -39,9 +52,12 @@
 # workaround for 3649783
 AINC += -fdollars-in-identifiers
 
-# workaround for 4268581
-.if make(lib${LIB}_static.a)
-OPTIMIZE-glob-fbsd.c += -O0
+# ppc64 optimizer still blows up on some files, so we use -O0 to turn it
+# off on a per file basis
+.if (${MACHINE_ARCH} == ppc64)
+OPTIMIZE-acl_entry.c = -O0
+# glob-fbsd.c fails with -static -Os (3869444) so turn off optimization
+OPTIMIZE-glob-fbsd.c = -O0
 .endif
 
 # If these aren't set give it expected defaults
@@ -55,12 +71,9 @@
 DESTDIR ?= ${DSTROOT}
 MAKEOBJDIR ?= ${OBJROOT}
 
-# add version string
-SRCS += libc_version.c
-libc_version.c:
-	/Developer/Makefiles/bin/version.pl Libc > $@
-
+CFLAGS += -I${SYMROOT}
 .include "${.CURDIR}/Makefile.inc"
+.PATH: ${SYMROOT}
 .include "Makefile.xbs"
 .if exists(/usr/share/mk/bsd.init.mk)
 .include <bsd.init.mk>