--- Libc/Libc-391/gen/confstr.c
+++ Libc/Libc-262/gen/confstr.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -97,65 +96,6 @@
 			free(p);
 		}
 		return (tlen + 1);
-
-	case _CS_POSIX_V6_ILP32_OFF32_CFLAGS:
-	case _CS_XBS5_ILP32_OFF32_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFF32_LDFLAGS:
-	case _CS_XBS5_ILP32_OFF32_LDFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFF32_LIBS:
-	case _CS_XBS5_ILP32_OFF32_LIBS:			/* legacy */
-
-	case _CS_XBS5_ILP32_OFF32_LINTFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
-	case _CS_XBS5_ILP32_OFFBIG_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
-	case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
-	case _CS_XBS5_ILP32_OFFBIG_LIBS:		/* legacy */
-
-	case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
-	case _CS_XBS5_LP64_OFF64_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
-	case _CS_XBS5_LP64_OFF64_LDFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LP64_OFF64_LIBS:
-	case _CS_XBS5_LP64_OFF64_LIBS:			/* legacy */
-
-	case _CS_XBS5_LP64_OFF64_LINTFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
-	case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
-	case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:		/* legacy */
-
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
-	case _CS_XBS5_LPBIG_OFFBIG_LIBS:		/* legacy */
-
-	case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:		/* legacy */
-		/* No special flags... yet */
-		p = "";
-		goto docopy;
-
-	case _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS:
-		if (sizeof(long) >= 8)
-			p = "_POSIX_V6_LP64_OFF64";
-		else
-			p = "_POSIX_V6_ILP32_OFFBIG";
-
-docopy:
-		if (len != 0 && buf != NULL)
-			strlcpy(buf, p, len);
-		return (strlen(p) + 1);
-
 	default:
 		errno = EINVAL;
 		return (0);