Libc-1244.1.7.tar.gz

[apple/libc.git] / xcodescripts / generate_features.pl

diff --git a/xcodescripts/generate_features.pl b/xcodescripts/generate_features.pl
index e2d689f5e31697fd275fa562e40dd66d509034fd..0704fcd6b3f323ba34e56b7149adb891e41c4488 100755 (executable)
--- a/xcodescripts/generate_features.pl
+++ b/xcodescripts/generate_features.pl
@@ -80,16 +80,11 @@ for my $arch (split(/ /, $ENV{"ARCHS"}))
        }
 
        elsif ($unifdef == 1) {
-               if ($platformName eq "macosx") {
-                       $unifdefs{"__OSX_OPEN_SOURCE__"} = 1;
-               }
                # assume FEATURE_BLOCKS was on by default
                $unifdefs{"UNIFDEF_BLOCKS"} = 1;
                $unifdefs{"UNIFDEF_LEGACY_64_APIS"} = defined($features{"FEATURE_LEGACY_64_APIS"});
                $unifdefs{"UNIFDEF_LEGACY_RUNE_APIS"} = defined($features{"FEATURE_LEGACY_RUNE_APIS"});
                $unifdefs{"UNIFDEF_LEGACY_UTMP_APIS"} = defined($features{"FEATURE_LEGACY_UTMP_APIS"});
-               $unifdefs{"UNIFDEF_MOVE_LOCALTIME"} = defined($features{"FEATURE_MOVE_LOCALTIME"});
-               $unifdefs{"UNIFDEF_TZDIR_SYMLINK"} = defined($features{"FEATURE_TZDIR_SYMLINK"});
                
                my $output = "";
                for my $d (keys %unifdefs) {
@@ -128,7 +123,9 @@ for my $arch (split(/ /, $ENV{"ARCHS"}))
 
                my $shortarch = $arch;
                $shortarch =~ s/armv\d+[a-z]?/arm/g;
-               $shortarch =~ s/arm64_32/arm64/g;
+
+               # map all arm64 subtypes to arm64
+               $shortarch =~ s/arm64[_a-z0-9]?/arm64/g;
 
                printf HEADER "#if !defined(__".$shortarch."__)\n";
                printf HEADER "#error Mismatched libc-features.h architecture\n";
@@ -152,18 +149,6 @@ for my $arch (split(/ /, $ENV{"ARCHS"}))
                        printf HEADER "/* #undef UNIFDEF_LEGACY_UTMP_APIS */\n";
                }
 
-               if (defined($features{"FEATURE_MOVE_LOCALTIME"})) {
-                       printf HEADER "#define UNIFDEF_MOVE_LOCALTIME 1\n";
-               } else {
-                       printf HEADER "/* #undef UNIFDEF_MOVE_LOCALTIME */\n";
-               }
-
-               if (defined($features{"FEATURE_TZDIR_SYMLINK"})) {
-                       printf HEADER "#define UNIFDEF_TZDIR_SYMLINK 1\n";
-               } else {
-                       printf HEADER "/* #undef UNIFDEF_TZDIR_SYMLINK */\n";
-               }
-
                if (defined($features{"FEATURE_ONLY_1050_VARIANTS"})) {
                        printf HEADER "#if !__DARWIN_ONLY_VERS_1050\n";
                        printf HEADER "#  error Feature mismatch: __DARWIN_ONLY_VERS_1050 == 0\n";
@@ -212,12 +197,6 @@ for my $arch (split(/ /, $ENV{"ARCHS"}))
                        printf HEADER "/* #undef NOTIFY_TZ */\n";
                }
 
-               if (defined($features{"FEATURE_NO_LIBCRASHREPORTERCLIENT"})) {
-                       printf HEADER "#define LIBC_NO_LIBCRASHREPORTERCLIENT 1\n";
-               } else {
-                       printf HEADER "/* #undef LIBC_NO_LIBCRASHREPORTERCLIENT */\n";
-               }
-
                if (defined($features{"FEATURE_SMALL_STDIOBUF"})) {
                        printf HEADER "#define FEATURE_SMALL_STDIOBUF 1\n";
                } else {