diff options
| author | Marcus Brinkmann <marcus@gnu.org> | 2002-09-17 20:42:06 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <marcus@gnu.org> | 2002-09-17 20:42:06 +0000 |
| commit | 7bdbf371e19507cfa039e3aa14c2d746a9db90a5 (patch) | |
| tree | ecc7cce378d3219330a5d642a0409b34c64c3f53 | |
| parent | a4e720458600535b4ec46bd10617ac9c9d837c94 (diff) | |
2002-09-17 Marcus Brinkmann <marcus@gnu.org>
* Makeconf (CPPFLAGS): Move -std=gnu99 option to ...
(CFLAGS): ... here.
pfinet/
2002-09-17 Marcus Brinkmann <marcus@gnu.org>
* Makefile: Revert last change.
* glue-include/asm/spinlock.h (SPIN_LOCK_UNLOCKED): Do not use a
compound literal, which is not constant.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makeconf | 4 | ||||
| -rw-r--r-- | pfinet/ChangeLog | 4 | ||||
| -rw-r--r-- | pfinet/Makefile | 4 | ||||
| -rw-r--r-- | pfinet/glue-include/asm/spinlock.h | 2 |
5 files changed, 10 insertions, 7 deletions
@@ -1,5 +1,8 @@ 2002-09-17 Marcus Brinkmann <marcus@gnu.org> + * Makeconf (CPPFLAGS): Move -std=gnu99 option to ... + (CFLAGS): ... here. + * Makefile (prog-subdirs): Add console-client. 2002-09-05 Roland McGrath <roland@frob.com> @@ -62,10 +62,10 @@ ifneq (.,$(dir)) INCLUDES += -I.. $(top_srcdirinc) endif INCLUDES += -I$(..)include -I$(top_srcdir)/include -CPPFLAGS += -std=gnu99 $(INCLUDES) \ +CPPFLAGS += $(INCLUDES) \ -D_GNU_SOURCE -D_IO_MTSAFE_IO -D_FILE_OFFSET_BITS=64 \ $($*-CPPFLAGS) -CFLAGS += -Wall -g -O3 +CFLAGS += -std=gnu99 -Wall -g -O3 # Include the configure-generated file of parameters. # This sets up variables for build tools and installation directories. diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog index 09df5fbe..f3438dbc 100644 --- a/pfinet/ChangeLog +++ b/pfinet/ChangeLog @@ -1,5 +1,9 @@ 2002-09-17 Marcus Brinkmann <marcus@gnu.org> + * Makefile: Revert last change. + * glue-include/asm/spinlock.h (SPIN_LOCK_UNLOCKED): Do not use a + compound literal, which is not constant. + * Makefile: For now, filter -std=gnu99 out of CPPFLAGS. 2002-06-15 Roland McGrath <roland@frob.com> diff --git a/pfinet/Makefile b/pfinet/Makefile index c3ae4c50..b81d3073 100644 --- a/pfinet/Makefile +++ b/pfinet/Makefile @@ -95,10 +95,6 @@ CPPFLAGS += -imacros $(srcdir)/config.h \ -I$(srcdir)/glue-include \ -I$(srcdir)/linux-src/include -# GCC 3.2 is a bit buggy. See #7946 and #7947 in GCC's GNATS -# database. -CPPFLAGS := $(filter-out -std=gnu99, $(CPPFLAGS)) - asm/checksum.h: ../config.status mkdir -p $(@D) echo > $@.new \ diff --git a/pfinet/glue-include/asm/spinlock.h b/pfinet/glue-include/asm/spinlock.h index 937c5d05..1666b0e2 100644 --- a/pfinet/glue-include/asm/spinlock.h +++ b/pfinet/glue-include/asm/spinlock.h @@ -4,7 +4,7 @@ #include <cthreads.h> typedef struct { } spinlock_t; -#define SPIN_LOCK_UNLOCKED (spinlock_t) { } +#define SPIN_LOCK_UNLOCKED { } #undef spin_lock_init #undef spin_lock |