diff options
Diffstat (limited to 'libatomic/Makefile.in')
| -rw-r--r-- | libatomic/Makefile.in | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index a083d8702e4..d24b55966b4 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -113,18 +113,23 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(toolexeclibdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) -am_libatomic_la_OBJECTS = gload.lo gstore.lo gcas.lo gexch.lo \ - glfree.lo lock.lo init.lo fenv.lo fence.lo flag.lo +am__objects_1 = gload.lo gstore.lo gcas.lo gexch.lo glfree.lo init.lo \ + fenv.lo fence.lo flag.lo +am_libatomic_la_OBJECTS = $(am__objects_1) lock.lo libatomic_la_OBJECTS = $(am_libatomic_la_OBJECTS) libatomic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libatomic_la_LDFLAGS) $(LDFLAGS) -o $@ libatomic_convenience_la_DEPENDENCIES = $(libatomic_la_LIBADD) -am__objects_1 = gload.lo gstore.lo gcas.lo gexch.lo glfree.lo lock.lo \ - init.lo fenv.lo fence.lo flag.lo -am_libatomic_convenience_la_OBJECTS = $(am__objects_1) +am__objects_2 = $(am__objects_1) lock.lo +am_libatomic_convenience_la_OBJECTS = $(am__objects_2) libatomic_convenience_la_OBJECTS = \ $(am_libatomic_convenience_la_OBJECTS) +libatomic_convenience_no_lock_la_DEPENDENCIES = \ + $(libatomic_la_LIBADD) +am_libatomic_convenience_no_lock_la_OBJECTS = $(am__objects_1) +libatomic_convenience_no_lock_la_OBJECTS = \ + $(am_libatomic_convenience_no_lock_la_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -138,7 +143,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libatomic_la_SOURCES) $(EXTRA_libatomic_la_SOURCES) \ - $(libatomic_convenience_la_SOURCES) + $(libatomic_convenience_la_SOURCES) \ + $(libatomic_convenience_no_lock_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = @@ -307,7 +313,9 @@ AM_CFLAGS = $(XCFLAGS) AM_CCASFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) toolexeclib_LTLIBRARIES = libatomic.la -noinst_LTLIBRARIES = libatomic_convenience.la +noinst_LTLIBRARIES = libatomic_convenience.la \ + libatomic_convenience_no_lock.la + @LIBAT_BUILD_VERSIONED_SHLIB_FALSE@libatomic_version_script = @LIBAT_BUILD_VERSIONED_SHLIB_GNU_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_script = -Wl,--version-script,$(top_srcdir)/libatomic.map @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_script = -Wl,-M,libatomic.map-sun @@ -316,9 +324,10 @@ noinst_LTLIBRARIES = libatomic_convenience.la @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libatomic_version_dep = libatomic.map-sun libatomic_version_info = -version-info $(libtool_VERSION) libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags) -libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \ +LIBAT_SRC_NO_LOCK = gload.c gstore.c gcas.c gexch.c glfree.c 0 init.c \ fenv.c fence.c flag.c +libatomic_la_SOURCES = $(LIBAT_SRC_NO_LOCK) lock.c SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas EXTRA_libatomic_la_SOURCES = $(addsuffix _n.c,$(SIZEOBJS)) libatomic_la_DEPENDENCIES = $(libatomic_la_LIBADD) $(libatomic_version_dep) @@ -350,6 +359,12 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD) + +# The "no lock" convenience library is used by libgupc to +# avoid lock.c's use of pthread_mutex, which won't work +# for processes using atomics on shared memory. +libatomic_convenience_no_lock_la_SOURCES = $(LIBAT_SRC_NO_LOCK) +libatomic_convenience_no_lock_la_LIBADD = $(libatomic_la_LIBADD) all: auto-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -449,6 +464,8 @@ libatomic.la: $(libatomic_la_OBJECTS) $(libatomic_la_DEPENDENCIES) $(EXTRA_libat $(libatomic_la_LINK) -rpath $(toolexeclibdir) $(libatomic_la_OBJECTS) $(libatomic_la_LIBADD) $(LIBS) libatomic_convenience.la: $(libatomic_convenience_la_OBJECTS) $(libatomic_convenience_la_DEPENDENCIES) $(EXTRA_libatomic_convenience_la_DEPENDENCIES) $(LINK) $(libatomic_convenience_la_OBJECTS) $(libatomic_convenience_la_LIBADD) $(LIBS) +libatomic_convenience_no_lock.la: $(libatomic_convenience_no_lock_la_OBJECTS) $(libatomic_convenience_no_lock_la_DEPENDENCIES) $(EXTRA_libatomic_convenience_no_lock_la_DEPENDENCIES) + $(LINK) $(libatomic_convenience_no_lock_la_OBJECTS) $(libatomic_convenience_no_lock_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |