summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2008-12-08 13:14:32 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2008-12-08 13:14:32 +0000
commit21f0aacba1e0111a405fac0cdb5e21bc479cdfd3 (patch)
tree67eecab06c4a7946c5cf481310e3a6005daccf9b
parent2008-12-08 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-21f0aacba1e0111a405fac0cdb5e21bc479cdfd3.tar.bz2
2008-12-08 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/Makefile.am: Remove RTEMS_RELLDFLAGS. * aclocal/prog-cc.m4: Add RTEMS_RELLDFLAGS hack.
-rw-r--r--cpukit/ChangeLog2
-rw-r--r--cpukit/aclocal/prog-cc.m45
-rw-r--r--cpukit/libfs/src/nfsclient/Makefile.am2
3 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 7882d03711..caab6f162d 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,7 @@
2008-12-08 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * libfs/src/nfsclient/Makefile.am: Remove RTEMS_RELLDFLAGS.
+ * aclocal/prog-cc.m4: Add RTEMS_RELLDFLAGS hack.
* libfs/src/nfsclient/src/dirutils.c: #include <limits.h>.
2008-12-08 Ralf Corsépius <ralf.corsepius@rtems.org>
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 674b489b7f..bb3259ebc5 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -35,4 +35,9 @@ AC_SUBST(RTEMS_CFLAGS)
RTEMS_CPPFLAGS="-I\$(top_builddir) -I\$(PROJECT_INCLUDE)"
AC_SUBST(RTEMS_CPPFLAGS)
+
+AS_IF([test "$GCC" = yes],[
+ RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -Wl,-r"
+])
+AC_SUBST(RTEMS_RELLDFLAGS)
])
diff --git a/cpukit/libfs/src/nfsclient/Makefile.am b/cpukit/libfs/src/nfsclient/Makefile.am
index fd70e4ddd7..d6bc362582 100644
--- a/cpukit/libfs/src/nfsclient/Makefile.am
+++ b/cpukit/libfs/src/nfsclient/Makefile.am
@@ -4,8 +4,6 @@
include $(top_srcdir)/automake/compile.am
-RTEMS_RELLDFLAGS = -r
-
#%dirutils.obj: %dirutils.o
# $(LD) -r -o $@ $^
project_lib_PROGRAMS = dirutils.rel