Changeset 163678 in webkit


Ignore:
Timestamp:
Feb 7, 2014, 6:23:44 PM (12 years ago)
Author:
Lucas Forschler
Message:

Merged r163674.

Location:
tags/Safari-538.16.3
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-538.16.3/Source/JavaScriptCore/ChangeLog

    r163653 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            * Configurations/FeatureDefines.xcconfig:
     13            * llvm/library/LLVMAnchor.cpp:
     14
    1152014-02-07  Lucas Forschler  <lforschler@apple.com>
    216

  • tags/Safari-538.16.3/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r163072 r163678  
    193193ENABLE_XSLT = ENABLE_XSLT;
    194194
    195 ENABLE_FTL_JIT = ;
     195ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
     196ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     197ENABLE_FTL_JIT_macosx_1080 = ;
     198ENABLE_FTL_JIT_macosx_1090 = ;
     199ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
     200
    196201ENABLE_LLINT_C_LOOP = ;
    197202

  • tags/Safari-538.16.3/Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp

    r157260 r163678  
    11/*
    2  * Copyright (C) 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #include "config_llvm.h"
    27 
    28 #if HAVE(LLVM)
    29 
    3026// This is a hack for ensuring that the build system relinks JavaScriptCore if any
    31 // of the LLVM libraries are known to have changed.
    32 #include "WebKitLLVMLibraryToken.h"
    33 
    34 #endif // HAVE(LLVM)
    35 
     27// of the LLVM libraries are known to have changed. Ths file will get touched by our
     28// perl scripts to trigger a rebuild if a change in LLVM was detected.

  • tags/Safari-538.16.3/Source/WTF/ChangeLog

    r163289 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            * wtf/Platform.h:
     13
    1142014-02-02  Darin Adler  <darin@apple.com>
    215

  • tags/Safari-538.16.3/Source/WTF/wtf/Platform.h

    r163288 r163678  
    679679#endif
    680680
     681/* The FTL *does not* work on 32-bit platforms. Disable it even if someone asked us to enable it. */
     682#if USE(JSVALUE32_64)
     683#undef ENABLE_FTL_JIT
     684#define ENABLE_FTL_JIT 0
     685#endif
     686
    681687/* If possible, try to enable the LLVM disassembler. This is optional and we can
    682688   fall back on UDis86 if necessary. */

  • tags/Safari-538.16.3/Source/WebCore/ChangeLog

    r163593 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            The FTL already has tests.
     13
     14            * Configurations/FeatureDefines.xcconfig:
     15
    1162014-02-06  Lucas Forschler  <lforschler@apple.com>
    217

  • tags/Safari-538.16.3/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r163072 r163678  
    193193ENABLE_XSLT = ENABLE_XSLT;
    194194
    195 ENABLE_FTL_JIT = ;
     195ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
     196ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     197ENABLE_FTL_JIT_macosx_1080 = ;
     198ENABLE_FTL_JIT_macosx_1090 = ;
     199ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
     200
    196201ENABLE_LLINT_C_LOOP = ;
    197202

  • tags/Safari-538.16.3/Source/WebKit/mac/ChangeLog

    r163232 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            * Configurations/FeatureDefines.xcconfig:
     13
    1142014-01-31  Ryosuke Niwa  <rniwa@webkit.org>
    215

  • tags/Safari-538.16.3/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r163072 r163678  
    193193ENABLE_XSLT = ENABLE_XSLT;
    194194
    195 ENABLE_FTL_JIT = ;
     195ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
     196ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     197ENABLE_FTL_JIT_macosx_1080 = ;
     198ENABLE_FTL_JIT_macosx_1090 = ;
     199ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
     200
    196201ENABLE_LLINT_C_LOOP = ;
    197202

  • tags/Safari-538.16.3/Source/WebKit2/ChangeLog

    r163546 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            * Configurations/FeatureDefines.xcconfig:
     13
    1142014-02-06  Lucas Forschler  <lforschler@apple.com>
    215

  • tags/Safari-538.16.3/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r163072 r163678  
    193193ENABLE_XSLT = ENABLE_XSLT;
    194194
    195 ENABLE_FTL_JIT = ;
     195ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME));
     196ENABLE_FTL_JIT_macosx = $(ENABLE_FTL_JIT_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     197ENABLE_FTL_JIT_macosx_1080 = ;
     198ENABLE_FTL_JIT_macosx_1090 = ;
     199ENABLE_FTL_JIT_macosx_101000 = ENABLE_FTL_JIT;
     200
    196201ENABLE_LLINT_C_LOOP = ;
    197202

  • tags/Safari-538.16.3/Tools/ChangeLog

    r163540 r163678  
     12014-02-07  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r163674
     4
     5    2014-02-06  Filip Pizlo  <fpizlo@apple.com>
     6
     7            More FTL build scaffolding
     8            https://bugs.webkit.org/show_bug.cgi?id=128330
     9
     10            Reviewed by Geoffrey Garen.
     11
     12            * Scripts/copy-webkitlibraries-to-product-directory:
     13
    1142014-02-06  Lucas Forschler  <lforschler@apple.com>
    215

  • tags/Safari-538.16.3/Tools/Scripts/copy-webkitlibraries-to-product-directory

    r163495 r163678  
    2525
    2626use strict;
     27use File::Spec;
    2728use FindBin;
    2829use Getopt::Long qw(:config pass_through);
    … …  
    3536my $llvmIncludePackage = "";
    3637my $llvmLibraryPackage = "";
     38my $useFullLibPaths = 0;
    3739
    3840my $programName = basename($0);
    … …  
    4446  --use-llvm-includes=<path>    Get the LLVM inludes package from <path>
    4547  --use-llvm-libraries=<path>   Get the LLVM libraries package from <path>
     48  --[no-]use-full-lib-paths     Toggle using full library paths
    4649EOF
    4750
    … …  
    5255    'use-llvm-includes=s' => \$llvmIncludePackage,
    5356    'use-llvm-libraries=s' => \$llvmLibraryPackage,
     57    'use-full-lib-paths!' => \$useFullLibPaths
    5458);
    5559
    … …  
    6064
    6165my $productDir = shift @ARGV;
    62 $productDir = $ENV{BUILT_PRODUCTS_DIR} if !$productDir;
     66if ($productDir) {
     67    $productDir = File::Spec->rel2abs($productDir);
     68} else {
     69    $productDir = $ENV{BUILT_PRODUCTS_DIR};
     70}
    6371
    6472chdirWebKit();
    … …  
    96104if ($wksi) {
    97105    (system("mkdir", "-p", "$productDir/usr/local/include") == 0) or die;
     106   
     107    my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/lib" : $productDir;
     108    (system("mkdir", "-p", $libraryDir) == 0) or die;
    98109
    99110    my @librariesToCopy = (
    … …  
    105116    foreach my $libName (@librariesToCopy) {
    106117        my $srcLib = "WebKitLibraries/" . $libName;
    107         my $lib = "$productDir/" . $libName;
     118        my $lib = "$libraryDir/" . $libName;
    108119        if (!-e $lib || -M $lib > -M $srcLib) {
    109120            print "Updating $lib\n";
    … …  
    118129if ($llvm) {
    119130    (system("mkdir", "-p", "$productDir/usr/local/LLVMForJavaScriptCore/include") == 0) or die;
     131
     132    my $libraryDir = $useFullLibPaths ? "$productDir/usr/local/LLVMForJavaScriptCore/lib" : $productDir;
     133    (system("mkdir", "-p", $libraryDir) == 0) or die;
    120134
    121135    # Determine where to get LLVM binaries and headers.
    … …  
    200214       
    201215        my $librarySourceDirectory = "$ownLLVMDirectory/$ownLLVMBuildMode/lib";
    202         my $libraryTargetDirectory = $productDir;
     216        my $libraryTargetDirectory = $libraryDir;
    203217        $shouldUpdateLLVMLibraryToken = 0;
    204218        print("Symlinking libraries from $librarySourceDirectory to $libraryTargetDirectory\n");
    … …  
    227241    } else {
    228242        $shouldUpdateLLVMLibraryToken =
    229             unpackIfNecessary($productDir, "$productDir/libLLVMCore.a", $llvmLibraryPackage, 1);
     243            unpackIfNecessary($libraryDir, "$libraryDir/libLLVMCore.a", $llvmLibraryPackage, 1);
    230244    }
    231245
    … …  
    239253    }
    240254
    241     my $llvmLibraryToken = "$productDir/usr/local/LLVMForJavaScriptCore/include/WebKitLLVMLibraryToken.h";
    242     if ($shouldUpdateLLVMLibraryToken || !-e $llvmLibraryToken) {
    243         (open my $fileHandle, ">", $llvmLibraryToken) or die;
    244         print {$fileHandle} "/* This file fools WebKit's build system into relinking JavaScriptCore if the LLVM libraries changed. */\n";
    245         close $fileHandle;
    246     }
    247 }
    248 
     255    if ($shouldUpdateLLVMLibraryToken) {
     256        (system("touch", "Source/JavaScriptCore/llvm/library/LLVMAnchor.cpp") == 0) or die;
     257    }
     258}
     259
Note: See TracChangeset for help on using the changeset viewer.