Commit 10f6176f3dea426d97b19e7d890947b5e07346af | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-10-16 13:12:35-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-10-16 13:12:35-04:00
log	10f6176f3dea426d97b19e7d890947b5e07346af
tree	6b18007e03fa1c8c1098faa60dda6cbf7a9da4b4
parent	5bfea3f1ea4b5c81321583af7aa7549e5a81cf3c
signature	Commit is signed but in an unrecognized format.

only look for .defs when needed; remove samsrv.dll cross compiling support

previously zig would look for all the .defs even when not needed,
wasting time. also, we only had samsrv definitions for some architectures.
remove cross compiling support for this.

3 files changed, 10 insertions(+), 509 deletions(-)

lib
- libc
  - mingw
    lib64
    samsrv.def
    libarm32
    samsrv.def
src
- link.cpp

lib/libc/mingw/lib64/samsrv.def deleted-170

...	...	@@ -1,170 +0,0 @@
1		;
2		; Exports of file SAMSRV.dll
3		;
4		; Autogenerated by gen_exportdef
5		; Written by Kai Tietz, 2007
6		;
7		LIBRARY SAMSRV.dll
8		EXPORTS
9		SamIAccountRestrictions
10		SamIAddDSNameToAlias
11		SamIAddDSNameToGroup
12		SamIAmIGC
13		SamIChangePasswordForeignUser
14		SamIChangePasswordForeignUser2
15		SamIConnect
16		SamICreateAccountByRid
17		SamIDemote
18		SamIDemoteUndo
19		SamIDoFSMORoleChange
20		SamIDsCreateObjectInDomain
21		SamIDsSetObjectInformation
22		SamIEnumerateAccountRids
23		SamIEnumerateInterdomainTrustAccountsForUpgrade
24		SamIFloatingSingleMasterOpEx
25		SamIFreeSidAndAttributesList
26		SamIFreeSidArray
27		SamIFreeVoid
28		SamIFree_SAMPR_ALIAS_INFO_BUFFER
29		SamIFree_SAMPR_DISPLAY_INFO_BUFFER
30		SamIFree_SAMPR_DOMAIN_INFO_BUFFER
31		SamIFree_SAMPR_ENUMERATION_BUFFER
32		SamIFree_SAMPR_GET_GROUPS_BUFFER
33		SamIFree_SAMPR_GET_MEMBERS_BUFFER
34		SamIFree_SAMPR_GROUP_INFO_BUFFER
35		SamIFree_SAMPR_PSID_ARRAY
36		SamIFree_SAMPR_RETURNED_USTRING_ARRAY
37		SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR
38		SamIFree_SAMPR_ULONG_ARRAY
39		SamIFree_SAMPR_USER_INFO_BUFFER
40		SamIFree_UserInternal6Information
41		SamIGCLookupNames
42		SamIGCLookupSids
43		SamIGetAliasMembership
44		SamIGetBootKeyInformation
45		SamIGetDefaultAdministratorName
46		SamIGetDefaultComputersContainer
47		SamIGetFixedAttributes
48		SamIGetInterdomainTrustAccountPasswordsForUpgrade
49		SamIGetPrivateData
50		SamIGetResourceGroupMembershipsTransitive
51		SamIGetSerialNumberDomain
52		SamIGetUserLogonInformation
53		SamIGetUserLogonInformation2
54		SamIGetUserLogonInformationEx
55		SamIHandleObjectUpdate
56		SamIImpersonateNullSession
57		SamIIncrementPerformanceCounter
58		SamIInitialize
59		SamIIsAttributeProtected
60		SamIIsDownlevelDcUpgrade
61		SamIIsExtendedSidMode
62		SamIIsRebootAfterPromotion
63		SamIIsSetupInProgress
64		SamILoadDownlevelDatabase
65		SamILoopbackConnect
66		SamIMixedDomain
67		SamIMixedDomain2
68		SamINT4UpgradeInProgress
69		SamINetLogonPing
70		SamINotifyDelta
71		SamINotifyRoleChange
72		SamINotifyServerDelta
73		SamIOpenAccount
74		SamIOpenUserByAlternateId
75		SamIPromote
76		SamIPromoteUndo
77		SamIQueryServerRole
78		SamIQueryServerRole2
79		SamIRemoveDSNameFromAlias
80		SamIRemoveDSNameFromGroup
81		SamIReplaceDownlevelDatabase
82		SamIResetBadPwdCountOnPdc
83		SamIRetrievePrimaryCredentials
84		SamIRevertNullSession
85		SamISameSite
86		SamISetAuditingInformation
87		SamISetMixedDomainFlag
88		SamISetPasswordForeignUser
89		SamISetPasswordForeignUser2
90		SamISetPasswordInfoOnPdc
91		SamISetPrivateData
92		SamISetSerialNumberDomain
93		SamIStorePrimaryCredentials
94		SamIUPNFromUserHandle
95		SamIUnLoadDownlevelDatabase
96		SamIUpdateLogonStatistics
97		SampAbortSingleLoopbackTask
98		SampAccountControlToFlags
99		SampAcquireSamLockExclusive
100		SampAcquireWriteLock
101		SampCommitBufferedWrites
102		SampConvertNt4SdToNt5Sd
103		SampDsChangePasswordUser
104		SampFlagsToAccountControl
105		SampGetDefaultSecurityDescriptorForClass
106		SampGetSerialNumberDomain2
107		SampInitializeRegistry
108		SampInitializeSdConversion
109		SampInvalidateDomainCache
110		SampInvalidateRidRange
111		SampIsAuditingEnabled
112		SampNetLogonNotificationRequired
113		SampNotifyAuditChange
114		SampNotifyReplicatedInChange
115		SampProcessSingleLoopbackTask
116		SampReleaseSamLockExclusive
117		SampReleaseWriteLock
118		SampRtlConvertUlongToUnicodeString
119		SampSetSerialNumberDomain2
120		SampUsingDsData
121		SampWriteGroupType
122		SamrAddMemberToAlias
123		SamrAddMemberToGroup
124		SamrAddMultipleMembersToAlias
125		SamrChangePasswordUser
126		SamrCloseHandle
127		SamrCreateAliasInDomain
128		SamrCreateGroupInDomain
129		SamrCreateUser2InDomain
130		SamrCreateUserInDomain
131		SamrDeleteAlias
132		SamrDeleteGroup
133		SamrDeleteUser
134		SamrEnumerateAliasesInDomain
135		SamrEnumerateDomainsInSamServer
136		SamrEnumerateGroupsInDomain
137		SamrEnumerateUsersInDomain
138		SamrGetAliasMembership
139		SamrGetGroupsForUser
140		SamrGetMembersInAlias
141		SamrGetMembersInGroup
142		SamrGetUserDomainPasswordInformation
143		SamrLookupDomainInSamServer
144		SamrLookupIdsInDomain
145		SamrLookupNamesInDomain
146		SamrOpenAlias
147		SamrOpenDomain
148		SamrOpenGroup
149		SamrOpenUser
150		SamrQueryDisplayInformation
151		SamrQueryInformationAlias
152		SamrQueryInformationDomain
153		SamrQueryInformationGroup
154		SamrQueryInformationUser
155		SamrQuerySecurityObject
156		SamrRemoveMemberFromAlias
157		SamrRemoveMemberFromForeignDomain
158		SamrRemoveMemberFromGroup
159		SamrRemoveMultipleMembersFromAlias
160		SamrRidToSid
161		SamrSetInformationAlias
162		SamrSetInformationDomain
163		SamrSetInformationGroup
164		SamrSetInformationUser
165		SamrSetMemberAttributesOfGroup
166		SamrSetSecurityObject
167		SamrShutdownSamServer
168		SamrTestPrivateFunctionsDomain
169		SamrTestPrivateFunctionsUser
170		SamrUnicodeChangePasswordUser2

