Created
February 4, 2012 17:24
-
-
Save jpf91/1739039 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment