<rdar://problem/8957409> Remove last vestiges of JSVALUE32

<http://webkit.org/b/53779>

Reviewed by Darin Adler.

Support for JSVALUE32 was originaly removed in r70111.

* Configurations/JavaScriptCore.xcconfig: Changed armv6 to use
JavaScriptCore.JSVALUE32_64.exp and ppc64 to use
JavaScriptCore.JSVALUE64.exp to match Platform.h.
* DerivedSources.make: Removed rule for
JavaScriptCore.JSVALUE32.exp.
* JavaScriptCore.JSVALUE32only.exp: Removed.
* JavaScriptCore.xcodeproj/project.pbxproj: Removed references
to JavaScriptCore.JSVALUE32only.exp.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77638 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index beaff82d1b15919cc344591da1ff2c450b5bff86..9b9cc2f76fd470d286ee8009ae2558b7a5b04850 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-02-04  David Kilzer  <ddkilzer@apple.com>
+
+        <rdar://problem/8957409> Remove last vestiges of JSVALUE32
+        <http://webkit.org/b/53779>
+
+        Reviewed by Darin Adler.
+
+        Support for JSVALUE32 was originaly removed in r70111.
+
+        * Configurations/JavaScriptCore.xcconfig: Changed armv6 to use
+        JavaScriptCore.JSVALUE32_64.exp and ppc64 to use
+        JavaScriptCore.JSVALUE64.exp to match Platform.h.
+        * DerivedSources.make: Removed rule for
+        JavaScriptCore.JSVALUE32.exp.
+        * JavaScriptCore.JSVALUE32only.exp: Removed.
+        * JavaScriptCore.xcodeproj/project.pbxproj: Removed references
+        to JavaScriptCore.JSVALUE32only.exp.
+
 2011-02-04  David Kilzer  <ddkilzer@apple.com>
 
         Use static_cast and other style cleanup in YarrInterpreter.cpp

diff --git a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
index 69b249147826e337da35c13e89f0ee1bb13c1dcc..adf594e4be289420b353abb529154a740a5f38e2 100644 (file)
--- a/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
+++ b/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig
@@ -26,11 +26,11 @@
 
 JSVALUE_MODEL = $(JSVALUE_MODEL_$(CURRENT_ARCH));
 JSVALUE_MODEL_ = UNKNOWN_JSVALUE_MODEL;
-JSVALUE_MODEL_armv6 = 32;
+JSVALUE_MODEL_armv6 = 32_64;
 JSVALUE_MODEL_armv7 = 32_64;
 JSVALUE_MODEL_i386 = 32_64;
 JSVALUE_MODEL_ppc = 32_64;
-JSVALUE_MODEL_ppc64 = 32;
+JSVALUE_MODEL_ppc64 = 64;
 JSVALUE_MODEL_x86_64 = 64;
 
 EXPORTED_SYMBOLS_FILE = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.JSVALUE$(JSVALUE_MODEL).exp;

diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
index 372c75edca9add2e8494180dcdbf8cffdf66546a..d303fc67ba9b1c0984eabb007dcb68108f2d2ca2 100644 (file)
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -76,9 +76,6 @@ RegExpJitTables.h: create_regex_tables
 
 # export files
 
-JavaScriptCore.JSVALUE32.exp: JavaScriptCore.exp JavaScriptCore.JSVALUE32only.exp
-       cat $^ > $@
-
 JavaScriptCore.JSVALUE32_64.exp: JavaScriptCore.exp JavaScriptCore.JSVALUE32_64only.exp
        cat $^ > $@
 

diff --git a/Source/JavaScriptCore/JavaScriptCore.JSVALUE32only.exp b/Source/JavaScriptCore/JavaScriptCore.JSVALUE32only.exp
deleted file mode 100644 (file)
index 73efb9d..0000000
--- a/Source/JavaScriptCore/JavaScriptCore.JSVALUE32only.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-__ZN3JSC10JSFunctionC1EPNS_9ExecStateEPNS_14JSGlobalObjectEN3WTF17NonNullPassRefPtrINS_9StructureEEEiRKNS_10IdentifierEPFPvS2_E
-__ZN3JSC17PrototypeFunctionC1EPNS_9ExecStateEPNS_14JSGlobalObjectEN3WTF17NonNullPassRefPtrINS_9StructureEEEiRKNS_10IdentifierEPFPvS2_E

diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 407dc2997c9da93752908df18a03aba20e0a91e2..fa4e240c8ad8692da965a5413385a9ffed7bb9c2 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -875,7 +875,6 @@
                86704B8212DBA33700A9FE7B /* YarrPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YarrPattern.cpp; path = yarr/YarrPattern.cpp; sourceTree = "<group>"; };
                86704B8312DBA33700A9FE7B /* YarrPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YarrPattern.h; path = yarr/YarrPattern.h; sourceTree = "<group>"; };
                867FC35F11B763950025105E /* JavaScriptCore.JSVALUE32_64only.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = JavaScriptCore.JSVALUE32_64only.exp; sourceTree = "<group>"; };
-               867FC36011B763950025105E /* JavaScriptCore.JSVALUE32only.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = JavaScriptCore.JSVALUE32only.exp; sourceTree = "<group>"; };
                867FC36111B763950025105E /* JavaScriptCore.JSVALUE64only.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = JavaScriptCore.JSVALUE64only.exp; sourceTree = "<group>"; };
                868BFA00117CEFD100B908B1 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AtomicString.cpp; path = text/AtomicString.cpp; sourceTree = "<group>"; };
                868BFA01117CEFD100B908B1 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicString.h; path = text/AtomicString.h; sourceTree = "<group>"; };
@@ -1306,7 +1305,6 @@
                                937B63CC09E766D200A671DD /* DerivedSources.make */,
                                F692A8540255597D01FF60F7 /* create_hash_table */,
                                14B8ECA60A5653980062BE54 /* JavaScriptCore.exp */,
-                               867FC36011B763950025105E /* JavaScriptCore.JSVALUE32only.exp */,
                                867FC35F11B763950025105E /* JavaScriptCore.JSVALUE32_64only.exp */,
                                867FC36111B763950025105E /* JavaScriptCore.JSVALUE64only.exp */,
                                F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */,