Ignore:
Timestamp:
Jan 10, 2014, 6:19:33 PM (11 years ago)
Author:
[email protected]
Message:

Clean up architectures in xcconfig files
<​http://webkit.org/b/126794>

Reviewed by Andy Estes.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig:
  • Configurations/JavaScriptCore.xcconfig: Remove armv6, ppc.
  • Configurations/ToolExecutable.xcconfig: Sort.
  • Add new arch.

Source/WebCore:

  • Configurations/Base.xcconfig:
  • Configurations/WebCore.xcconfig: Remove armv6.
  • DerivedSources.make: Remove armv6, armv7f. Sort.
  • Add new arch.

Source/WebKit/mac:

  • Configurations/WebKit.xcconfig: Remove armv6, armv7f, ppc.
  • Add new arch.

Source/WTF:

  • Configurations/Base.xcconfig:
  • Add new arch.
Location:
trunk/Source/JavaScriptCore/Configurations
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r159669 r161713  
    6161GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
    6262GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
     63GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
    6364GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
    6465GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;

  • trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r159261 r161713  
    2727JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH));
    2828JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL;
    29 JSVALUE_MODEL_armv6 = 32_64;
    3029JSVALUE_MODEL_armv7 = 32_64;
     30JSVALUE_MODEL_armv7k = 32_64;
    3131JSVALUE_MODEL_armv7s = 32_64;
    3232JSVALUE_MODEL_arm64 = 64;
    3333JSVALUE_MODEL_i386 = 32_64;
    34 JSVALUE_MODEL_ppc = 32_64;
    3534JSVALUE_MODEL_x86_64 = 64;
    3635

  • trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

    r160131 r161713  
    4242CLANG_ENABLE_OBJC_ARC_i386_iphonesimulator = YES; # For iOS Simulator version 4.0 and greater
    4343CLANG_ENABLE_OBJC_ARC_x86_64 = YES;
     44CLANG_ENABLE_OBJC_ARC_armv7 = YES;
     45CLANG_ENABLE_OBJC_ARC_armv7k = YES;
     46CLANG_ENABLE_OBJC_ARC_armv7s = YES;
    4447CLANG_ENABLE_OBJC_ARC_arm64 = YES;
    45 CLANG_ENABLE_OBJC_ARC_armv7 = YES;
    46 CLANG_ENABLE_OBJC_ARC_armv7s = YES;
    4748
    4849OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
Note: See TracChangeset for help on using the changeset viewer.