summaryrefslogtreecommitdiff
path: root/lang/gcc5-aux/files/diff-ada
diff options
context:
space:
mode:
authormarino <marino>2016-08-28 17:59:36 +0000
committermarino <marino>2016-08-28 17:59:36 +0000
commit93e0ab7e244fd32328cccb29506f5369407dfac4 (patch)
tree793e0c2a168322a8c17a036d589f78a6a86dcbcf /lang/gcc5-aux/files/diff-ada
parent89a09961db454a02dc7b1b5de058406e33c7572b (diff)
downloadpkgsrc-93e0ab7e244fd32328cccb29506f5369407dfac4.tar.gz
lang/gcc5-aux: Upgrade version 20150422 => 20160603 (GCC 5.1 => 5.4)
The signal trampoline detection for NetBSD 7 and later is still broken. Support for NetBSD 6.99 has been removed along with supporte for 32-bit DragonFly. The modifications to the testsuite were misguided and have also been removed.
Diffstat (limited to 'lang/gcc5-aux/files/diff-ada')
-rw-r--r--lang/gcc5-aux/files/diff-ada47
1 files changed, 30 insertions, 17 deletions
diff --git a/lang/gcc5-aux/files/diff-ada b/lang/gcc5-aux/files/diff-ada
index 8039c96be20..bde7fedac0a 100644
--- a/lang/gcc5-aux/files/diff-ada
+++ b/lang/gcc5-aux/files/diff-ada
@@ -1045,23 +1045,36 @@
Gcc_Path : String_Access := null;
Non_Empty_Node : constant Project_Node_Id := 1;
---- gcc/ada/s-osinte-android.ads.orig
-+++ gcc/ada/s-osinte-android.ads
-@@ -597,11 +597,11 @@
+--- gcc/ada/s-oscons-tmplt.c.orig
++++ gcc/ada/s-oscons-tmplt.c
+@@ -402,7 +402,7 @@
- type pid_t is new int;
+ /* ioctl(2) requests are "int" in UNIX, but "unsigned long" on FreeBSD */
-- type time_t is new long;
-+ type time_t is new Long_Long_Integer;
+-#ifdef __FreeBSD__
++#if defined (__FreeBSD__) || defined (__DragonFly__)
+ # define CNI CNU
+ # define IOCTL_Req_T "unsigned"
+ #else
+@@ -1014,7 +1014,7 @@
- type timespec is record
-- tv_sec : time_t;
-- tv_nsec : long;
-+ ts_sec : time_t;
-+ ts_nsec : long;
- end record;
- pragma Convention (C, timespec);
+ */
+-#if defined (__FreeBSD__) || defined (linux)
++#if defined (__FreeBSD__) || defined (linux) || defined (__DragonFly__)
+ # define PTY_Library "-lutil"
+ #else
+ # define PTY_Library ""
+@@ -1435,7 +1435,8 @@
+ #endif
+ CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock")
+
+-#if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530))
++#if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530)) \
++ || defined(__DragonFly__)
+ /** On these platforms use system provided monotonic clock instead of
+ ** the default CLOCK_REALTIME. We then need to set up cond var attributes
+ ** appropriately (see thread.c).
--- /dev/null
+++ gcc/ada/s-osinte-dragonfly.adb
@@ -0,0 +1,116 @@
@@ -3620,7 +3633,7 @@
THREADSLIB = -lposix4 -lthread
MISCLIB = -lposix4 -lnsl -lsocket
SO_OPTS = -Wl,-h,
-@@ -1420,8 +1424,11 @@
+@@ -1416,8 +1420,11 @@
ifeq ($(strip $(filter-out %86 freebsd%,$(target_cpu) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-freebsd.ads \
@@ -3632,7 +3645,7 @@
s-osinte.adb<s-osinte-freebsd.adb \
s-osinte.ads<s-osinte-freebsd.ads \
s-osprim.adb<s-osprim-posix.adb \
-@@ -1436,6 +1443,8 @@
+@@ -1432,6 +1439,8 @@
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
GNATLIB_SHARED = gnatlib-shared-dual
@@ -3641,7 +3654,7 @@
EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
EH_MECHANISM=-gcc
-@@ -1449,8 +1458,11 @@
+@@ -1445,8 +1454,11 @@
ifeq ($(strip $(filter-out %86_64 freebsd%,$(target_cpu) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
a-intnam.ads<a-intnam-freebsd.ads \
@@ -3653,7 +3666,7 @@
s-osinte.adb<s-osinte-freebsd.adb \
s-osinte.ads<s-osinte-freebsd.ads \
s-osprim.adb<s-osprim-posix.adb \
-@@ -1465,6 +1477,110 @@
+@@ -1461,6 +1473,110 @@
mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
GNATLIB_SHARED = gnatlib-shared-dual