X-Authentication-Warning:	delorie.com: mail set sender to djgpp-bounces using -f
X-Recipient:	djgpp AT delorie DOT com
X-Original-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=gmail.com; s=20120113;
	h=mime-version:date:message-id:subject:from:to:cc;
	bh=CZoCxzkjKLxdiGMs5R0aNVuUqXaC/Ts8vZ0hWiC+6AI=;
	b=Z3gaGzpbuNEzZltovH4rQ6rK9SoPAhhuONMWs+Ymp2qRd37ZHk4lakBYj2Ka7hNA4e
	/dXlzh2rVJXQ6w7AdEgF0nxQCPVKpkSpGuLilYBwnNslqN2xFjDBbrt3HZSAB88ADs8e
	XlaVjA8n9B7zF7On5ApQAJPfUwBLzVmvvs2YdQZkjL1kIF17+Y5w8H27oCTCgGgEfYb7
	Nzr/zMvvWwegGWw03jGFeu7bN0XBSqzh57UIe9fKJPl4LqYPeYWJBSEvfyMuUr3XhyO5
	aJWtiBRpVBYmqAsoKp0QzWTQCziUEGeVHF6sMC88qGMfpGR3i3FBvJKzW+30k4yY0FNL
	GVcA==
X-Google-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc;
	bh=CZoCxzkjKLxdiGMs5R0aNVuUqXaC/Ts8vZ0hWiC+6AI=;
	b=RH5hoGrWKmYZ58ybF2LgvCjPOlmQfMIjDjGG9EIYCoDlEJOSWhJb/tm4kEtoOdOi5/
	8cbGuJqge8w1sO+nuqL2hqWwjDgicn8p/vdIWE7iHrdUgKE9HpmJ1YceBy27O8KZbHeS
	kFvqc9xE4KfscA4TsVHJGZRBCozLMB+SFjH3VgYRE92oXNnAubCwE74C1WtyLtVzHiKN
	7tmNeCGC3hff5sYzYKhtZZbk0AukZOmxDOD6PKMHnBhnsi5tXBzBYT1l/VfZXWabsLpk
	dXQb4EkjoQrwk1asFYGIcmGC3sJ5COydh4mtWjH+j1+aXPatrE6jizF+VpWx/9wXR04d
	RB5w==
X-Gm-Message-State:	AD7BkJKdjBskONlMKRAQNZ+Sp6X7cDGQXYNnysM5XmqzXkLzQO9ilm+FckB2ooUrD2LTyf1tsk/YCZ5pszyj3A==
MIME-Version:	1.0
X-Received:	by 10.107.8.232 with SMTP id h101mr16218277ioi.93.1457793885092;
	Sat, 12 Mar 2016 06:44:45 -0800 (PST)
Date:	Sat, 12 Mar 2016 16:44:44 +0200
Message-ID:	<CAA2C=vDg+v9f1d1n5S6wprxNCgovrrMvwU9DG6rd2Dv1g5DnMw@mail.gmail.com>
Subject:	binutils, HAVE_DXE3_SUPPORT
From:	"Ozkan Sezer (sezeroz AT gmail DOT com) [via djgpp AT delorie DOT com]" <djgpp AT delorie DOT com>
To:	djgpp AT delorie DOT com
Cc:	juan DOT guerrero AT gmx DOT de
Reply-To:	djgpp AT delorie DOT com

--001a113f98b4ad458b052ddb16a6
Content-Type: text/plain; charset=UTF-8

The handling of HAVE_DXE3_SUPPORT in ld is not friendly with cross
compiling, because __DJGPP__ is not defined during a binutils build
running on linux but targetting djgpp.

The following patch moves that to configure.ac, and it also removes
the djgpp-2.04+ dependency to simplify things. Patch is attached as
a file too, because gmail will most probably mangle it.

--
O.S.


diff -urp binutils-2.26/ld/configure.ac~ binutils-2.26/ld/configure.ac
--- binutils-2.26/ld/configure.ac~
+++ binutils-2.26/ld/configure.ac
@@ -437,6 +437,11 @@ if test x${EXTRA_SHLIB_EXTENSION} != x ;
    [Additional extension a shared object might have.])
 fi

