mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove "-I" from LIBSTDCXX_RAW_CXX_LDFLAGS

Browse Source 
config/

	* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove
	"-I" from LIBSTDCXX_RAW_CXX_LDFLAGS.

libjava/

	* Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Replace
	LIBSTDCXX_RAW_CXX_LDLAGS with LIBSTDCXX_RAW_CXX_LDFLAGS.
	* Makefile.in: Regenerated.

libsanitizer/

	* asan/Makefile.am (libasan_la_LIBADD): Replace
	LIBSTDCXX_RAW_CXX_LDLAGS with LIBSTDCXX_RAW_CXX_LDFLAGS.
	* tsan/Makefile.am (libtsan_la_LIBADD): Likewise.
	* Makefile.in: Regenerated.
	* configure: Likewise.
	* asan/Makefile.in: Likewise.
	* interception/Makefile.in: Likewise.
	* sanitizer_common/Makefile.in: Likewise.
	* tsan/Makefile.in: Likewise.

From-SVN: r194989
This commit is contained in:
H.J. Lu 2013-01-07 18:23:42 +00:00 committed by H.J. Lu
parent e4d7d8cb69
commit 7f7162cf57
11 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/ChangeLog
View File

@ -1,3 +1,8 @@
2013-01-07 H.J. Lu <hongjiu.lu@intel.com>
* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove
"-I" from LIBSTDCXX_RAW_CXX_LDFLAGS.
2012-12-12 H.J. Lu <hongjiu.lu@intel.com> 2012-12-12 H.J. Lu <hongjiu.lu@intel.com>
* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Also * libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Also

2
config/libstdc++-raw-cxx.m4
View File

@ -24,7 +24,7 @@ AC_DEFUN([GCC_LIBSTDCXX_RAW_CXX_FLAGS], [
-I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \ -I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \
-I\$(top_srcdir)/../libstdc++-v3/libsupc++" -I\$(top_srcdir)/../libstdc++-v3/libsupc++"
LIBSTDCXX_RAW_CXX_LDFLAGS="\ LIBSTDCXX_RAW_CXX_LDFLAGS="\
-I\$(top_builddir)/../libstdc++-v3/src/libstdc++.la" \$(top_builddir)/../libstdc++-v3/src/libstdc++.la"
AC_SUBST(LIBSTDCXX_RAW_CXX_CXXFLAGS) AC_SUBST(LIBSTDCXX_RAW_CXX_CXXFLAGS)
AC_SUBST(LIBSTDCXX_RAW_CXX_LDFLAGS) AC_SUBST(LIBSTDCXX_RAW_CXX_LDFLAGS)
]) ])

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2013-01-07 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (lib_gnu_awt_xlib_la_LDFLAGS): Replace
LIBSTDCXX_RAW_CXX_LDLAGS with LIBSTDCXX_RAW_CXX_LDFLAGS.
* Makefile.in: Regenerated.
2013-01-03 Jakub Jelinek <jakub@redhat.com> 2013-01-03 Jakub Jelinek <jakub@redhat.com>
* gnu/gcj/convert/Convert.java (version): Update copyright notice * gnu/gcj/convert/Convert.java (version): Update copyright notice

2
libjava/Makefile.am
View File

@ -594,7 +594,7 @@ lib_gnu_awt_xlib_la_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(LIBSTDCXX_RAW_CXX_CXXFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
## The mysterious backslash in the grep pattern is consumed by make. ## The mysterious backslash in the grep pattern is consumed by make.
lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDLAGS) \ lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDFLAGS) \
@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \ -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)

4
libjava/Makefile.in
View File

@ -1138,7 +1138,7 @@ lib_gnu_awt_xlib_la_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(LIBSTDCXX_RAW_CXX_CXXFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDLAGS) \ lib_gnu_awt_xlib_la_LDFLAGS = $(LIBSTDCXX_RAW_CXX_LDFLAGS) \
@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \ -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
@ -4359,6 +4359,7 @@ classpath/java/lang/ArithmeticException.java \
classpath/java/lang/ArrayIndexOutOfBoundsException.java \ classpath/java/lang/ArrayIndexOutOfBoundsException.java \
classpath/java/lang/ArrayStoreException.java \ classpath/java/lang/ArrayStoreException.java \
classpath/java/lang/AssertionError.java \ classpath/java/lang/AssertionError.java \
classpath/java/lang/AutoCloseable.java \
classpath/java/lang/Boolean.java \ classpath/java/lang/Boolean.java \
classpath/java/lang/Byte.java \ classpath/java/lang/Byte.java \
classpath/java/lang/CharSequence.java \ classpath/java/lang/CharSequence.java \
@ -4417,6 +4418,7 @@ java/lang/PosixProcess.java \
classpath/java/lang/Process.java \ classpath/java/lang/Process.java \
classpath/java/lang/ProcessBuilder.java \ classpath/java/lang/ProcessBuilder.java \
classpath/java/lang/Readable.java \ classpath/java/lang/Readable.java \
classpath/java/lang/ReflectiveOperationException.java \
classpath/java/lang/Runnable.java \ classpath/java/lang/Runnable.java \
java/lang/Runtime.java \ java/lang/Runtime.java \
classpath/java/lang/RuntimeException.java \ classpath/java/lang/RuntimeException.java \

12
libsanitizer/ChangeLog
View File

