Revert rev. 195981

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@196000 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2927bf116bda5055c982bedf69908c809f1e0e88..6fec9657929cc648e192d9b5968e5d3f9ca88bed 100644 (file)
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,10 +1,3 @@
-2013-02-12  Kai Tietz  <ktietz@redhat.com>
-
-       Backport from mainline
-       PR target/52122
-       * Makefile.in (LN_S_RECUSIVE): New.
-       (adainclude, adalib): Use LN_S_RECURSIVE for copy.
-
 2012-09-20  Release Manager
 
        * GCC 4.7.2 released.

diff --git a/libada/Makefile.in b/libada/Makefile.in
index 0beb42ca6133e8566b2cf6d8e60600eaed3d8f81..389a2fb2f79991b8281cac427ff618fcd99207fa 100644 (file)
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -43,12 +43,6 @@ enable_shared = @enable_shared@
 LN_S=@LN_S@
 AWK=@AWK@
 
-ifeq (cp -p,$(LN_S))
-LN_S_RECURSIVE = cp -pR
-else
-LN_S_RECURSIVE = $(LN_S)
-endif
-
 # Variables for the user (or the top level) to override.
 objext=.o
 THREAD_KIND=native
@@ -106,8 +100,8 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
        && touch stamp-libada
        -rm -rf adainclude
        -rm -rf adalib
-       $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
-       $(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
+       $(LN_S) $(ADA_RTS_DIR) adainclude
+       $(LN_S) $(ADA_RTS_DIR) adalib
 
 gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        test -f stamp-libada || \
@@ -115,8 +109,8 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
        && touch stamp-libada
        -rm -rf adainclude
        -rm -rf adalib
-       $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adainclude
-       $(LN_S_RECUSIVE) $(ADA_RTS_DIR) adalib
+       $(LN_S) $(ADA_RTS_DIR) adainclude
+       $(LN_S) $(ADA_RTS_DIR) adalib
 
 osconstool:
        $(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons