Attachment #295153 for bug #347931

Line Link Here

(-)file_not_specified_in_diff (-6 / +11 lines)
0	-- a/bfd/Makefile.in	0	++ b/bfd/Makefile.in
Lines 336-342 libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ Link Here
336	@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la	336	@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
337	AM_CFLAGS = $(WARN_CFLAGS)	337	AM_CFLAGS = $(WARN_CFLAGS)
338	AM_CPPFLAGS = -DBINDIR='"$(bindir)"'	338	AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
339	@PLUGINS_TRUE@LIBDL = -ldl
340		339
341	# bfd.h goes here, for now	340	# bfd.h goes here, for now
342	BFD_H = bfd.h	341	BFD_H = bfd.h
Lines 1054-1060 OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@ Link Here
1054	libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)	1053	libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
1055	EXTRA_libbfd_la_SOURCES = $(CFILES)	1054	EXTRA_libbfd_la_SOURCES = $(CFILES)
1056	libbfd_la_DEPENDENCIES = $(OFILES) ofiles	1055	libbfd_la_DEPENDENCIES = $(OFILES) ofiles
1057	libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)	1056	libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@
1058		1057
1059	# libtool will build .libs/libbfd.a. We create libbfd.a in the build	1058	# libtool will build .libs/libbfd.a. We create libbfd.a in the build
1060	# directory so that we don't have to convert all the programs that use	1059	# directory so that we don't have to convert all the programs that use
1061	-- a/bfd/configure.in	1060	++ b/bfd/configure.in
Lines 23-31 AC_PROG_CC Link Here
23	AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")	23	AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")
24		24
25	if test "$plugins" = "yes"; then	25	if test "$plugins" = "yes"; then
26	if test "$enable_dlopen" != "yes" ; then	26	has_dlopen=yes
		27	# Check for dlopen support
		28	AC_CHECK_HEADER([dlfcn.h],[],[has_dlopen=no],[AC_INCLUDES_DEFAULT])
		29	AC_SEARCH_LIBS([dlopen],[dl],[],[has_dlopen=no],[])
		30	AC_CHECK_FUNCS([dlsym dlclose],[],[has_dlopen=no])
		31
		32	if test "$has_dlopen" != "yes" ; then
27	AC_MSG_ERROR([	33	AC_MSG_ERROR([
28	Building BFD with plugin support requires a host that supports -ldl.])	34	Building BFD with plugin support requires a host that supports dlopen.])
29	fi	35	fi
30	enable_targets="$enable_targets plugin"	36	enable_targets="$enable_targets plugin"
31	fi	37	fi





LIBIBERTY = ../libiberty/libiberty.a

if PLUGINS
LIBDL = -ldl
endif

if THREADS
THREADSLIB = -lpthread
endif

sources_var = main.cc
deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
	 $(THREADSLIB)

ld_new_SOURCES = $(sources_var)
ld_new_DEPENDENCIES = $(deps_var)

incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
	$(LIBINTL_DEP)
incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
	 $(THREADSLIB)

# Use an explicit dependency for the bison generated header file.
expression.$(OBJEXT): yyscript.h

Lines 97-102 AC_ARG_ENABLE([plugins], Link Here

(-)a/gold/configure.ac (+4 lines)
97	if test "$plugins" = "yes"; then	97	if test "$plugins" = "yes"; then
98	AC_DEFINE(ENABLE_PLUGINS, 1,	98	AC_DEFINE(ENABLE_PLUGINS, 1,
99	[Define to enable linker plugins])	99	[Define to enable linker plugins])
		100	# Check for dlopen support
		101	AC_CHECK_HEADER([dlfcn.h],[],[has_dlopen=no],[AC_INCLUDES_DEFAULT])
		102	AC_SEARCH_LIBS([dlopen],[dl],[],[has_dlopen=no],[])
		103	AC_CHECK_FUNCS([dlopen dlsym dlclose],[],[has_dlopen=no])
100	fi	104	fi
101	AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")	105	AM_CONDITIONAL(PLUGINS, test "$plugins" = "yes")
102		106

Return to bug 347931

Lines 19-28 AM_CPPFLAGS = \ Link Here

(-)a/gold/Makefile.am (-6 / +2 lines)
19		19
20	LIBIBERTY = ../libiberty/libiberty.a	20	LIBIBERTY = ../libiberty/libiberty.a
21		21
22	if PLUGINS
23	LIBDL = -ldl
24	endif
25
26	if THREADS	22	if THREADS
27	THREADSLIB = -lpthread	23	THREADSLIB = -lpthread
28	endif	24	endif
Lines 152-158 libgold_a_LIBADD = $(LIBOBJS) Link Here
152	sources_var = main.cc	148	sources_var = main.cc
153	deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)	149	deps_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL_DEP)
154	ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \	150	ldadd_var = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
155	$(THREADSLIB) $(LIBDL)	151	$(THREADSLIB)
156		152
157	ld_new_SOURCES = $(sources_var)	153	ld_new_SOURCES = $(sources_var)
158	ld_new_DEPENDENCIES = $(deps_var)	154	ld_new_DEPENDENCIES = $(deps_var)
Lines 160-166 incremental_dump_SOURCES = incremental-dump.cc Link Here
160	incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \	160	incremental_dump_DEPENDENCIES = $(TARGETOBJS) libgold.a $(LIBIBERTY) \
161	$(LIBINTL_DEP)	161	$(LIBINTL_DEP)
162	incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \	162	incremental_dump_LDADD = $(TARGETOBJS) libgold.a $(LIBIBERTY) $(LIBINTL) \
163	$(THREADSLIB) $(LIBDL)	163	$(THREADSLIB)
164		164
165	# Use an explicit dependency for the bison generated header file.	165	# Use an explicit dependency for the bison generated header file.
166	expression.$(OBJEXT): yyscript.h	166	expression.$(OBJEXT): yyscript.h