[llvm] r327509 - [LTO/gold] Fix workaround for old plugin-api.h in --wrap support

Teresa Johnson via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 14 07:00:57 PDT 2018


Author: tejohnson
Date: Wed Mar 14 07:00:57 2018
New Revision: 327509

URL: http://llvm.org/viewvc/llvm-project?rev=327509&view=rev
Log:
[LTO/gold] Fix workaround for old plugin-api.h in --wrap support

The workaround for older plugin-api.h in r327506 unfortunately
used another union member that is also fairly new and not available
in the plugin-api.h on some of the bots, leading to:
http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/9121/steps/build-stage2-LLVMgold.so/logs/stdio

Change to use a different member that we will definitely have (as it
is used elsewhere in gold-plugin.cpp already).

Modified:
    llvm/trunk/tools/gold/gold-plugin.cpp

Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=327509&r1=327508&r2=327509&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Wed Mar 14 07:00:57 2018
@@ -384,7 +384,7 @@ ld_plugin_status onload(ld_plugin_tv *tv
       // required version, this should be changed to:
       // get_wrap_symbols = tv->tv_u.tv_get_wrap_symbols;
       get_wrap_symbols =
-          (ld_plugin_get_wrap_symbols)tv->tv_u.tv_register_new_input;
+          (ld_plugin_get_wrap_symbols)tv->tv_u.tv_message;
       break;
     default:
       break;




More information about the llvm-commits mailing list