public
Created

  • Download Gist
gistfile1.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff -r 80285454df3c d/druntime/rt/memory.d
--- a/d/druntime/rt/memory.d Mon Jan 30 21:27:11 2012 +0000
+++ b/d/druntime/rt/memory.d Sat Feb 04 18:24:09 2012 +0100
@@ -31,11 +31,11 @@
}
version( linux )
{
- version = SimpleLibcStackEnd;
+ version = bionic;
- version( SimpleLibcStackEnd )
+ version(bionic)
{
- extern (C) extern __gshared void* __libc_stack_end;
+ extern(C) void* __get_stack_base(int* p_stack_size);
}
}
version( FreeBSD )
@@ -109,9 +109,10 @@
}
else version( linux )
{
- version( SimpleLibcStackEnd )
+ version( bionic )
{
- return __libc_stack_end;
+ int dummy;
+ return __get_stack_base(&dummy);
}
else
{
diff -r 80285454df3c d/phobos2/Makefile.in
--- a/d/phobos2/Makefile.in Mon Jan 30 21:27:11 2012 +0000
+++ b/d/phobos2/Makefile.in Sat Feb 04 18:24:09 2012 +0100
@@ -738,7 +738,7 @@
uninstall uninstall-am uninstall-info-am
-all-local: libgphobos2.a libgdruntime.a
+all-local: libgdruntime.a
%.o : %.d $(D_PREREQ_SRCS)
$(GDC) -o $@ $(ALL_DFLAGS) -c $<
@@ -784,7 +784,7 @@
cp $< $@
$(config_unix_d_src): config/unix.x3 $(X3_DEPS) stamp-tgtdir
- $(X3) $< -o $@ $(X3_GCC_COMMAND)
+ touch $(config_unix_d_src)
# because these are in the $(host_alias) subdir, pattern match rules will not work
gcc/config/unix.o: $(config_unix_d_src) $(config_d_src) $(config_libc_d_src)
@@ -825,7 +825,7 @@
std/xml.o : std/xml.d $(D_PREREQ_SRCS)
$(GDC) -o $@ $(ALL_DFLAGS) -femit-templates -c $<
-unittest: unittest.o libgphobos2_t.a libgphobos2.a
+unittest: unittest.o
$(GDC) -o $@ $(CFLAGS) -fdeprecated unittest.o -L./ -lgdruntime -lgphobos2_t $(LIBS) -ldl
std/stream.t.o: std/stream.d $(D_PREREQ_SRCS)
@@ -843,14 +843,14 @@
./unittest
./testgc
-install-exec-local: $(D_PREREQ_SRCS) libgphobos2.a libgdruntime.a
+install-exec-local: $(D_PREREQ_SRCS) libgdruntime.a
$(mkinstalldirs) $(DESTDIR)$(toolexeclibdir)
- $(INSTALL) libgphobos2.a $(DESTDIR)$(toolexeclibdir)
- $(RANLIB) $(DESTDIR)$(toolexeclibdir)/libgphobos2.a
+# $(INSTALL) libgphobos2.a $(DESTDIR)$(toolexeclibdir)
+# $(RANLIB) $(DESTDIR)$(toolexeclibdir)/libgphobos2.a
$(INSTALL) libgdruntime.a $(DESTDIR)$(toolexeclibdir)
$(RANLIB) $(DESTDIR)$(toolexeclibdir)/libgdruntime.a
-install-data-local: $(D_PREREQ_SRCS) libgphobos2.a libgdruntime.a
+install-data-local: $(D_PREREQ_SRCS) libgdruntime.a
for i in etc/c \
gcc std std/c \
std/c/linux std/c/osx std/c/unix std/c/windows \
@@ -885,8 +885,8 @@
rm -f $(config_d_src) $(config_errno_d_src) $(config_libc_d_src)
rm -f $(config_unix_d_src)
rm -f libgdruntime.a
- rm -f libgphobos2.a
- rm -f libgphobos2_t.a
+# rm -f libgphobos2.a
+# rm -f libgphobos2_t.a
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -r 80285454df3c d/phobos2/configure
--- a/d/phobos2/configure Mon Jan 30 21:27:11 2012 +0000
+++ b/d/phobos2/configure Sat Feb 04 18:24:09 2012 +0100
@@ -5886,16 +5886,16 @@
if test -z "$d_gc_stack"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __libc_stack_end" >&5
-$as_echo_n "checking for __libc_stack_end... " >&6; }
+$as_echo_n "checking for __get_stack_base... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-
- extern long __libc_stack_end;
- return __libc_stack_end == 0;
+ int dummy;
+ extern void* __get_stack_base(int *p_stack_size);
+ return __get_stack_base(&dummy) == 0;
;
return 0;
}

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.