strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library

Browse source
This commit is contained in:
sb 2010-11-17 15:17:56 +01:00
parent 9a29bc2691
commit 697265b8e2
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
solenv/bin/addsym.awk
View file

@ -26,16 +26,29 @@
#*************************************************************************
# Add certain symbol patterns to the first global section.
#
# The below code fails with 'perverted' mapfiles (using a strange line layout,
# or containing version UDK_3_0_0 without a global section, ...).
BEGIN { state = 0 }
/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
{ print }
END {
if (state == 0) {
print "# Weak RTTI symbols for C++ exceptions:"
print "UDK_3_0_0 {"
print "global:"
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
if (ENVIRON["USE_SYSTEM_STL"] != "YES")
print "_ZN4_STL7num_put*; # for STLport"
print "};"
}
}
state == 2 {
print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
if (ENVIRON["USE_SYSTEM_STL"] != "YES")
print "_ZN4_STL7num_put*; # for STLport"
state = 3
}
END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
# #i66636# - ???
/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
{ print }