This fixes some issue introduced in the previous version where RTTI (#9671)
was removed from the exclusion list. Because of this the number of symbols in the def file was close to 64K for gpu builds and yesterday a few added symbols pushed us over the 64K limit for the windows linker. Adding RTTI back to the exclusion list.
This commit is contained in:
parent
d24befd445
commit
20b5a90c24
@ -44,7 +44,7 @@ UNDNAME = "undname.exe"
|
|||||||
DUMPBIN = "dumpbin.exe"
|
DUMPBIN = "dumpbin.exe"
|
||||||
|
|
||||||
# Exclude if matched
|
# Exclude if matched
|
||||||
EXCLUDE_RE = re.compile(r"deleting destructor|::internal::")
|
EXCLUDE_RE = re.compile(r"RTTI|deleting destructor|::internal::")
|
||||||
|
|
||||||
# Include if matched before exclude
|
# Include if matched before exclude
|
||||||
INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
|
INCLUDEPRE_RE = re.compile(r"google::protobuf::internal::ExplicitlyConstructed|"
|
||||||
@ -141,17 +141,17 @@ def main():
|
|||||||
continue
|
continue
|
||||||
if not INCLUDE_RE.search(line):
|
if not INCLUDE_RE.search(line):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if "deleting destructor" in line:
|
if "deleting destructor" in line:
|
||||||
# Some of the symbols convered by INCLUDEPRE_RE export deleting
|
# Some of the symbols convered by INCLUDEPRE_RE export deleting
|
||||||
# destructor symbols, which is a bad idea.
|
# destructor symbols, which is a bad idea.
|
||||||
# So we filter out such symbols here.
|
# So we filter out such symbols here.
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if DATA_EXCLUDE_RE.search(line):
|
if DATA_EXCLUDE_RE.search(line):
|
||||||
def_fp.write("\t" + decorated + "\n")
|
def_fp.write("\t" + decorated + "\n")
|
||||||
else:
|
else:
|
||||||
def_fp.write("\t" + decorated + " DATA\n")
|
def_fp.write("\t" + decorated + " DATA\n")
|
||||||
taken.add(decorated)
|
taken.add(decorated)
|
||||||
exit_code = proc.wait()
|
exit_code = proc.wait()
|
||||||
if exit_code != 0:
|
if exit_code != 0:
|
||||||
|
Loading…
Reference in New Issue
Block a user