+case "$target_os" in
+  *djgpp) AC_DEFINE_UNQUOTED(HAVE_DXE3_SUPPORT, 1,
+   [DJGPP, DXE3 support: Enable resolution of multiple symbol
definition introduced by the import libraries by the linker.]) ;;
+esac
+
 dnl Required by html, pdf, install-pdf and install-html
 AC_SUBST(datarootdir)
 AC_SUBST(docdir)
diff -urp binutils-2.26/ld/configure~ binutils-2.26/ld/configure
--- binutils-2.26/ld/configure~
+++ binutils-2.26/ld/configure
@@ -17192,6 +17192,14 @@ _ACEOF

 fi

+case "$target_os" in
+  *djgpp)
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DXE3_SUPPORT 1
+_ACEOF
+ ;;
+esac
+



diff -urp binutils-2.26/ld/config.in~ binutils-2.26/ld/config.in
--- binutils-2.26/ld/config.in~
+++ binutils-2.26/ld/config.in
@@ -53,6 +53,10 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H

+/* DJGPP, DXE3 support: Enable resolution of multiple symbol definition
+   introduced by the import libraries by the linker. */
+#undef HAVE_DXE3_SUPPORT
+
 /* Define to 1 if you have the <elf-hints.h> header file. */
 #undef HAVE_ELF_HINTS_H

@@ -266,13 +270,6 @@
        (file_name);                                 \
     })                                              \
   )
-
-# if defined(__DJGPP__) && __DJGPP__ == 2 && __DJGPP_MINOR__ >= 4
-/* Enable resolution of multiple symbol definition introduced by
-   the import libraries by the linker if DXE3 support is provided
-   by libc.a.  */
-#  define HAVE_DXE3_SUPPORT  1
-# endif
 #else
 # define STRIP_FULL_PATH_AND_EXTENSION(file_name)  (file_name)
 #endif

--001a113f98b4ad458b052ddb16a6
Content-Type: text/plain; charset=US-ASCII; name="3a.diff"
Content-Disposition: attachment; filename="3a.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: file0

