← Back to branch summary

~ubuntu-branches/debian/sid/gcc-4.8/sid

« back to all changes in this revision

Viewing changes to .svn/pristine/b0/b0ff1c637b9d672d824f4c06c32a39ada65d10ad.svn-base

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-12-19 19:48:34 UTC
  • Revision ID: package-import@ubuntu.com-20141219194834-4dz1q7rrn5pad823
Tags: 4.8.4-1
* GCC 4.8.4 release.
  - Fix PR target/61407 (darwin), PR middle-end/58624 (ice),
    PR sanitizer/64265 (wrong code).
* Require recent binutils to pass go test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.svn/pristine/b0/b0ff1c637b9d672d824f4c06c32a39ada65d10ad.svn-base
 
1
# Fix 32/64 bit detection, broken due to the fact Debian installs 
 
2
# 64-bit libraries in lib and not lib64. Fix based on the s390/s390x
 
3
# detection.
 
4
 
 
5
--- a/src/gcc/ada/gcc-interface/Makefile.in
 
6
+++ b/src/gcc/ada/gcc-interface/Makefile.in
 
7
@@ -1858,9 +1858,14 @@
 
8
     LIBGNAT_TARGET_PAIRS_64 = \
 
9
     system.ads<system-linux-ppc64.ads
 
10
 
 
11
-    ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64)
 
12
-      LIBGNAT_TARGET_PAIRS = \
 
13
-      $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
 
14
+    ifeq ($(strip $(filter-out powerpc64 powerpc64le,$(target_cpu))),)
 
15
+      ifeq ($(strip $(MULTISUBDIR)),/32)
 
16
+        LIBGNAT_TARGET_PAIRS = \
 
17
+        $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)
 
18
+      else
 
19
+        LIBGNAT_TARGET_PAIRS = \
 
20
+        $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64)
 
21
+      endif
 
22
     else
 
23
       LIBGNAT_TARGET_PAIRS = \
 
24
       $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32)