lib/libc/mingw/libarm32/samsrv.def deleted-328

...	...	@@ -1,328 +0,0 @@
1		;
2		; Definition file of SAMSRV.dll
3		; Automatic generated by gendef
4		; written by Kai Tietz 2008-2014
5		;
6		LIBRARY "SAMSRV.dll"
7		EXPORTS
8		RtlDeleteElementGenericTable2
9		RtlInitializeGenericTable2
10		RtlInsertElementGenericTable2
11		RtlLookupElementGenericTable2
12		SAM_MIDL_user_allocate
13		SAM_MIDL_user_free
14		SamDsExtAlloc
15		SamDsExtFree
16		SamIAccountRestrictions
17		SamIAddDSNameToAlias
18		SamIChangePasswordForeignUser
19		SamIClaimIsValid
20		SamIConnect
21		SamIConvertSecurityAttributesToClaimsBlob
22		SamICopyCurrentDomainAccountSettings
23		SamICreateKrbTgt
24		SamIDecodeClaimsBlob
25		SamIDecodeClaimsBlobIntoClaimsSet
26		SamIDecodeClaimsBlobToAuthz
27		SamIDemote
28		SamIDemoteUndo
29		SamIDoFSMORoleChange
30		SamIFreeAuthzSecurityAttributesInfo
31		SamIFreeClaimsBlob
32		SamIFreeDecodedClaimsSet
33		SamIFreeLookupNamesInfo
34		SamIFreeLookupSidsInfo
35		SamIFreeOidList
36		SamIFreeRealmList
37		SamIFreeSecurityAttributesInfo
38		SamIFreeSidAndAttributesList
39		SamIFreeSidArray
40		SamIFreeVoid
41		SamIFree_SAMPR_DISPLAY_INFO_BUFFER
42		SamIFree_SAMPR_DOMAIN_INFO_BUFFER
43		SamIFree_SAMPR_ENUMERATION_BUFFER
44		SamIFree_SAMPR_GET_GROUPS_BUFFER
45		SamIFree_SAMPR_RETURNED_USTRING_ARRAY
46		SamIFree_SAMPR_ULONG_ARRAY
47		SamIFree_SAMPR_USER_INFO_BUFFER
48		SamIFree_UserInternal6Information
49		SamIGetAliasMembership
50		SamIGetConfigurationOidList
51		SamIGetDefaultAdministratorName
52		SamIGetResourceGroupMembershipsTransitive
53		SamIGetUserLogonInformation
54		SamIGetUserLogonInformation2
55		SamIGetUserLogonInformation3
56		SamIGetUserLogonInformationEx
57		SamIHandleObjectUpdate
58		SamIImpersonateNullSession
59		SamIInitialize
60		SamIIsDownlevelDcUpgrade
61		SamIIsExtendedSidMode
62		SamIIsRebootAfterPromotion
63		SamIIsSetupInProgress
64		SamILoadDownlevelDatabase
65		SamILookupNamesBySid
66		SamILookupNamesInDomain
67		SamILookupSidsByName
68		SamILoopbackConnect
69		SamIMixedDomain
70		SamIMixedDomain2
71		SamINT4UpgradeInProgress
72		SamINetLogonPing
73		SamINotifyRoleChange
74		SamIOpenUserByAlternateId
75		SamIPromote
76		SamIPromoteUndo
77		SamIPurgeSecrets
78		SamIQueryAccountSecretsCachability
79		SamIQueryCapabilities
80		SamIQueryRealmList
81		SamIQueryServerRole
82		SamIQueryServerRole2
83		SamIRemoveDSNameFromAlias
84		SamIReplaceDownlevelDatabase
85		SamIReplicateAccountData
86		SamIResetBadPwdCountOnPdc
87		SamIRetrieveMultiplePrimaryCredentials
88		SamIRetrievePrimaryCredentials
89		SamIRevertNullSession
90		SamIScorePassword
91		SamISetAuditingInformation
92		SamISetMachinePassword
93		SamISetPasswordForeignUser2
94		SamISetPasswordForeignUser3
95		SamISetPasswordInfoOnDc
96		SamIStorePrimaryCredentials
97		SamITransformClaims
98		SamIUPNFromUserHandle
99		SamIUnLoadDownlevelDatabase
100		SamIUninitialize
101		SamIUpdateLogonStatistics
102		SamIValidateAccountName
103		SamIValidateNewAccountName
104		SampAccountControlToFlags
105		SampAcquireReadLock
106		SampAcquireSamLockExclusive
107		SampAcquireWriteLock
108		SampAddAccountToGroupMembers
109		SampAddAccountsAndApplyMemberships
110		SampAddDeltaTime
111		SampAddNonLocalDomainRelativeMemberships
112		SampAddSameDomainMemberToGlobalOrUniversalGroup
113		SampAddUserToGroup
114		SampAlInvalidateAliasInformation
115		SampAllocateNextCurrentRidFromIndex
116		SampApplyDomainUpdatesForAllDomains
117		SampAssignPrimaryGroup
118		SampAuditAccountEnableDisableChange
119		SampAuditAccountNameChange
120		SampAuditAnyEvent
121		SampAuditGroupTypeChange
122		SampAuditSidHistory
123		SampBuildDsNameFromSid
124		SampBuildSamProtection
125		SampCalculateLmAndNtOwfPasswords
126		SampChangeAliasAccountName
127		SampChangeGroupAccountName
128		SampChangeUserAccountName
129		SampCheckForAccountLockout
130		SampCheckGroupTypeBits
131		SampCheckSidType
132		SampCommitBufferedWrites
133		SampCompareDisplayStrings
134		SampComputePasswordExpired
135		SampConnect
136		SampConvertUiListToApiList
137		SampCreateAccountContext2
138		SampCreateAliasInDomain
139		SampCreateContextEx
140		SampCreateDefaultUPN
141		SampCreateFullSid
142		SampCreateGroupInDomain
143		SampCreateUserInDomain
144		SampCurrentThreadOwnsLock
145		SampDeReferenceContext
146		SampDecrementActiveThreads
147		SampDecryptCredentialData
148		SampDeleteContext
149		SampDeleteDsDirsToDeleteKey
150		SampDeleteKeyForPostBootPromote
151		SampDeltaChangeNotify
152		SampDsChangePasswordUser
153		SampDsConvertReadAttrBlock
154		SampDsGetPrimaryDomainStart
155		SampDsInitializeSingleDomain
156		SampDsIsRunning
157		SampDsMakeAttrBlock
158		SampDsSetBuiltinDomainPolicy
159		SampDsSetDomainPolicy
160		SampDsSetPasswordUser
161		SampDsUpdateContextAttributes
162		SampDuplicateGroupInfo
163		SampDuplicateMachineInfo
164		SampDuplicateOemGroupInfo
165		SampDuplicateOemUserInfo
166		SampDuplicateUnicodeString
167		SampDuplicateUserInfo
168		SampEncryptCredentialData
169		SampExamineSid
170		SampExtendDefinedDomains
171		SampFlagsToAccountControl
172		SampFreeGroupInfo
173		SampFreeMachineInfo
174		SampFreeOemGroupInfo
175		SampFreeOemUserInfo
176		SampFreeUnicodeString
177		SampFreeUserInfo
178		SampGenerateRandomPassword
179		SampGetAccessAttribute
180		SampGetAccountDomainInfo
181		SampGetBehaviorVersion
182		SampGetCurrentOwnerAndPrimaryGroup
183		SampGetDisableOutboundRSO
184		SampGetDisableRSOOnPDCForward
185		SampGetDisableResetBadPwdCountForward
186		SampGetDisableSingleObjectRepl
187		SampGetDnsDomainNameFromIndex
188		SampGetDomainContextFromIndex
189		SampGetDomainObjectFromAccountContext
190		SampGetDomainObjectFromIndex
191		SampGetDomainServerRoleFromIndex
192		SampGetDomainSidFromAccountContext
193		SampGetDomainSidFromIndex
194		SampGetDomainSidListForSam
195		SampGetDomainUpgradeTasks
196		SampGetDownLevelDomainControllersPresent
197		SampGetExtendedAttribute
198		SampGetExternalNameFromIndex
199		SampGetFixedAttributes
200		SampGetHasNeverTime
201		SampGetIgnoreGCFailures
202		SampGetLogLevel
203		SampGetNT4UpgradeInProgress
204		SampGetNewAccountSecurityNt4
205		SampGetNextUnmodifiedRidFromIndex
206		SampGetNoGcLogonEnforceKerberosIpCheck
207		SampGetNoGcLogonEnforceNTLMCheck
208		SampGetObjectSD
209		SampGetObjectTypeNameFromIndex
210		SampGetPasswordMustChangeWithUF_UAC
211		SampGetReverseMembershipTransitive
212		SampGetSamSubsystemName
213		SampGetSerialNumberDomain2
214		SampGetServerObjectName
215		SampGetSidArrayAttribute
216		SampGetSidAttribute
217		SampGetSuccessAccountAuditingEnabled
218		SampGetUlongArrayAttribute
219		SampGetUnicodeStringAttribute
220		SampGetUserAccountControlComputed
221		SampGetUserAccountSettings
222		SampGetWillNeverTime
223		SampImpersonateClient
224		SampIncreaseBadPwdCountLoopback
225		SampIncrementActiveThreads
226		SampIncrementNetlogonChangeLogSerialNumber
227		SampInvalidateDomainCache
228		SampIsAccountBuiltIn
229		SampIsAuditingEnabled
230		SampIsBuiltinDomain
231		SampIsDomainHosted
232		SampIsServiceRunning
233		SampIsSetupInProgress
234		SampLogPrint
235		SampLookupContext
236		SampMarkPerAttributeInvalidFromWhichFields
237		SampNeedUserAccountSettingsDuringQuery
238		SampNetLogonNotificationRequired
239		SampNotifyAuditChange
240		SampNotifyReplicatedInChange
241		SampPasswordChangeNotify
242		SampPasswordChangeNotifyWorker
243		SampPositionOfHighestBit
244		SampQueryCapabilities
245		SampQueryInformationUserInternal
246		SampReadExtendedAttributes
247		SampRecordSystemSchemaVerisonInRegistry
248		SampReferenceContext
249		SampRegObjToDsObj
250		SampReleaseReadLock
251		SampReleaseSamLockExclusive
252		SampReleaseWriteLock
253		SampRemoveAccountFromGroupMembers
254		SampRemoveSameDomainMemberFromGlobalOrUniversalGroup
255		SampRemoveUserFromGroup
256		SampRenameKrbtgtAccount
257		SampReplaceUserLogonHours
258		SampReplaceUserV1aFixed
259		SampRetrieveGroupV1Fixed
260		SampRetrieveMultipleCredentials
261		SampRetrieveUserPasswords
262		SampRetrieveUserV1aFixed
263		SampRevertToSelf
264		SampRtlWellKnownPrivilegeCheck
265		SampSetAccessAttribute
266		SampSetAdminPassword
267		SampSetAttributeAccess
268		SampSetComputerObjectDsName
269		SampSetDSRMPasswordWorker
270		SampSetExtendedAttributeAccess
271		SampSetFixedAttributes
272		SampSetGlobalDsSids
273		SampSetPassword
274		SampSetPasswordInfoOnPdcByHandle
275		SampSetPasswordInfoOnPdcByIndex
276		SampSetSerialNumberDomain2
277		SampSetTransactionDomain
278		SampSetTransactionWithinDomain
279		SampSetUnicodeStringAttribute
280		SampSetUserAccountControl
281		SampSplitSid
282		SampStoreObjectAttributes
283		SampStringFromGuid
284		SampTraceEvent
285		SampUpdateAccountDisabledFlag
286		SampUpdateComputedUserAccountControlBits
287		SampUpdateMixedModeAndFindDomain
288		SampUpdatePerformanceCounters
289		SampUpgradeUserParmsActual
290		SampUsingDsData
291		SampValidateDomainCacheCallback
292		SampValidateDomainControllerCreation
293		SampValidatePwdSettingAttempt
294		SampValidateRegAttributes
295		SampWriteEventLog
296		SampWriteGroupType
297		SamrAddMemberToAlias
298		SamrAddMemberToGroup
299		SamrCloseHandle
300		SamrCreateUser2InDomain
301		SamrCreateUserInDomain
302		SamrDeleteAlias
303		SamrDeleteGroup
304		SamrDeleteUser
305		SamrEnumerateUsersInDomain
306		SamrEnumerateUsersInDomain2
307		SamrGetAliasMembership
308		SamrGetGroupsForUser
309		SamrLookupIdsInDomain
310		SamrLookupNamesInDomain
311		SamrLookupNamesInDomain2
312		SamrOpenAlias
313		SamrOpenDomain
314		SamrOpenGroup
315		SamrOpenUser
316		SamrQueryDisplayInformation
317		SamrQueryInformationDomain
318		SamrQueryInformationUser
319		SamrQueryInformationUser2
320		SamrQuerySecurityObject
321		SamrRemoveMemberFromAlias
322		SamrRemoveMemberFromGroup
323		SamrRidToSid
324		SamrSetInformationAlias
325		SamrSetInformationGroup
326		SamrSetInformationUser
327		SamrSetSecurityObject
328		SamrValidatePassword

