Skip to content

Commit 6395787

Browse files
committed
Fixed compile and link issue on arm
1 parent b46d244 commit 6395787

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

Foundation/NSXMLNodeOptions.swift

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,46 +46,46 @@
4646
public var NSXMLNodeOptionsNone: Int { return 0 }
4747

4848
// Init
49-
public var NSXMLNodeIsCDATA: Int { return 1 << 0 }
50-
public var NSXMLNodeExpandEmptyElement: Int { return 1 << 1 } // <a></a>
51-
public var NSXMLNodeCompactEmptyElement: Int { return 1 << 2 } // <a/>
52-
public var NSXMLNodeUseSingleQuotes: Int { return 1 << 3 }
53-
public var NSXMLNodeUseDoubleQuotes: Int { return 1 << 4 }
54-
public var NSXMLNodeNeverEscapeContents: Int { return 1 << 5 }
49+
public var NSXMLNodeIsCDATA: UInt { return 1 << 0 }
50+
public var NSXMLNodeExpandEmptyElement: UInt { return 1 << 1 } // <a></a>
51+
public var NSXMLNodeCompactEmptyElement: UInt { return 1 << 2 } // <a/>
52+
public var NSXMLNodeUseSingleQuotes: UInt { return 1 << 3 }
53+
public var NSXMLNodeUseDoubleQuotes: UInt { return 1 << 4 }
54+
public var NSXMLNodeNeverEscapeContents: UInt { return 1 << 5 }
5555

5656
// Tidy
57-
public var NSXMLDocumentTidyHTML: Int { return 1 << 9 }
58-
public var NSXMLDocumentTidyXML: Int { return 1 << 10 }
57+
public var NSXMLDocumentTidyHTML: UInt { return 1 << 9 }
58+
public var NSXMLDocumentTidyXML: UInt { return 1 << 10 }
5959

6060
// Validate
61-
public var NSXMLDocumentValidate: Int { return 1 << 13 }
61+
public var NSXMLDocumentValidate: UInt { return 1 << 13 }
6262

6363
// External Entity Loading
6464
// Choose only zero or one option. Choosing none results in system-default behavior.
65-
public var NSXMLNodeLoadExternalEntitiesAlways: Int { return 1 << 14 }
66-
public var NSXMLNodeLoadExternalEntitiesSameOriginOnly: Int { return 1 << 15 }
67-
public var NSXMLNodeLoadExternalEntitiesNever: Int { return 1 << 19 }
65+
public var NSXMLNodeLoadExternalEntitiesAlways: UInt { return 1 << 14 }
66+
public var NSXMLNodeLoadExternalEntitiesSameOriginOnly: UInt { return 1 << 15 }
67+
public var NSXMLNodeLoadExternalEntitiesNever: UInt { return 1 << 19 }
6868

6969
// Parse
70-
public var NSXMLDocumentXInclude: Int { return 1 << 16 }
70+
public var NSXMLDocumentXInclude: UInt { return 1 << 16 }
7171

7272
// Output
73-
public var NSXMLNodePrettyPrint: Int { return 1 << 17 }
74-
public var NSXMLDocumentIncludeContentTypeDeclaration: Int { return 1 << 18 }
73+
public var NSXMLNodePrettyPrint: UInt { return 1 << 17 }
74+
public var NSXMLDocumentIncludeContentTypeDeclaration: UInt { return 1 << 18 }
7575

7676
// Fidelity
77-
public var NSXMLNodePreserveNamespaceOrder: Int { return 1 << 20 }
78-
public var NSXMLNodePreserveAttributeOrder: Int { return 1 << 21 }
79-
public var NSXMLNodePreserveEntities: Int { return 1 << 22 }
80-
public var NSXMLNodePreservePrefixes: Int { return 1 << 23 }
81-
public var NSXMLNodePreserveCDATA: Int { return 1 << 24 }
82-
public var NSXMLNodePreserveWhitespace: Int { return 1 << 25 }
83-
public var NSXMLNodePreserveDTD: Int { return 1 << 26 }
84-
public var NSXMLNodePreserveCharacterReferences: Int { return 1 << 27 }
85-
public var NSXMLNodePromoteSignificantWhitespace: Int { return 1 << 28 }
86-
public var NSXMLNodePreserveEmptyElements: Int { return NSXMLNodeExpandEmptyElement | NSXMLNodeCompactEmptyElement }
87-
public var NSXMLNodePreserveQuotes: Int { return NSXMLNodeUseSingleQuotes | NSXMLNodeUseDoubleQuotes }
88-
public var NSXMLNodePreserveAll: Int { return
77+
public var NSXMLNodePreserveNamespaceOrder: UInt { return 1 << 20 }
78+
public var NSXMLNodePreserveAttributeOrder: UInt { return 1 << 21 }
79+
public var NSXMLNodePreserveEntities: UInt { return 1 << 22 }
80+
public var NSXMLNodePreservePrefixes: UInt { return 1 << 23 }
81+
public var NSXMLNodePreserveCDATA: UInt { return 1 << 24 }
82+
public var NSXMLNodePreserveWhitespace: UInt { return 1 << 25 }
83+
public var NSXMLNodePreserveDTD: UInt { return 1 << 26 }
84+
public var NSXMLNodePreserveCharacterReferences: UInt { return 1 << 27 }
85+
public var NSXMLNodePromoteSignificantWhitespace: UInt { return 1 << 28 }
86+
public var NSXMLNodePreserveEmptyElements: UInt { return NSXMLNodeExpandEmptyElement | NSXMLNodeCompactEmptyElement }
87+
public var NSXMLNodePreserveQuotes: UInt { return NSXMLNodeUseSingleQuotes | NSXMLNodeUseDoubleQuotes }
88+
public var NSXMLNodePreserveAll: UInt { return
8989
NSXMLNodePreserveNamespaceOrder |
9090
NSXMLNodePreserveAttributeOrder |
9191
NSXMLNodePreserveEntities |

lib/target.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,10 @@ def swift_triple(self):
364364
if self.sdk == OSType.MacOSX:
365365
return None
366366
elif self.sdk == OSType.Linux:
367-
triple += "-unknown-linux"
367+
if self.arch == ArchType.arm:
368+
triple += "-unknown-linux-gnueabihf"
369+
else:
370+
triple += "-unknown-linux"
368371
elif self.sdk == OSType.FreeBSD:
369372
triple += "-unknown-freebsd"
370373
else:

0 commit comments

Comments
 (0)