From 866d86432287b867bf1a86589026d872f3bc71e5 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sun, 7 Oct 2012 17:29:44 +0400 Subject: [PATCH] Fix Makefile.msft, README_win32 after AO_pause removal in atomic_ops_stack (fix commit 'a5a424e') * doc/README_win32.txt: Update description of libatomic_ops_gpl.lib contents. * src/Makefile.msft: Update header comment. * src/Makefile.msft (LIB_OBJS): Add atomic_ops.obj entry. * src/Makefile.msft (atomic_ops.obj): Add rule to build atomic_ops. --- doc/README_win32.txt | 5 +++-- src/Makefile.msft | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/README_win32.txt b/doc/README_win32.txt index cb75a45..6dc11f5 100644 --- a/doc/README_win32.txt +++ b/doc/README_win32.txt @@ -18,8 +18,9 @@ pieces from the resulting src directory contents: "atomic_ops_stack.h" - Header file describing almost lock-free stack. "atomic_ops_malloc.h" - Header file describing almost lock-free malloc. "libatomic_ops_gpl.lib" - Library containing implementation of the - above two. The atomic_ops.h implementation - is entirely in the header files in Win32. + above two (plus AO_pause() defined in atomic_ops.c). + The atomic_ops.h implementation is entirely in the + header files in Win32. Most clients of atomic_ops.h will need to define AO_ASSUME_WINDOWS98 before including it. Compare_and_swap is otherwise not available. diff --git a/src/Makefile.msft b/src/Makefile.msft index 2b9a5c4..45d645b 100644 --- a/src/Makefile.msft +++ b/src/Makefile.msft @@ -1,7 +1,8 @@ # # Copyright (c) 2003-2005 Hewlett-Packard Development Company, L.P. # -# The really trivial win32/VC++ Makefile. Note that atomic_ops.c isn't useful. +# The really trivial win32/VC++ Makefile. Note that atomic_ops.c defines +# only AO_pause (used by atomic_ops_stack). # And we rely on a pre-built test_atomic_include.h and generalize-small.h, # since we can't rely on sed. But we don't keep test_atomic_include.h in # the development repository any longer, so if you want to do "make check" @@ -15,10 +16,13 @@ #CPU=$(MY_CPU) #!include -LIB_OBJS=atomic_ops_stack.obj atomic_ops_malloc.obj +LIB_OBJS=atomic_ops.obj atomic_ops_malloc.obj atomic_ops_stack.obj all: libatomic_ops_gpl.lib +atomic_ops.obj: + cl -W3 -O2 -c atomic_ops.c + atomic_ops_stack.obj: cl -W3 -O2 -c -DAO_ASSUME_WINDOWS98 atomic_ops_stack.c -- 2.7.4