Attachment #363814 for bug #347931

Lines 272-277 CYGPATH_W = @CYGPATH_W@ Link Here

(-)a/gold/Makefile.in (-1 / +2 lines)
272	DATADIRNAME = @DATADIRNAME@	273	DATADIRNAME = @DATADIRNAME@
273	DEFS = @DEFS@	274	DEFS = @DEFS@
274	DEPDIR = @DEPDIR@	275	DEPDIR = @DEPDIR@
		276	DLOPEN_LIBS = @DLOPEN_LIBS@
275	ECHO_C = @ECHO_C@	277	ECHO_C = @ECHO_C@
276	ECHO_N = @ECHO_N@	278	ECHO_N = @ECHO_N@
277	ECHO_T = @ECHO_T@	279	ECHO_T = @ECHO_T@
Lines 398-404 AM_CPPFLAGS = \ Link Here
398	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@	400	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
399		401
400	LIBIBERTY = ../libiberty/libiberty.a	402	LIBIBERTY = ../libiberty/libiberty.a
401	@PLUGINS_TRUE@LIBDL = -ldl	403	@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
402	@THREADS_TRUE@THREADSLIB = -lpthread	404	@THREADS_TRUE@THREADSLIB = -lpthread
403	AM_YFLAGS = -d	405	AM_YFLAGS = -d
404		406

Lines 73-78 Link Here

(-)a/gold/config.in (+6 lines)
73	don't. */	73	don't. */
74	#undef HAVE_DECL_VSNPRINTF	74	#undef HAVE_DECL_VSNPRINTF
75		75
		76	/* Define to 1 if you have the <dlfcn.h> header file. */
		77	#undef HAVE_DLFCN_H
		78
76	/* Define to 1 if you have the <ext/hash_map> header file. */	79	/* Define to 1 if you have the <ext/hash_map> header file. */
77	#undef HAVE_EXT_HASH_MAP	80	#undef HAVE_EXT_HASH_MAP
78		81
Lines 184-189 Link Here
184	/* Define to 1 if you have the <unistd.h> header file. */	187	/* Define to 1 if you have the <unistd.h> header file. */
185	#undef HAVE_UNISTD_H	188	#undef HAVE_UNISTD_H
186		189
		190	/* Define to 1 if you have the <windows.h> header file. */
		191	#undef HAVE_WINDOWS_H
		192
187	/* Define to 1 if you have the <zlib.h> header file. */	193	/* Define to 1 if you have the <zlib.h> header file. */
188	#undef HAVE_ZLIB_H	194	#undef HAVE_ZLIB_H
189		195




MAINTAINER_MODE_TRUE
HAVE_PUBNAMES_FALSE
HAVE_PUBNAMES_TRUE
DLOPEN_LIBS
CXXCPP
HAVE_ZLIB_FALSE
HAVE_ZLIB_TRUE


done


for ac_header in windows.h
do :
  ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
if test "x$ac_cv_header_windows_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
#define HAVE_WINDOWS_H 1
_ACEOF

fi

done

for ac_header in dlfcn.h
do :
  ac_fn_cxx_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
 DLOPEN_LIBS="-ldl"
else
  DLOPEN_LIBS=""
fi

done



for ac_func in mallinfo posix_fallocate fallocate readv sysconf times
do :
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

Lines 1-6 Link Here

(-)a/gold/plugin.cc (-1 / +31 lines)
1	// plugin.cc -- plugin manager for gold -- C++ --	1	// plugin.cc -- plugin manager for gold -- C++ --
2		2
3	// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.	3	// Copyright 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
4	// Written by Cary Coutant <ccoutant@google.com>.	4	// Written by Cary Coutant <ccoutant@google.com>.
5		5
6	// This file is part of gold.	6	// This file is part of gold.
Lines 29-37 Link Here
29	#include <vector>	29	#include <vector>
30		30
31	#ifdef ENABLE_PLUGINS	31	#ifdef ENABLE_PLUGINS
		32	#ifdef HAVE_DLFCN_H