src/link.cpp+10-11

...	...	@@ -576,7 +576,6 @@ static const MinGWDef mingw_def_list[] = {
576	576	{"opengl32",false},
577	577	{"rpcns4", false},
578	578	{"rpcrt4", false},
579		{"samsrv", false},
580	579	{"scarddlg",false},
581	580	{"setupapi",false},
582	581	{"shell32", true},
...	...	@@ -2184,17 +2183,17 @@ static void add_mingw_link_args(LinkJob *lj, bool is_library) {
2184	2183	const char *name = mingw_def_list[def_i].name;
2185	2184	const bool always_link = mingw_def_list[def_i].always_link;
2186	2185
2187		Buf lib_path = BUF_INIT;
2188		Error err = find_mingw_lib_def(lj, name, &lib_path);
2189
2190		if (err == ErrorFileNotFound) {
2191		zig_panic("link: could not find .def file to build %s\n", name);
2192		} else if (err != ErrorNone) {
2193		zig_panic("link: unable to check if .def file for %s exists: %s",
2194		name, err_str(err));
2195		}
2196
2197	2186	if (always_link \|\| is_linking_system_lib(g, name)) {
	2187	Buf lib_path = BUF_INIT;
	2188	Error err = find_mingw_lib_def(lj, name, &lib_path);
	2189
	2190	if (err == ErrorFileNotFound) {
	2191	zig_panic("link: could not find .def file to build %s\n", name);
	2192	} else if (err != ErrorNone) {
	2193	zig_panic("link: unable to check if .def file for %s exists: %s",
	2194	name, err_str(err));
	2195	}
	2196
2198	2197	lj->args.append(get_def_lib(g, name, &lib_path));
2199	2198	}
2200	2199	}