|
From: <sv...@va...> - 2005-05-17 16:12:15
|
Author: tom
Date: 2005-05-17 17:11:40 +0100 (Tue, 17 May 2005)
New Revision: 3760
Modified:
trunk/Makefile.core-AM_CPPFLAGS.am
trunk/auxprogs/Makefile.am
trunk/configure.in
trunk/coregrind/Makefile.am
trunk/coregrind/amd64-linux/Makefile.am
trunk/coregrind/amd64/Makefile.am
trunk/coregrind/arm-linux/Makefile.am
trunk/coregrind/arm/Makefile.am
trunk/coregrind/linux/Makefile.am
trunk/coregrind/m_aspacemgr/Makefile.am
trunk/coregrind/m_demangle/Makefile.am
trunk/coregrind/m_dispatch/Makefile.am
trunk/coregrind/m_replacemalloc/Makefile.am
trunk/coregrind/m_sigframe/Makefile.am
trunk/coregrind/m_syscalls/Makefile.am
trunk/coregrind/x86-linux/Makefile.am
trunk/coregrind/x86/Makefile.am
Log:
Get rid of all the duplicated settings of AM_CFLAGS in the makefiles
for the various core modules and use a single global setting so that
the flags are actually consistent everywhere.
Also get rid of most the USE_PIE blocks in the makefiles by having
configure pass expand a variable in the new global AM_CFLAGS to one
of "-fpie" or "" depending on whether PIE is in use.
Modified: trunk/Makefile.core-AM_CPPFLAGS.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.core-AM_CPPFLAGS.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/Makefile.core-AM_CPPFLAGS.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -12,6 +12,11 @@
-DVGO_$(VG_OS)=3D1 \
-DVGP_$(VG_ARCH)_$(VG_OS)=3D1
=20
+BASE_AM_CFLAGS =3D @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Winline -=
Wall -Wshadow -O -g
+
+PIC_AM_CFLAGS =3D $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer
+
AM_CPPFLAGS =3D $(add_includes)
+AM_CFLAGS =3D $(WERROR) @PIE_AM_CFLAGS@ $(BASE_AM_CFLAGS)
AM_CCASFLAGS =3D $(add_includes) @ARCH_CORE_AM_CCASFLAGS@ -Wa,-gstabs
=20
Modified: trunk/auxprogs/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/auxprogs/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -O -g
-
bin_PROGRAMS =3D valgrind-listener
=20
valgrind_listener_SOURCES =3D valgrind-listener.c
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/configure.in 2005-05-17 16:11:40 UTC (rev 3760)
@@ -335,6 +335,7 @@
fi
=20
# Check for PIE support in the compiler and linker
+AC_SUBST(PIE_AM_CFLAGS)
AC_CACHE_CHECK([for PIE support], vg_cv_pie,
[AC_ARG_ENABLE(pie, [ --enable-pie platform supports=
PIE linking],
[vg_cv_pie=3D$enableval],
@@ -350,6 +351,7 @@
LDFLAGS=3D$safe_LDFLAGS])])
if test "$vg_cv_pie" =3D yes; then
AC_DEFINE([HAVE_PIE], 1, [can create position-independent executables])
+PIE_AM_CFLAGS=3D"-fpie"
fi
AM_CONDITIONAL(USE_PIE, test "$vg_cv_pie" =3D "yes")
=20
Modified: trunk/coregrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/coregrind/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -23,9 +23,6 @@
AM_CPPFLAGS +=3D -DVG_LIBDIR=3D"\"$(valdir)"\" \
-DKICKSTART_BASE=3D@KICKSTART_BASE@
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g @ARCH_CORE_AM_CFLAGS@
-AM_CFLAGS +=3D -fno-omit-frame-pointer
-
default.supp: $(SUPP_FILES)
=20
bin_PROGRAMS =3D \
@@ -120,7 +117,7 @@
## only referred to by tool shared objects).
stage2_extra2 =3D \
m_replacemalloc/libreplacemalloc_core.a
-=09
+
## Nb: older versions of automake don't seem to like having +=3D within =
an
## if-then-else, so we have to use these variables for the common parts.
st2_DEPS_common =3D \
@@ -133,14 +130,12 @@
-Wl,-version-script $(srcdir)/valgrind.vs
=20
if USE_PIE
-stage2_CFLAGS =3D $(AM_CFLAGS) -fpie
stage2_DEPENDENCIES =3D $(st2_DEPS_common)
stage2_LDFLAGS =3D \
$(st2_LDFLAGS_common) \
-Wl,--whole-archive $(stage2_extra2) -Wl,--no-whole-archive \
-pie
else
-stage2_CFLAGS =3D $(AM_CFLAGS)
stage2_DEPENDENCIES =3D $(st2_DEPS_common) ${VG_ARCH}/stage2.lds
stage2_LDFLAGS =3D \
$(st2_LDFLAGS_common) \
Modified: trunk/coregrind/amd64/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/amd64/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/coregrind/amd64/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer =
-g
-
noinst_HEADERS =3D \
core_arch.h
=20
@@ -20,12 +18,6 @@
jmp_with_stack.c \
state.c
=20
-if USE_PIE
-libarch_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libarch_a_CFLAGS =3D $(AM_CFLAGS)
-endif
-
# Extract ld's default linker script and hack it to our needs
stage2.lds: Makefile
$(CC) -Wl,--verbose -nostdlib 2>&1 | sed \
Modified: trunk/coregrind/amd64-linux/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/amd64-linux/Makefile.am 2005-05-17 13:45:04 UTC (rev =
3759)
+++ trunk/coregrind/amd64-linux/Makefile.am 2005-05-17 16:11:40 UTC (rev =
3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer =
-g
-
noinst_HEADERS =3D \
core_platform.h \
vki_unistd.h
@@ -12,9 +10,3 @@
=20
libplatform_a_SOURCES =3D \
core_platform.c
-
-if USE_PIE
-libplatform_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libplatform_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/arm/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/arm/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/coregrind/arm/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer =
-g
-
noinst_HEADERS =3D \
core_arch.h
=20
@@ -18,12 +16,6 @@
libarch_a_SOURCES =3D \
state.c
=20
-if USE_PIE
-libarch_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libarch_a_CFLAGS =3D $(AM_CFLAGS)
-endif
-
# Extract ld's default linker script and hack it to our needs
stage2.lds: Makefile
$(CC) -Wl,--verbose -nostdlib 2>&1 | sed \
Modified: trunk/coregrind/arm-linux/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/arm-linux/Makefile.am 2005-05-17 13:45:04 UTC (rev 37=
59)
+++ trunk/coregrind/arm-linux/Makefile.am 2005-05-17 16:11:40 UTC (rev 37=
60)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer =
-g
-
noinst_HEADERS =3D \
core_platform.h \
vki_unistd.h
@@ -11,8 +9,3 @@
=20
libplatform_a_SOURCES =3D
=20
-if USE_PIE
-libplatform_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libplatform_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/linux/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/linux/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/coregrind/linux/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
noinst_HEADERS =3D \
core_os.h
=20
@@ -11,9 +9,3 @@
libos_a_SOURCES =3D \
core_os.c \
sema.c
-
-if USE_PIE
-libos_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libos_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/m_aspacemgr/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_aspacemgr/Makefile.am 2005-05-17 13:45:04 UTC (rev =
3759)
+++ trunk/coregrind/m_aspacemgr/Makefile.am 2005-05-17 16:11:40 UTC (rev =
3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
EXTRA_DIST =3D \
README_ASPACEMGR.txt
=20
@@ -11,9 +9,3 @@
libaspacemgr_a_SOURCES =3D \
read_procselfmaps.c \
aspacemgr.c
-
-if USE_PIE
-libaspacemgr_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libaspacemgr_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/m_demangle/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/Makefile.am 2005-05-17 13:45:04 UTC (rev 3=
759)
+++ trunk/coregrind/m_demangle/Makefile.am 2005-05-17 16:11:40 UTC (rev 3=
760)
@@ -1,14 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-## Test repeated in both arms of the if-then-else because older versions=
of
-## automake don't seem to like having +=3D within an if-then-else.
-if USE_PIE
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -g -fpie
-else
-AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -O -g
-endif
-
noinst_HEADERS =3D \
ansidecl.h \
dyn-string.h \
Modified: trunk/coregrind/m_dispatch/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_dispatch/Makefile.am 2005-05-17 13:45:04 UTC (rev 3=
759)
+++ trunk/coregrind/m_dispatch/Makefile.am 2005-05-17 16:11:40 UTC (rev 3=
760)
@@ -1,17 +1,9 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
noinst_LIBRARIES =3D libdispatch.a
=20
## XXX: this won't work with "make dist" -- only one dispatch-XXX.S file
## will be put in the tarball. Problem exists in various other Makefile=
s.
libdispatch_a_SOURCES =3D \
dispatch-@VG_ARCH@.S
-
-if USE_PIE
-libdispatch_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libdispatch_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/m_replacemalloc/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_replacemalloc/Makefile.am 2005-05-17 13:45:04 UTC (=
rev 3759)
+++ trunk/coregrind/m_replacemalloc/Makefile.am 2005-05-17 16:11:40 UTC (=
rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
EXTRA_DIST =3D \
README_REPLACEMALLOC.txt
=20
@@ -13,15 +11,9 @@
libreplacemalloc_core_a_SOURCES =3D \
replacemalloc_core.c
=20
-if USE_PIE
-libreplacemalloc_core_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libreplacemalloc_core_a_CFLAGS =3D $(AM_CFLAGS)
-endif
-
libreplacemalloc_toolpreload_a_SOURCES =3D \
vg_replace_malloc.c
libreplacemalloc_toolpreload_a_CFLAGS =3D \
- $(AM_CFLAGS) -fpic -fno-omit-frame-pointer
+ $(PIC_AM_CFLAGS)
=20
=20
Modified: trunk/coregrind/m_sigframe/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_sigframe/Makefile.am 2005-05-17 13:45:04 UTC (rev 3=
759)
+++ trunk/coregrind/m_sigframe/Makefile.am 2005-05-17 16:11:40 UTC (rev 3=
760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
EXTRA_DIST =3D \
README_SIGFRAME.txt
=20
@@ -10,9 +8,3 @@
=20
libsigframe_a_SOURCES =3D \
sigframe-@VG_PLATFORM@.c
-
-if USE_PIE
-libsigframe_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libsigframe_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/m_syscalls/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syscalls/Makefile.am 2005-05-17 13:45:04 UTC (rev 3=
759)
+++ trunk/coregrind/m_syscalls/Makefile.am 2005-05-17 16:11:40 UTC (rev 3=
760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
EXTRA_DIST =3D \
README_SYSCALLS.txt
=20
@@ -12,7 +10,7 @@
priv_syscalls-amd64-linux.h \
priv_syscalls-arm-linux.h \
priv_syscalls-x86-linux.h
-=09
+
noinst_LIBRARIES =3D libsyscalls.a
=20
libsyscalls_a_SOURCES =3D \
@@ -20,9 +18,3 @@
syscalls.c \
syscalls-@VG_OS@.c \
syscalls-@VG_PLATFORM@.c
-
-if USE_PIE
-libsyscalls_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libsyscalls_a_CFLAGS =3D $(AM_CFLAGS)
-endif
Modified: trunk/coregrind/x86/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/x86/Makefile.am 2005-05-17 13:45:04 UTC (rev 3759)
+++ trunk/coregrind/x86/Makefile.am 2005-05-17 16:11:40 UTC (rev 3760)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
noinst_HEADERS =3D \
core_arch.h
=20
@@ -20,15 +18,9 @@
jmp_with_stack.c \
state.c
=20
-if USE_PIE
-libarch_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libarch_a_CFLAGS =3D $(AM_CFLAGS)
-endif
-
# Extract ld's default linker script and hack it to our needs
stage2.lds: Makefile
- $(CC) -Wl,--verbose -nostdlib 2>&1 | sed \
+ $(CC) $(AM_CFLAGS) -Wl,--verbose -nostdlib 2>&1 | sed \
-e '1,/^=3D=3D=3D=3D=3D\+$$/d' \
-e '/^=3D=3D=3D=3D=3D\+$$/d' \
-e 's/0x08048000/kickstart_base/g' > $@ || rm -f $@
Modified: trunk/coregrind/x86-linux/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/x86-linux/Makefile.am 2005-05-17 13:45:04 UTC (rev 37=
59)
+++ trunk/coregrind/x86-linux/Makefile.am 2005-05-17 16:11:40 UTC (rev 37=
60)
@@ -1,8 +1,6 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am
=20
-AM_CFLAGS =3D $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O =
-g
-
noinst_HEADERS =3D \
core_platform.h \
vki_unistd.h
@@ -12,9 +10,3 @@
=20
libplatform_a_SOURCES =3D \
core_platform.c
-
-if USE_PIE
-libplatform_a_CFLAGS =3D $(AM_CFLAGS) -fpie
-else
-libplatform_a_CFLAGS =3D $(AM_CFLAGS)
-endif
|