Skip to content

Improve ARMv7 support #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 23, 2015
Merged

Improve ARMv7 support #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6395787
Fixed compile and link issue on arm
hpux735 Dec 19, 2015
58e40e1
Merge branch 'master' of github.com:hpux735/swift-corelibs-foundation
hpux735 Dec 19, 2015
ddcc82d
Added a fixme for assuming the ABI on ARM.
hpux735 Dec 21, 2015
d2ec47f
Fixed an inconsistency in NSXMLNodeOptions
hpux735 Dec 21, 2015
d8c30d1
Created an intermediate type for NSXMLNodeOptions
hpux735 Dec 23, 2015
74262b6
Merge branch 'master' of https://github.com/hpux735/swift-corelibs-fo…
hpux735 Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions Foundation/NSXMLNodeOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,49 +43,55 @@
@constant NSXMLDocumentIncludeContentTypeDeclaration Include a content type declaration for HTML or XHTML
*/

public var NSXMLNodeOptionsNone: Int { return 0 }
#if arch(x86_64)
public typealias NSXMLNodeOptionRawType = Int
#else
public typealias NSXMLNodeOptionRawType = Int64
#endif

public var NSXMLNodeOptionsNone: NSXMLNodeOptionRawType { return 0 }

// Init
public var NSXMLNodeIsCDATA: Int { return 1 << 0 }
public var NSXMLNodeExpandEmptyElement: Int { return 1 << 1 } // <a></a>
public var NSXMLNodeCompactEmptyElement: Int { return 1 << 2 } // <a/>
public var NSXMLNodeUseSingleQuotes: Int { return 1 << 3 }
public var NSXMLNodeUseDoubleQuotes: Int { return 1 << 4 }
public var NSXMLNodeNeverEscapeContents: Int { return 1 << 5 }
public var NSXMLNodeIsCDATA: NSXMLNodeOptionRawType { return 1 << 0 }
public var NSXMLNodeExpandEmptyElement: NSXMLNodeOptionRawType { return 1 << 1 } // <a></a>
public var NSXMLNodeCompactEmptyElement: NSXMLNodeOptionRawType { return 1 << 2 } // <a/>
public var NSXMLNodeUseSingleQuotes: NSXMLNodeOptionRawType { return 1 << 3 }
public var NSXMLNodeUseDoubleQuotes: NSXMLNodeOptionRawType { return 1 << 4 }
public var NSXMLNodeNeverEscapeContents: NSXMLNodeOptionRawType { return 1 << 5 }

// Tidy
public var NSXMLDocumentTidyHTML: Int { return 1 << 9 }
public var NSXMLDocumentTidyXML: Int { return 1 << 10 }
public var NSXMLDocumentTidyHTML: NSXMLNodeOptionRawType { return 1 << 9 }
public var NSXMLDocumentTidyXML: NSXMLNodeOptionRawType { return 1 << 10 }

// Validate
public var NSXMLDocumentValidate: Int { return 1 << 13 }
public var NSXMLDocumentValidate: NSXMLNodeOptionRawType { return 1 << 13 }

// External Entity Loading
// Choose only zero or one option. Choosing none results in system-default behavior.
public var NSXMLNodeLoadExternalEntitiesAlways: Int { return 1 << 14 }
public var NSXMLNodeLoadExternalEntitiesSameOriginOnly: Int { return 1 << 15 }
public var NSXMLNodeLoadExternalEntitiesNever: Int { return 1 << 19 }
public var NSXMLNodeLoadExternalEntitiesAlways: NSXMLNodeOptionRawType { return 1 << 14 }
public var NSXMLNodeLoadExternalEntitiesSameOriginOnly: NSXMLNodeOptionRawType { return 1 << 15 }
public var NSXMLNodeLoadExternalEntitiesNever: NSXMLNodeOptionRawType { return 1 << 19 }

// Parse
public var NSXMLDocumentXInclude: Int { return 1 << 16 }
public var NSXMLDocumentXInclude: NSXMLNodeOptionRawType { return 1 << 16 }

// Output
public var NSXMLNodePrettyPrint: Int { return 1 << 17 }
public var NSXMLDocumentIncludeContentTypeDeclaration: Int { return 1 << 18 }
public var NSXMLNodePrettyPrint: NSXMLNodeOptionRawType { return 1 << 17 }
public var NSXMLDocumentIncludeContentTypeDeclaration: NSXMLNodeOptionRawType { return 1 << 18 }

// Fidelity
public var NSXMLNodePreserveNamespaceOrder: Int { return 1 << 20 }
public var NSXMLNodePreserveAttributeOrder: Int { return 1 << 21 }
public var NSXMLNodePreserveEntities: Int { return 1 << 22 }
public var NSXMLNodePreservePrefixes: Int { return 1 << 23 }
public var NSXMLNodePreserveCDATA: Int { return 1 << 24 }
public var NSXMLNodePreserveWhitespace: Int { return 1 << 25 }
public var NSXMLNodePreserveDTD: Int { return 1 << 26 }
public var NSXMLNodePreserveCharacterReferences: Int { return 1 << 27 }
public var NSXMLNodePromoteSignificantWhitespace: Int { return 1 << 28 }
public var NSXMLNodePreserveEmptyElements: Int { return NSXMLNodeExpandEmptyElement | NSXMLNodeCompactEmptyElement }
public var NSXMLNodePreserveQuotes: Int { return NSXMLNodeUseSingleQuotes | NSXMLNodeUseDoubleQuotes }
public var NSXMLNodePreserveAll: Int { return
public var NSXMLNodePreserveNamespaceOrder: NSXMLNodeOptionRawType { return 1 << 20 }
public var NSXMLNodePreserveAttributeOrder: NSXMLNodeOptionRawType { return 1 << 21 }
public var NSXMLNodePreserveEntities: NSXMLNodeOptionRawType { return 1 << 22 }
public var NSXMLNodePreservePrefixes: NSXMLNodeOptionRawType { return 1 << 23 }
public var NSXMLNodePreserveCDATA: NSXMLNodeOptionRawType { return 1 << 24 }
public var NSXMLNodePreserveWhitespace: NSXMLNodeOptionRawType { return 1 << 25 }
public var NSXMLNodePreserveDTD: NSXMLNodeOptionRawType { return 1 << 26 }
public var NSXMLNodePreserveCharacterReferences: NSXMLNodeOptionRawType { return 1 << 27 }
public var NSXMLNodePromoteSignificantWhitespace: NSXMLNodeOptionRawType { return 1 << 28 }
public var NSXMLNodePreserveEmptyElements: NSXMLNodeOptionRawType { return NSXMLNodeExpandEmptyElement | NSXMLNodeCompactEmptyElement }
public var NSXMLNodePreserveQuotes: NSXMLNodeOptionRawType { return NSXMLNodeUseSingleQuotes | NSXMLNodeUseDoubleQuotes }
public var NSXMLNodePreserveAll: NSXMLNodeOptionRawType { return
NSXMLNodePreserveNamespaceOrder |
NSXMLNodePreserveAttributeOrder |
NSXMLNodePreserveEntities |
Expand Down
6 changes: 5 additions & 1 deletion lib/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,11 @@ def swift_triple(self):
if self.sdk == OSType.MacOSX:
return None
elif self.sdk == OSType.Linux:
triple += "-unknown-linux"
# FIXME: It would be nice to detect the host ABI here
if self.arch == ArchType.arm:
triple += "-unknown-linux-gnueabihf"
else:
triple += "-unknown-linux"
elif self.sdk == OSType.FreeBSD:
triple += "-unknown-freebsd"
else:
Expand Down