TW92ZSBIQVZFX0RYRTNfU1VQUE9SVCB0byBjb25maWd1cmUuYWMsIGFuZCBhbHNvIHJlbW92ZSB0
aGUgZGpncHAtMi4wNCsKZGVwZW5kZW5jeSB0byBzaW1wbGlmeSB0aGluZ3MuCgoKZGlmZiAtdXJw
IGJpbnV0aWxzLTIuMjYvbGQvY29uZmlndXJlLmFjfiBiaW51dGlscy0yLjI2L2xkL2NvbmZpZ3Vy
ZS5hYwotLS0gYmludXRpbHMtMi4yNi9sZC9jb25maWd1cmUuYWN+CisrKyBiaW51dGlscy0yLjI2
L2xkL2NvbmZpZ3VyZS5hYwpAQCAtNDM3LDYgKzQzNywxMSBAQCBpZiB0ZXN0IHgke0VYVFJBX1NI
TElCX0VYVEVOU0lPTn0gIT0geCA7CiAgICBbQWRkaXRpb25hbCBleHRlbnNpb24gYSBzaGFyZWQg
b2JqZWN0IG1pZ2h0IGhhdmUuXSkKIGZpCiAKK2Nhc2UgIiR0YXJnZXRfb3MiIGluCisgICpkamdw
cCkgQUNfREVGSU5FX1VOUVVPVEVEKEhBVkVfRFhFM19TVVBQT1JULCAxLAorICAgW0RKR1BQLCBE
WEUzIHN1cHBvcnQ6IEVuYWJsZSByZXNvbHV0aW9uIG9mIG11bHRpcGxlIHN5bWJvbCBkZWZpbml0
aW9uIGludHJvZHVjZWQgYnkgdGhlIGltcG9ydCBsaWJyYXJpZXMgYnkgdGhlIGxpbmtlci5dKSA7
OworZXNhYworCiBkbmwgUmVxdWlyZWQgYnkgaHRtbCwgcGRmLCBpbnN0YWxsLXBkZiBhbmQgaW5z
dGFsbC1odG1sCiBBQ19TVUJTVChkYXRhcm9vdGRpcikKIEFDX1NVQlNUKGRvY2RpcikKZGlmZiAt
dXJwIGJpbnV0aWxzLTIuMjYvbGQvY29uZmlndXJlfiBiaW51dGlscy0yLjI2L2xkL2NvbmZpZ3Vy
ZQotLS0gYmludXRpbHMtMi4yNi9sZC9jb25maWd1cmV+CisrKyBiaW51dGlscy0yLjI2L2xkL2Nv
bmZpZ3VyZQpAQCAtMTcxOTIsNiArMTcxOTIsMTQgQEAgX0FDRU9GCiAKIGZpCiAKK2Nhc2UgIiR0
YXJnZXRfb3MiIGluCisgICpkamdwcCkKK2NhdCA+PmNvbmZkZWZzLmggPDxfQUNFT0YKKyNkZWZp
bmUgSEFWRV9EWEUzX1NVUFBPUlQgMQorX0FDRU9GCisgOzsKK2VzYWMKKwogCiAKIApkaWZmIC11
cnAgYmludXRpbHMtMi4yNi9sZC9jb25maWcuaW5+IGJpbnV0aWxzLTIuMjYvbGQvY29uZmlnLmlu
Ci0tLSBiaW51dGlscy0yLjI2L2xkL2NvbmZpZy5pbn4KKysrIGJpbnV0aWxzLTIuMjYvbGQvY29u
ZmlnLmluCkBAIC01Myw2ICs1MywxMCBAQAogLyogRGVmaW5lIHRvIDEgaWYgeW91IGhhdmUgdGhl
IDxkbGZjbi5oPiBoZWFkZXIgZmlsZS4gKi8KICN1bmRlZiBIQVZFX0RMRkNOX0gKIAorLyogREpH
UFAsIERYRTMgc3VwcG9ydDogRW5hYmxlIHJlc29sdXRpb24gb2YgbXVsdGlwbGUgc3ltYm9sIGRl
ZmluaXRpb24KKyAgIGludHJvZHVjZWQgYnkgdGhlIGltcG9ydCBsaWJyYXJpZXMgYnkgdGhlIGxp
bmtlci4gKi8KKyN1bmRlZiBIQVZFX0RYRTNfU1VQUE9SVAorCiAvKiBEZWZpbmUgdG8gMSBpZiB5
b3UgaGF2ZSB0aGUgPGVsZi1oaW50cy5oPiBoZWFkZXIgZmlsZS4gKi8KICN1bmRlZiBIQVZFX0VM
Rl9ISU5UU19ICiAKQEAgLTI2NiwxMyArMjcwLDYgQEAKICAgICAgICAoZmlsZV9uYW1lKTsgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfSkgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICApCi0KLSMgaWYgZGVmaW5lZChfX0RKR1BQ
X18pICYmIF9fREpHUFBfXyA9PSAyICYmIF9fREpHUFBfTUlOT1JfXyA+PSA0Ci0vKiBFbmFibGUg
cmVzb2x1dGlvbiBvZiBtdWx0aXBsZSBzeW1ib2wgZGVmaW5pdGlvbiBpbnRyb2R1Y2VkIGJ5Ci0g
ICB0aGUgaW1wb3J0IGxpYnJhcmllcyBieSB0aGUgbGlua2VyIGlmIERYRTMgc3VwcG9ydCBpcyBw
cm92aWRlZAotICAgYnkgbGliYy5hLiAgKi8KLSMgIGRlZmluZSBIQVZFX0RYRTNfU1VQUE9SVCAg
MQotIyBlbmRpZgogI2Vsc2UKICMgZGVmaW5lIFNUUklQX0ZVTExfUEFUSF9BTkRfRVhURU5TSU9O
KGZpbGVfbmFtZSkgIChmaWxlX25hbWUpCiAjZW5kaWYKCg==
--001a113f98b4ad458b052ddb16a6--

- Raw text -