[gcc-7] 147/354: - add link.o to GNATLINK_OBJS as well
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit 4bd212ffb40d318d602f3eebe701137ffc1a18dd
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Tue Mar 14 16:06:16 2017 +0000
- add link.o to GNATLINK_OBJS as well
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9361 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/patches/ada-gnattools-cross.diff | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index a45d004..9e34249 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -64,7 +64,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Likewise, but valid for subdirectories of the current dir.
# FIXME: for VxWorks, we cannot add $(fsrcdir) because the regs.h file in
-@@ -334,6 +346,20 @@ GNATMAKE_OBJS = a-except.o ali.o ali-uti
+@@ -334,6 +346,21 @@ GNATMAKE_OBJS = a-except.o ali.o ali-uti
uname.o urealp.o usage.o widechar.o \
$(EXTRA_GNATMAKE_OBJS)
@@ -80,12 +80,13 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
+# This list is duplicated in gnattools/Makefile.in.
+
+# TODO: understand why upstream does not need this.
++GNATLINK_OBJS += link.o
+GNATMAKE_OBJS += link.o
+
# Make arch match the current multilib so that the RTS selection code
# picks up the right files. For a given target this must be coherent
# with MULTILIB_DIRNAMES defined in gcc/config/target/t-*.
-@@ -436,7 +462,7 @@ X86_64_TARGET_PAIRS = \
+@@ -436,7 +463,7 @@ X86_64_TARGET_PAIRS = \
s-atocou.adb<s-atocou-builtin.adb
# Shared library version
@@ -94,7 +95,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Additionnal object files from C source to be added to libgnat.
EXTRA_LIBGNAT_OBJS=
-@@ -1641,6 +1667,11 @@ ifeq ($(strip $(filter-out s390% linux%,
+@@ -1641,6 +1668,11 @@ ifeq ($(strip $(filter-out s390% linux%,
LIBRARY_VERSION := $(LIB_VERSION)
endif
@@ -106,7 +107,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# HP/PA HP-UX 10
ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
-@@ -2508,24 +2539,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
+@@ -2508,24 +2540,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
$(patsubst %$(objext),%.adb,$(GNATRTL_OBJS)), \
$(ADA_EXCLUDE_SRCS))
@@ -131,7 +132,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
# Build directory for the tools. Let's copy the target-dependent
-@@ -2543,95 +2556,36 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_
+@@ -2543,95 +2557,36 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_
tools/$(word 1,$(subst <, ,$(PAIR)));)
touch ../stamp-tools
@@ -237,7 +238,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Note the use of the "mv" command in order to allow gnatlink to be linked with
# with the former version of gnatlink itself which cannot override itself.
-@@ -2641,19 +2595,15 @@ gnatlink-re: ../stamp-tools gnatmake-re
+@@ -2641,19 +2596,15 @@ gnatlink-re: ../stamp-tools gnatmake-re
$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
@@ -260,7 +261,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
../stamp-gnatlib-$(RTSDIR):
@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
-@@ -2693,14 +2643,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2693,14 +2644,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
# Also install the .dSYM directories if they exist (these directories
# contain the debug information for the shared libraries on darwin)
for file in gnat gnarl; do \
@@ -277,7 +278,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
$(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-@@ -2713,20 +2659,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2713,20 +2660,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
@@ -299,7 +300,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
$(MKDIR) $(RTSDIR)
$(CHMOD) u+w $(RTSDIR)
# Copy target independent sources
-@@ -2790,7 +2723,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
+@@ -2790,7 +2724,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
$(OSCONS_EXTRACT) ; \
../bldtools/oscons/xoscons s-oscons)
@@ -308,7 +309,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
test -f $(RTSDIR)/s-oscons.ads || exit 1
# C files
$(MAKE) -C $(RTSDIR) \
-@@ -2828,32 +2761,45 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
+@@ -2828,32 +2762,45 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
gnatlib-shared-default:
@@ -370,7 +371,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Create static libgnat and libgnarl compiled with -fPIC
$(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
-@@ -2872,21 +2818,15 @@ gnatlib-shared-dual:
+@@ -2872,21 +2819,15 @@ gnatlib-shared-dual:
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
@@ -395,7 +396,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
gnatlib-shared-dual-win32:
$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2896,17 +2836,15 @@ gnatlib-shared-dual-win32:
+@@ -2896,17 +2837,15 @@ gnatlib-shared-dual-win32:
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
@@ -429,7 +430,7 @@ Index: b/src/gnattools/Makefile.in
# For finding the GCC build dir, which is used far too much
GCC_DIR=../gcc
-@@ -70,28 +70,166 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote
+@@ -70,28 +70,167 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
CXX_LFLAGS = \
@@ -533,6 +534,7 @@ Index: b/src/gnattools/Makefile.in
+# EXTRA_GNATMAKE_OBJS should not be useful here.
+
+# TODO: understand why upstream does not need this.
++GNATLINK_OBJS += link.o
+GNATMAKE_OBJS += link.o
+
+# Makefile targets
@@ -617,7 +619,7 @@ Index: b/src/gnattools/Makefile.in
# Variables for regnattools
TOOLS_FLAGS_TO_PASS_RE= \
-@@ -184,20 +322,11 @@ $(GCC_DIR)/stamp-tools:
+@@ -184,20 +323,11 @@ $(GCC_DIR)/stamp-tools:
$(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
touch $(GCC_DIR)/stamp-tools
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list