--- Libc/Libc-498.1.5/Makefile
+++ Libc/Libc-498/Makefile
@@ -16,54 +16,33 @@
 .if !empty $(MACHINE_ARCH:M*64)
 LP64 = 1
 .endif
-# RC_TARGET_CONFIG may not be set, so default to MacOSX (which is good enough
-# for installsrc to autopatch all files).
-.ifndef RC_TARGET_CONFIG
-RC_TARGET_CONFIG = MacOSX
-.endif
-
-#use default compiler
-#CC = gcc-4.0
-GCC_VERSION != cc -dumpversion | sed -e 's/^\([^.]*\.[^.]*\).*/\1/'
-GCC_42 != perl -e "print ($(GCC_VERSION) >= 4.2 ? 'YES' : 'NO')"
-
+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
 .ifdef ALTLIBCHEADERS
 INCLUDEDIR = ${ALTLIBCHEADERS}
 LIBCFLAGS += -I${INCLUDEDIR}
-.else # !ALTLIBCHEADERS
-INCLUDEDIR = ${SDKROOT}/usr/include
-.endif # ALTLIBCHEADERS
+.endif
+LIBCFLAGS += -I$(SRCROOT)/include -include _.libc_internal.h
 FRAMEWORKS = ${OBJROOT}/Frameworks
 PRIVATEHEADERS = ${FRAMEWORKS}/System.framework/PrivateHeaders
-PRIVINC = -I${PRIVATEHEADERS}
-LIBCFLAGS += ${PRIVINC}
-
-SYMROOTINC = ${SYMROOT}/include
-CFLAGS = -g -arch ${CCARCH} ${RC_NONARCH_CFLAGS} -std=gnu99 -fno-common -Wmost
-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 -DLIBC_MAJOR=${SHLIB_MAJOR}
-CFLAGS += -I${.OBJDIR} -I${SYMROOTINC} -I${.CURDIR}/include
-AINC = -g -arch ${CCARCH} ${RC_NONARCH_CFLAGS}
-AINC += -I${.CURDIR}/${MACHINE_ARCH} ${PRIVINC}
-.if $(MACHINE_ARCH) != arm
-CFLAGS += -force_cpusubtype_ALL
-AINC += -force_cpusubtype_ALL
-.endif
-.ifdef SDKROOT 
-CFLAGS += -isysroot '${SDKROOT}'
-AINC += -isysroot '${SDKROOT}'
-.endif # SDKROOT
-
-.if ${GCC_42} != YES
-CFLAGS += -no-cpp-precomp
-AINC += -no-cpp-precomp
-.endif
+PRIVINC = -F${FRAMEWORKS} -I${PRIVATEHEADERS}
+CFLAGS += ${PRIVINC} -I${.OBJDIR}
+CFLAGS += -DLIBC_MAJOR=${SHLIB_MAJOR} -no-cpp-precomp -force_cpusubtype_ALL
+CFLAGS += -fno-common -pipe -Wmost -g -D__FBSDID=__RCSID
+AINC=	-I${.CURDIR}/${MACHINE_ARCH} -no-cpp-precomp -force_cpusubtype_ALL
+AINC+=-arch ${MACHINE_ARCH} -g
 CLEANFILES+=tags
 INSTALL_PIC_ARCHIVE=	yes
 PRECIOUSLIB=	yes
 
 # workaround for 3649783
 AINC += -fdollars-in-identifiers
+
+# workaround for 4268581
+.if make(lib${LIB}_static.a)
+OPTIMIZE-glob-fbsd.c += -O0
+.endif
 
 # If these aren't set give it expected defaults
 DSTROOT ?= /
@@ -79,13 +58,10 @@
 # add version string
 SRCS += libc_version.c
 libc_version.c:
-	${SDKROOT}/Developer/Makefiles/bin/version.pl Libc > $@
+	/Developer/Makefiles/bin/version.pl Libc > $@
 
-.include "Makefile.features"
 .include "${.CURDIR}/Makefile.inc"
 .include "Makefile.xbs"
-
-MANFILTER = unifdef -t ${UNIFDEFARGS}
 .if exists(/usr/share/mk/bsd.init.mk)
 .include <bsd.init.mk>
 .endif