X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by lists.alpinelinux.org (Postfix) with ESMTP id 824F65C4FD9 for ; Wed, 22 Feb 2017 22:07:25 +0000 (GMT) Received: by mail-qt0-f194.google.com with SMTP id b16so2205786qte.2 for ; Wed, 22 Feb 2017 14:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flatglobe-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=nHlnIAfLjj1bH08EWXMdYfFYhMqrJKhST3MG4x6Y1+4=; b=JosX9uhnYdGb3O5w+OqLywD2Kq/FJm++puQlxH1j5e/0taZsP7ZOcQk8fiRnPQ1mIJ jbjPUELCufzDiWmJL+Q1NJoSHYsf/466zjlWf1PI72tOtQXcwIaA14sY2HZXhRVl4PzO QnaR4Yxsyo17v6H94tvJb+c0ORCxOmK0aJZpCMIDlOEx9XCxbjl5Hy5nIFrJx7BzgA2T Vn+RuGWi99EI2u2taNCQfS3RXtym0l8F9ufw2EVtembPMo4HC13lkI61isl8aduwzTqI qogJqcMaaRPvytftO0KgS+TSpy57GgXresMlE6LnhRDbPkFjzxFDMwmx2MW3HV+3MEFn O8yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=nHlnIAfLjj1bH08EWXMdYfFYhMqrJKhST3MG4x6Y1+4=; b=Ufb8J16ZHwwN5I1E/Ir5AC9CpKqLU3MD8c7x/E1AaRdt83aMQsITMzoMiOlhsilu7K VQn5t/JikfxPioSzRfA5FY0klExjg12lBULptUBuSn6r1GMXT2erzkvaA/flxMfwiMnl vpsPaoIx42oDb8GCsqEbKWi8VdClrh3ss+4QJiOaeF1Ql8AWMMj6geivXJylzdH4HFvw q1xRGj8tieIulJ/jkVdj0v9G1B/io4nTXGcseP8AwsIslJ3+9vpKhtfU/ESjIvKHa+er BNH1orXNtimV4xCWITUUd02TqfhogTLbuWEgA6UTM+Wi0gMV384RDDlPt8J4WMLH/xEj q8jQ== X-Gm-Message-State: AMke39nm0WLyPFWeaSeJVgV1ea1V352xg5IdyBCxPF8znCh2BWg85/sgIrcoHciDOfePGg== X-Received: by 10.200.40.86 with SMTP id 22mr373175qtr.245.1487801244475; Wed, 22 Feb 2017 14:07:24 -0800 (PST) Received: from localhost.localdomain (cpe-204-210-151-44.hvc.res.rr.com. [204.210.151.44]) by smtp.gmail.com with ESMTPSA id i21sm1533002qke.12.2017.02.22.14.07.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Feb 2017 14:07:23 -0800 (PST) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 1/9] main/gcc: fix gcj bug on s390x Date: Wed, 22 Feb 2017 17:07:10 -0500 Message-Id: <1487801238-8996-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/gcc/310-build-gcj-s390x.patch | 28 ++++++++++++++++++++++++++++ main/gcc/APKBUILD | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 main/gcc/310-build-gcj-s390x.patch diff --git a/main/gcc/310-build-gcj-s390x.patch b/main/gcc/310-build-gcj-s390x.patch new file mode 100644 index 0000000..1e522ee --- /dev/null +++ b/main/gcc/310-build-gcj-s390x.patch @@ -0,0 +1,28 @@ +From 697a7ba791fce2ffab2ed723d909a89684019e3d Mon Sep 17 00:00:00 2001 +From: "Tuan M. Hoang" +Date: Sun, 19 Feb 2017 17:03:33 +0000 +Subject: [PATCH] main/gcc : when building gcc-java on s390x, libgcj.so + complains about undefined reference to __data_start. Using + SEARCH_FOR_DATA_START instead solved it. Credit to Andrew Haley at RedHat. + +--- + boehm-gc/include/private/gcconfig.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h +index 4ca6a80..a15fff6 100644 +--- a/boehm-gc/include/private/gcconfig.h ++++ b/boehm-gc/include/private/gcconfig.h +@@ -1837,8 +1837,7 @@ + # define OS_TYPE "LINUX" + # define LINUX_STACKBOTTOM + # define DYNAMIC_LOADING +- extern int __data_start[]; +-# define DATASTART ((ptr_t)(__data_start)) ++# define SEARCH_FOR_DATA_START + extern int _end[]; + # define DATAEND (_end) + # define CACHE_LINE_SIZE 256 +-- +2.11.1 + diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 70610f0..47e1007 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -192,6 +192,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgba ada-musl.patch 300-main-gcc-add-musl-s390x-dynamic-linker.patch + 310-build-gcj-s390x.patch fix-rs6000-pie.patch " @@ -715,4 +716,5 @@ abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1 3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch 631d4bdef6d8bde34df7978bb53ec28c3c909cf1f87139e5f148138d0f09adc58b41ecf0148bbf50fb4bc916c411e9bf8a2b6c046c75c0e77d754d8c35bcd4d7 ada-musl.patch 4b4a0ff306a8ef34ff6e3284fbfca869012164a47ba7cb099085c1dd03e6ca0cdd462f82710e08c9a02895adc7484e4c5eef17b5aa264cf5d978fe8ad78eea93 300-main-gcc-add-musl-s390x-dynamic-linker.patch +385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998 310-build-gcj-s390x.patch 01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed fix-rs6000-pie.patch" -- 2.1.4 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---