32	#include <dlfcn.h>	33	#include <dlfcn.h>
		34	#elif defined (HAVE_WINDOWS_H)
		35	#include <windows.h>
		36	#else
		37	#error Unknown how to handle dynamic-load-libraries.
33	#endif	38	#endif
34		39
		40	#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)
		41
		42	#define RTLD_NOW 0 /* Dummy value. */
		43	static void *
		44	dlopen(const char *file, int mode ATTRIBUTE_UNUSED)
		45	{
		46	return LoadLibrary(file);
		47	}
		48
		49	static void *
		50	dlsym(void handle, const char name)
		51	{
		52	return reinterpret_cast<void *>(
		53	GetProcAddress(static_cast<HMODULE>(handle),name));
		54	}
		55
		56	static const char *
		57	dlerror(void)
		58	{
		59	return "unable to load dll";
		60	}
		61
		62	#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H) */
		63	#endif /* ENABLE_PLUGINS */
		64
35	#include "parameters.h"	65	#include "parameters.h"
36	#include "errors.h"	66	#include "errors.h"
37	#include "fileread.h"	67	#include "fileread.h"

Lines 1878-1883 CYGPATH_W = @CYGPATH_W@ Link Here

(-)a/gold/testsuite/Makefile.in (+1 lines)
1878	DATADIRNAME = @DATADIRNAME@	1878	DATADIRNAME = @DATADIRNAME@
1879	DEFS = @DEFS@	1879	DEFS = @DEFS@
1880	DEPDIR = @DEPDIR@	1880	DEPDIR = @DEPDIR@
		1881	DLOPEN_LIBS = @DLOPEN_LIBS@
1881	ECHO_C = @ECHO_C@	1882	ECHO_C = @ECHO_C@
1882	ECHO_N = @ECHO_N@	1883	ECHO_N = @ECHO_N@
1883	ECHO_T = @ECHO_T@	1884	ECHO_T = @ECHO_T@

Return to bug 347931

Lines 596-601 MAINTAINER_MODE_FALSE Link Here

(-)a/gold/configure (+30 lines)
596	MAINTAINER_MODE_TRUE	596	MAINTAINER_MODE_TRUE
597	HAVE_PUBNAMES_FALSE	597	HAVE_PUBNAMES_FALSE
598	HAVE_PUBNAMES_TRUE	598	HAVE_PUBNAMES_TRUE
		599	DLOPEN_LIBS
599	CXXCPP	600	CXXCPP
600	HAVE_ZLIB_FALSE	601	HAVE_ZLIB_FALSE
601	HAVE_ZLIB_TRUE	602	HAVE_ZLIB_TRUE
Lines 7139-7144 fi Link Here
7139		7140
7140	done	7141	done
7141		7142
		7143
		7144	for ac_header in windows.h
		7145	do :
		7146	ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
		7147	if test "x$ac_cv_header_windows_h" = x""yes; then :
		7148	cat >>confdefs.h <<_ACEOF
		7149	#define HAVE_WINDOWS_H 1
		7150	_ACEOF
		7151
		7152	fi
		7153
		7154	done
		7155
		7156	for ac_header in dlfcn.h
		7157	do :
		7158	ac_fn_cxx_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
		7159	if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
		7160	cat >>confdefs.h <<_ACEOF
		7161	#define HAVE_DLFCN_H 1
		7162	_ACEOF
		7163	DLOPEN_LIBS="-ldl"
		7164	else
		7165	DLOPEN_LIBS=""
		7166	fi
		7167
		7168	done
		7169
		7170
		7171
7142	for ac_func in mallinfo posix_fallocate fallocate readv sysconf times	7172	for ac_func in mallinfo posix_fallocate fallocate readv sysconf times
7143	do :	7173	do :
7144	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`	7174	as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`