@ -1,3 +1,15 @@
2013-01-07 H.J. Lu <hongjiu.lu@intel.com>
* asan/Makefile.am (libasan_la_LIBADD): Replace
LIBSTDCXX_RAW_CXX_LDLAGS with LIBSTDCXX_RAW_CXX_LDFLAGS.
* tsan/Makefile.am (libtsan_la_LIBADD): Likewise.
* Makefile.in: Regenerated.
* configure: Likewise.
* asan/Makefile.in: Likewise.
* interception/Makefile.in: Likewise.
* sanitizer_common/Makefile.in: Likewise.
* tsan/Makefile.in: Likewise.
2012-12-12 H.J. Lu <hongjiu.lu@intel.com> 2012-12-12 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (AM_MAKEFLAGS): Restored. * Makefile.am (AM_MAKEFLAGS): Restored.

2
libsanitizer/asan/Makefile.am
View File

@ -40,7 +40,7 @@ libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la
else else
libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la
endif endif
libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDLAGS) libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl

11
libsanitizer/asan/Makefile.in
View File

@ -78,9 +78,12 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
LTLIBRARIES = $(toolexeclib_LTLIBRARIES) LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@USING_MAC_INTERPOSE_FALSE@libasan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la \ @USING_MAC_INTERPOSE_FALSE@libasan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
@USING_MAC_INTERPOSE_FALSE@ $(top_builddir)/interception/libinterception.la @USING_MAC_INTERPOSE_FALSE@ $(top_builddir)/interception/libinterception.la \
@USING_MAC_INTERPOSE_TRUE@libasan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la @USING_MAC_INTERPOSE_FALSE@ $(am__DEPENDENCIES_1)
@USING_MAC_INTERPOSE_TRUE@libasan_la_DEPENDENCIES = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
@USING_MAC_INTERPOSE_TRUE@ $(am__DEPENDENCIES_1)
am__libasan_la_SOURCES_DIST = asan_allocator.cc asan_interceptors.cc \ am__libasan_la_SOURCES_DIST = asan_allocator.cc asan_interceptors.cc \
asan_mac.cc asan_malloc_mac.cc asan_new_delete.cc \ asan_mac.cc asan_malloc_mac.cc asan_new_delete.cc \
asan_posix.cc asan_rtl.cc asan_stats.cc \ asan_posix.cc asan_rtl.cc asan_stats.cc \
@ -287,9 +290,9 @@ asan_files = \
libasan_la_SOURCES = $(asan_files) $(am__append_2) libasan_la_SOURCES = $(asan_files) $(am__append_2)
@USING_MAC_INTERPOSE_FALSE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \ @USING_MAC_INTERPOSE_FALSE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
@USING_MAC_INTERPOSE_FALSE@ $(top_builddir)/interception/libinterception.la \ @USING_MAC_INTERPOSE_FALSE@ $(top_builddir)/interception/libinterception.la \
@USING_MAC_INTERPOSE_FALSE@ $(LIBSTDCXX_RAW_CXX_LDLAGS) @USING_MAC_INTERPOSE_FALSE@ $(LIBSTDCXX_RAW_CXX_LDFLAGS)
@USING_MAC_INTERPOSE_TRUE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \ @USING_MAC_INTERPOSE_TRUE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
@USING_MAC_INTERPOSE_TRUE@ $(LIBSTDCXX_RAW_CXX_LDLAGS) @USING_MAC_INTERPOSE_TRUE@ $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS

2
libsanitizer/configure vendored
View File

@ -2595,7 +2595,7 @@ esac
-I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \ -I\$(top_builddir)/../libstdc++-v3/include/\$(target_noncanonical) \
-I\$(top_srcdir)/../libstdc++-v3/libsupc++" -I\$(top_srcdir)/../libstdc++-v3/libsupc++"
LIBSTDCXX_RAW_CXX_LDFLAGS="\ LIBSTDCXX_RAW_CXX_LDFLAGS="\
-I\$(top_builddir)/../libstdc++-v3/src/libstdc++.la" \$(top_builddir)/../libstdc++-v3/src/libstdc++.la"

2
libsanitizer/tsan/Makefile.am
View File

@ -34,7 +34,7 @@ tsan_files = \
tsan_symbolize_addr2line_linux.cc tsan_symbolize_addr2line_linux.cc
libtsan_la_SOURCES = $(tsan_files) libtsan_la_SOURCES = $(tsan_files)
libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS) libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS

6
libsanitizer/tsan/Makefile.in
View File

@ -76,9 +76,11 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
LTLIBRARIES = $(toolexeclib_LTLIBRARIES) LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libtsan_la_DEPENDENCIES = \ libtsan_la_DEPENDENCIES = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \ $(top_builddir)/sanitizer_common/libsanitizer_common.la \
$(top_builddir)/interception/libinterception.la $(top_builddir)/interception/libinterception.la \
$(am__DEPENDENCIES_1)
am__objects_1 = tsan_clock.lo tsan_interface_atomic.lo tsan_mutex.lo \ am__objects_1 = tsan_clock.lo tsan_interface_atomic.lo tsan_mutex.lo \
tsan_report.lo tsan_rtl_thread.lo tsan_symbolize.lo \ tsan_report.lo tsan_rtl_thread.lo tsan_symbolize.lo \
tsan_flags.lo tsan_interface.lo tsan_platform_linux.lo \ tsan_flags.lo tsan_interface.lo tsan_platform_linux.lo \
@ -274,7 +276,7 @@ tsan_files = \
tsan_symbolize_addr2line_linux.cc tsan_symbolize_addr2line_linux.cc
libtsan_la_SOURCES = $(tsan_files) libtsan_la_SOURCES = $(tsan_files)
libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS) libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDFLAGS)
libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS