Changeset 161713 in webkit


Ignore:
Timestamp:
Jan 10, 2014 6:19:33 PM (10 years ago)
Author:
ddkilzer@apple.com
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
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r161702 r161713  
     12014-01-10  David Kilzer  <ddkilzer@apple.com>
     2
     3        Clean up architectures in xcconfig files
     4        <http://webkit.org/b/126794>
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/JavaScriptCore.xcconfig: Remove armv6, ppc.
     10        * Configurations/ToolExecutable.xcconfig: Sort.
     11        - Add new arch.
     12
    1132014-01-10  Dean Jackson  <dino@apple.com>
    214
  • 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);
  • trunk/Source/WTF/ChangeLog

    r161672 r161713  
     12014-01-10  David Kilzer  <ddkilzer@apple.com>
     2
     3        Clean up architectures in xcconfig files
     4        <http://webkit.org/b/126794>
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/Base.xcconfig:
     9        - Add new arch.
     10
    1112014-01-10  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
    212
  • trunk/Source/WTF/Configurations/Base.xcconfig

    r159665 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/WebCore/ChangeLog

    r161712 r161713  
     12014-01-10  David Kilzer  <ddkilzer@apple.com>
     2
     3        Clean up architectures in xcconfig files
     4        <http://webkit.org/b/126794>
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/Base.xcconfig:
     9        * Configurations/WebCore.xcconfig: Remove armv6.
     10        * DerivedSources.make: Remove armv6, armv7f. Sort.
     11        - Add new arch.
     12
    1132014-01-10  Simon Fraser  <simon.fraser@apple.com>
    214
  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r161660 r161713  
    5858GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
    5959GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
     60GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
    6061GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
    6162GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r161712 r161713  
    2727EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
    2828EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
    29 EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv6.exp;
    3029EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7.exp;
     30EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7k.exp;
    3131EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7s.exp;
    3232EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.arm64.exp;
  • trunk/Source/WebCore/DerivedSources.make

    r161698 r161713  
    11971197ifeq ($(WTF_PLATFORM_IOS),1)
    11981198
    1199 ifeq ($(findstring armv6,$(ARCHS)), armv6)
    1200     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv6.exp
    1201 endif
    1202 ifeq ($(findstring armv7f,$(ARCHS)), armv7f)
    1203     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7f.exp
     1199ifeq ($(findstring armv7,$(ARCHS)), armv7)
     1200    WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7.exp
     1201endif
     1202ifeq ($(findstring armv7k,$(ARCHS)), armv7k)
     1203    WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7k.exp
    12041204endif
    12051205ifeq ($(findstring armv7s,$(ARCHS)), armv7s)
    12061206    WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7s.exp
    1207 endif
    1208 ifeq ($(findstring armv7,$(ARCHS)), armv7)
    1209     WEBCORE_EXPORT_FILES := $(WEBCORE_EXPORT_FILES) WebCore.LP64.armv7.exp
    12101207endif
    12111208ifeq ($(findstring arm64,$(ARCHS)), arm64)
  • trunk/Source/WebKit/mac/ChangeLog

    r161675 r161713  
     12014-01-10  David Kilzer  <ddkilzer@apple.com>
     2
     3        Clean up architectures in xcconfig files
     4        <http://webkit.org/b/126794>
     5
     6        Reviewed by Andy Estes.
     7
     8        * Configurations/WebKit.xcconfig: Remove armv6, armv7f, ppc.
     9        - Add new arch.
     10
    1112014-01-10  Yongjun Zhang  <yongjun_zhang@apple.com>
    212
  • trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig

    r161479 r161713  
    3232EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
    3333EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
    34 EXPORTED_SYMBOLS_FILE_armv6 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    3534EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    36 EXPORTED_SYMBOLS_FILE_armv7f = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
     35EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    3736EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    3837EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
     
    4039EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
    4140EXPORTED_SYMBOLS_FILE_i386_macosx = mac/WebKit.exp;
    42 EXPORTED_SYMBOLS_FILE_ppc = mac/WebKit.exp;
    4341EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
    4442EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;
Note: See TracChangeset for help on using the changeset viewer.